From patchwork Tue Nov 5 23:38:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 1345 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id E5DEF14ED03D6 for ; Tue, 5 Nov 2019 23:39:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, LOCAL_FAKEBUSINESS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001,T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:40 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 1F426166625E36; Tue, 5 Nov 2019 23:39:21 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 5D8DD166625E08; Tue, 5 Nov 2019 23:39:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1572997158; bh=lBuJv2C+uGZKrA6iab+hDwpZ2EuynjMJ9J9z+WBvACs=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=yAFTL9kfPvpWByfs1r6wbYdIei0tQ9JDM/BLHU24lf0wdMmmhPQrhXamyYvqU9YEG m8whzoc+ZOG0uzx5DmjA48RMt21Se54cv4ZJ+BHvGoIZquut29TP99kgvu5q1bz65g 54eUXgAi26nmdOHDUpDAr4VYAIwjHJQjhi1tKhqW/bfQvI+N2D4Wn698fYVPmg9hOg WegukZWtHwaMXThqjLIK3FBflkR/su0f+bEYeP/nGt/NQ+1Lnt8a5N85yp38OG6U7z 45moxg+43qgV3K/0uRNtMdOpyzDzPDfnRzeX8uSv1/uCAe/Ovq+XuSb/+1D6hqbqQs sPEczQVC86s/3ir1PcM4tFOpUHSP3mAJiuUp3zBdHrhQvRya4km7V42dY0wbPb/dH0 sF+bupj7hdCAqTCLQz5J/3OcQ1TWm3w/awzXIdfHl/kQPfsjORLLCj+L2fCUFImK3N TZVr7cBO+3UGTyttJ6kdvRxvDzY1OE4jqS5r99LYgjitDa9a0Em6RuZSlWle05o6BZ vGTLpoo71VqmK858sAcnhH2VhZfM2uvM+sLRVWYTgBhaOU0zCNaYrUPcjj3WBz9L77 61c3PDGt8qk13fclNZawHVGi0kTSJfAqxPM5i9jIYYL/wKmJ0UPqvIE7uAgzpOa5t5 4Aoh+Cb3JFh8ZxG3FIpa8vyo= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 3C99F20774; Tue, 5 Nov 2019 23:39:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1572997158; bh=lBuJv2C+uGZKrA6iab+hDwpZ2EuynjMJ9J9z+WBvACs=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=Hkylg+ioNDYMRIX2SvjlIN8URiYCXp58clO45uI4X6o+Y1BDYbIDEXFUb126zOzKF 5z03WojllixkVH6s9ZKbYFHHlIyPLvaOYzQ7sOVhE8chOF6/yXncm8lY9J3RRP2+6M r2jyf1UzA03tiT0MA7+0O0E4QR+oGAo4NT5ZPqC3tm6SqlrYwEXTSwGy77Rso1ocQi jGZZwSFdOpesgZaS6idysht3kcqYhO0UWtqFPXGlAtJ4Uew+ONu9UvJVxIpBIvs6M1 Z9N1If3izhRyJfQyafOvy6ENibVfN4M3dkXc0wIAVz/owokGlttOn+BpM+8xSMtuTv UFXe0NjawSndbRji38aW/+7obazpPKyvOjnn6AUgyfNBFQmujLnWd18Lnnoqtqt+EX Pnet104NwJIfjmx63WOZdUvBMHPpSoquE+hkM2oEtIlpxZU+ECB+KDEAhI7FzBG1Ee t8UGU2tV1t/9mxNlZ42tlaIA1cQFjtoP7TIQ8fIW5AcQ+WRRgRrMw4YY1XTsy++WDw wUzTS/hguUMGnyyFioi+hIbyAvC33fBZW2AR+772xAtQbJovYLR0IZ9wQxWBomP5QB Ax5nugIasTl1ZRfmgam2YLIvwvA1ILKfE2YR+hvQFL0n3QyI9OuAJrebeyu0rejPhD hSIuuJXlFV/NExZq461o24Ao= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 7922220774 for ; Tue, 5 Nov 2019 23:39:15 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:15 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 350C3166625DE2; Tue, 5 Nov 2019 23:39:10 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id A9247166625DE1; Tue, 5 Nov 2019 23:39:09 +0000 (UTC) To: arch-projects@archlinux.org Date: Tue, 5 Nov 2019 18:38:50 -0500 Message-Id: <20191105233853.1842304-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH 1/4] arch-nspawn: simplify cachedir/host_mirror parsing X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eli Schwartz via arch-projects Reply-To: Arch Linux projects development discussion Cc: Eli Schwartz Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" consolidate logic flows in the same area for parsing and building arrays. Don't bother having a special function just to build the mount_args array, since we now use the same handling for adding any cachedir (including host mirrors) to the mount arguments, this becomes a trivial for loop -- and it really did not need to be delayed until after the sanity check, anyway. Signed-off-by: Eli Schwartz --- arch-nspawn.in | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 90fe967..7aa6fd6 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -20,6 +20,7 @@ umask 0022 working_dir='' files=() +mount_args=() usage() { echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]" @@ -65,6 +66,13 @@ fi # shellcheck disable=2016 host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) +for host_mirror in "${host_mirrors[@]}"; do + if [[ $host_mirror == *file://* ]]; then + host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') + in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror") + fi +done + while read -r line; do mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \ --repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1$repo/os/$arch#') @@ -78,35 +86,18 @@ while read -r line; do fi done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list) -# {{{ functions -build_mount_args() { - declare -g mount_args=() - - for host_mirror in "${host_mirrors[@]}"; do - if [[ $host_mirror == *file://* ]]; then - host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') - mount_args+=("--bind-ro=${host_mirror_path//:/\\:}") - fi - done - - mount_args+=("--bind=${cache_dirs[0]//:/\\:}") +mount_args+=("--bind=${cache_dirs[0]//:/\\:}") - for cache_dir in "${cache_dirs[@]:1}"; do - mount_args+=("--bind-ro=${cache_dir//:/\\:}") - done -} +for cache_dir in "${cache_dirs[@]:1}"; do + mount_args+=("--bind-ro=${cache_dir//:/\\:}") +done +# {{{ functions copy_hostconf () { unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1 pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1 printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist" - for host_mirror in "${host_mirrors[@]}"; do - if [[ $host_mirror == *file://* ]]; then - host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') - in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror") - fi - done [[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf" [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf" @@ -130,7 +121,6 @@ elif [[ $(cat "$working_dir/.arch-chroot") != "$CHROOT_VERSION" ]]; then die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" fi -build_mount_args copy_hostconf eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" From patchwork Tue Nov 5 23:38:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 1346 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 8D7A114ED0438 for ; Tue, 5 Nov 2019 23:39:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:54 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id D25DD166625E6B; Tue, 5 Nov 2019 23:39:27 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 8D780166625E22; Tue, 5 Nov 2019 23:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1572997160; bh=w1+IRYFdRLTPRWg5Un5UgWF3ZUYHynqadNF4UDlNAhY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=gB/e60qFn2NZObsguap0SI3gONYul6sPRAvGOpLRWsd9NzKH0QmFvHDyaRzuX0Gxu vXYBfo2lGzeb+ND6A9B6smDXqsUqIUdf2pmKIl0pSpC78RQhzuq+++aI/MIkednlVT 63RgJuD5izBTkl027IwFRsmyxms6Udgi2rZR3bgMIWsr1ZIPadDNd2WjjJbmoJrwtr y6HfkeyB2xV9jWoFmbEC+CSw8TRTEtGA/cxMu0/x3k+A/y7HekeIQsgL8yiYJ/8WYN I1+bmKLqpb39eEv+4QTHoAhlBuoJl16q2e+SenD1IkpyktiOOqq53MOI6nXjt+QDJX vpgw+/p/A59yO1wjJ/WCyHhqgarcTnHmuOjLKYvAfsTKUmGmss4XNsukEjvPTH1upU pl7qyH6KvJXKWriheYyjBhqyExWEO0zRxlc2u6+o2AX+3T3RzvvA8q5JUCg7xv0IZp qY/H3LSjMbb356TSdgRSj/5GwCLc2/VnLnugK5r44LbvALPjWcu1pEB5Msesrys+eu 6jzsabxib0PBzFRI19RoXuz9m/A+qEpdoWaY3WV0t+2SjjaqC6iqip01jXTpDFlXAU 0d8bJd9ril3jre0sPbCWeRCs8+HEy5R7FbgT5WnaFV+xi1qM1OGcTs/2N/YP9WXGuZ ay5hymIjojwWyqaXBUOEBksQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 6FEDF2076B; Tue, 5 Nov 2019 23:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1572997159; bh=w1+IRYFdRLTPRWg5Un5UgWF3ZUYHynqadNF4UDlNAhY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=ial9CfotLZ9ptJAUll1f2lSxHwz7LvlzFrQzrXVGWpnUjvU6Q3Mf9NtLKhe+MPTVg OWrDDwkZAIYrCmgiJ4z1UUvt1+oUn7l9NuZeF2/SseFLUcXq5iwsXBP24wzmMVtSZ/ ojfdoqfS7Bzne2p6FXKRCvhYCGXNkvYPCUbDoyeJG0kNSW3kcMUir6ldXY5Ac26afI wTUj/xXGxKdnsPjbBChx7FwBQglDc9Z5hC3Jwfvj1vPw2M+9w+zT7AukCJ3CuM6Yd/ WeQltAMuWkEvfwAtoMcNVsHodIOlBK9dW95hPMhkVbXS03peohGP4As0a4QKv9stm1 T9AtlYoezPJa5KMZm+R4n6Xqgo/qS3lERj4nMtfybPZtF0lPPc/xHWKBY4OyfF6i8m NtnvCKAzs8uyQvRTGDkjoSZZpxgismfREc5yzp/Tl08GlRT0abyG+z1AcXuypiWFWT tNNr39g2FTqEwBPNnD3TYvrxFvRSE3S2FAzn0A99JnvhHeZ7XLf1rhI3dBCGnAoGK3 FQCK68Jd9w6XEjz9Y3jfH7kj6vhBBQDQNPQ/DSCURY2p7qrl2gUO0mJzkRLtM3YV37 gYPsU5pgxUT4MAFVzY9Pckl3spu4RPOmvt84J3T3O7IkpASIqt6bt+H0t2UFv3hNwg WTELoxzPBn45RP3/qJFJiWpw= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 523142076B for ; Tue, 5 Nov 2019 23:39:15 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:15 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id EDF6A166625DE4; Tue, 5 Nov 2019 23:39:10 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id 68952166625DE3; Tue, 5 Nov 2019 23:39:10 +0000 (UTC) To: arch-projects@archlinux.org Date: Tue, 5 Nov 2019 18:38:51 -0500 Message-Id: <20191105233853.1842304-2-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191105233853.1842304-1-eschwartz@archlinux.org> References: <20191105233853.1842304-1-eschwartz@archlinux.org> MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH 2/4] use libmakepkg to find and use variables in makepkg.conf X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eli Schwartz via arch-projects Reply-To: Arch Linux projects development discussion Cc: Eli Schwartz Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" - drop homebrew function in makechrootpkg - use better mock to find invoking user's $HOME - make offload-build respect makepkg.conf to determine where to sync files, matching the behavior of makechrootpkg Signed-off-by: Eli Schwartz --- makechrootpkg.in | 34 ++++++---------------------------- offload-build | 9 ++++++++- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index f5a0e51..b3a1854 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -13,6 +13,8 @@ m4_include(lib/common.sh) m4_include(lib/archroot.sh) +source /usr/share/makepkg/util/config.sh + shopt -s nullglob default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg) @@ -80,26 +82,6 @@ usage() { } # {{{ functions -# Usage: load_vars $makepkg_conf -# Globals: -# - SRCDEST -# - SRCPKGDEST -# - PKGDEST -# - LOGDEST -# - MAKEFLAGS -# - PACKAGER -load_vars() { - local makepkg_conf="$1" var - - [[ -f $makepkg_conf ]] || return 1 - - for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do - [[ -z ${!var:-} ]] && eval "$(source "$makepkg_conf"; printf "%s='%s'" "$var" "${!var}")" - done - - return 0 -} - # Usage: sync_chroot $chrootdir $copydir [$copy] sync_chroot() { local chrootdir=$1 @@ -338,16 +320,12 @@ for arg in "${@:$OPTIND}"; do esac done -if [[ -n $SUDO_USER ]]; then - eval "USER_HOME=~$SUDO_USER" -else - USER_HOME=$HOME -fi - umask 0022 -load_vars "${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf" -load_vars /etc/makepkg.conf +ORIG_HOME=$HOME +IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}") +load_makepkg_config +HOME=$ORIG_HOME # Use PKGBUILD directory if these don't exist [[ -d $PKGDEST ]] || PKGDEST=$PWD diff --git a/offload-build b/offload-build index 7a07b15..078796a 100755 --- a/offload-build +++ b/offload-build @@ -18,6 +18,8 @@ # along with this program. If not, see . # +source /usr/share/makepkg/util/config.sh + # global defaults suitable for use by Arch staff repo=extra @@ -105,4 +107,9 @@ mapfile -t files < <( makepkg --packagelist ') -(( ${#files[@]} )) && printf '%s\n' '' '-> copying files...' && scp "${files[@]/#/$server:}" . + +if (( ${#files[@]} )); then + printf '%s\n' '' '-> copying files...' + load_makepkg_config + scp "${files[@]/#/$server:}" "${PKGDEST:-${PWD}}/" +fi From patchwork Tue Nov 5 23:38:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 1344 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id AC60814ED03CB for ; Tue, 5 Nov 2019 23:39:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:32 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 18C78166625E1C; Tue, 5 Nov 2019 23:39:18 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 3676A166625DF9; Tue, 5 Nov 2019 23:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1572997157; bh=8LsyLHmsiuF1zY9LQ8frXsAZp5zjshInTcDcoyhsy4I=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=Y5TVm1CK7/C1ydWWqIVS+9ylTsuaG1rrzlQfmW41HEcfLgbrTwdeCk/LDNqn1If/x H3uOIvZRxIrb83rlal5ynvr7gJXHytSuEq+QLL1xo29NOdmoodBJchlsKnMufJnrzQ oX78cPL6ofjCUnCbWYotV7+G9Dp3sz504e9mevH9E1wRdf8xuc3BJJfiCimfUCJP+8 5oEj7zHWtAxxAwEyP/SWfXoahCk9+lSVwXlWjb0PBmeDaz2lN0QeEs0axfxZXSgScM qkcVgzF7pRjWO41+2lxiSRtBgw5cyjssijbBZ/f+9BYlpFZOO1Zt4NKC436RlRkW6j lTIB290y95klLsRnWbyK7SI61uYQ986M9qnlYqevQorl931tROYQxVfDPgQ2+McX5W 3ub5aR4R4QbF+AvthBwilGbw+txCdcVP3CTuKvpP9WWV2hunYSMmV2LEpPN1RCqnCG iHLnvkhNrjQ3OsnMDbEzGb2e3vI5nU9rvaua+oDjReMnf6qVH4qdUnUkGLsNrjoDy4 zdquR8ImV+LOqgR+NdZG34/WoH6eMyZdn3wzVM9QRi0ZyR2ZMS1ZwcPt4LCdNPnV75 xniPfGm7H3orU2UIkRSOT9/0bwqxrFcoONHuilWYM+Bz9OmrFRP28hsajZeZlMGTro sIfcvCIpmc0INkfi7ls1y59M= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 08DD220785; Tue, 5 Nov 2019 23:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1572997157; bh=8LsyLHmsiuF1zY9LQ8frXsAZp5zjshInTcDcoyhsy4I=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=HNZyVW0qY9+aJYt8bP6xB5XPbU/jIxQSR5zcUwz04zF2v2sA4nQkvdRkMgn7vU7+Z Q7woyPCNOV+xGlGuUJcYo0Ttc4XT0uEADwLMM65NZbTA2fhT8NS0LsXvPGOLw87Yos DfWAxdBH3FT867vMsLZz2cDK+wB2iKLZ9/9eCtydDT2Pw9Vlhr2KkOlzQpGLtHEY88 HFS/LhtrIv7uBpfo5zl16oBaq2Te4JPSjaaYpP0mT266a8dq1EcgHJvjBK+5FPsUX1 SI7GrTad3c+URV0pOM3ZZ+SEBmwE7X5Hlku0gbI2ILWJO1pF7ovhZhBEsJyO6uHWKL qG20cIAjpsr+5fUwy65JtFxH2dnBcPByZvUH1YepM931EqutlbeyMkXyeTGzUcjsR/ x5MWVtHaHsi+D/xmtDiPIoTDKh6OeoupkFxvE3Hbfb9vTzg0h8i2soOQZq2WM8phCN BavEQzfAWxIekfdOqkBMw9BMC5OwNUtxpVAITHRH7gccweI3OMO6O1Eu+qN2gOhkz/ pzXvR5qSjvODDPcK85z+neMKVV92Tgr0l5F9dkW7I6E7I/e+TnWmBdPnhRI6f2dN9K aKUcx3yW+3A/Q9F9N8AfDzJBj0Hs10yrwF/DycnNI6UcXDAXuCZh//UOJ1EWFx3ZvT cSMA24zrNVI6xXqNtiVjBggk= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id B4F8420769 for ; Tue, 5 Nov 2019 23:39:12 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:12 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id AED28166625DE6; Tue, 5 Nov 2019 23:39:11 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id 2827A166625DE5; Tue, 5 Nov 2019 23:39:11 +0000 (UTC) To: arch-projects@archlinux.org Date: Tue, 5 Nov 2019 18:38:52 -0500 Message-Id: <20191105233853.1842304-3-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191105233853.1842304-1-eschwartz@archlinux.org> References: <20191105233853.1842304-1-eschwartz@archlinux.org> MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH 3/4] Makefile: sort program names X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eli Schwartz via arch-projects Reply-To: Arch Linux projects development discussion Cc: Eli Schwartz Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" Signed-off-by: Eli Schwartz --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a8e44ee..0eb7a88 100644 --- a/Makefile +++ b/Makefile @@ -4,19 +4,19 @@ PREFIX = /usr/local MANDIR = $(PREFIX)/share/man IN_PROGS = \ - checkpkg \ - commitpkg \ archco \ + arch-nspawn \ archrelease \ archbuild \ - lddd \ + checkpkg \ + commitpkg \ + crossrepomove\ finddeps \ - rebuildpkgs \ find-libdeps \ - crossrepomove\ - arch-nspawn \ + lddd \ mkarchroot \ makechrootpkg \ + rebuildpkgs \ sogrep BINPROGS = \ From patchwork Tue Nov 5 23:38:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 1343 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 974C214ED038E for ; Tue, 5 Nov 2019 23:39:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:20 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 85C04166625E00; Tue, 5 Nov 2019 23:39:17 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id DCAD9166625DF2; Tue, 5 Nov 2019 23:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1572997156; bh=+6LaKRCRLCHWBY29dn4EBlykoG9kH3OHiSo1l4LCDYU=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=dWiTh/+wenVV+j05HdwseAJViELmh1fDuRfoxMUTJNqLhoRGow2IlcjJ4JBIGKmBi D8oJHQEbjjwg/pr3LHjMxk97AH7g1GXg4OOj6t6vTb0etwLCY/4AGvn0RDa8/88nm+ QbEbx1V9RWrBNA2Ep/UeNHx9MrLjIDYC+SGReUGXB/40U8nVluk64yzcnDaJdin67I FuJbXsbrvn85gb6nCc3bMLls6M8in8YmfrkLBRbiRVv7nsJgeiE3j/RXan3VW8vUnL lWuEKers1pP3pWulzy8FxIRch4SfIw11r7Cy77/LsCLabfA5UI2pe4xrpQBuJrBPCh /RPxvVQEt13rfLzz3MTEopL+sNIA+gH5p20+RHLIqtrjn8cuwyCTdr/aK+/XxZfg2V NvVpvPrLXJd+eV9vmbGQAk8pWSwDA6phSfG5wV9G5+fZCC0L2Uu9uLQrR9xy4Q3Ja3 An9FPcY1SN7KxYkMncCegoqrJNcTftPWi+8kA9TecBW3aQjo8bXPxu3tBHHyu+ON7e 35LnyzlMdHNrrfC7tilDrOfGF8Pu+SgHO6nA0eJ5fqp/axmls3wSYxEUsU9RlcjTYK SordJ0jN/rtiHjneCPJTEG92u1tOI5lWFHHIqzTqlObmK8c+pJuuAW6lzuPnrLOaMc dD2pb3iALucSst2WyGKFAxFk= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CBE6120776; Tue, 5 Nov 2019 23:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1572997156; bh=+6LaKRCRLCHWBY29dn4EBlykoG9kH3OHiSo1l4LCDYU=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=gy2H4k6a7TVJOLRG7JnEZaj92FvU8n1Jr8PK42Qq79ItyS0lcGcvXY7HaL+XiVd0z x0IweXNa3bkoaAWnx2amFeJgEEqBAyD8o2cZd9lsH0D8RcU3FFP+X/bN6AOUrDjL+u uUWjHPiUKuxplPelrD89BBvi9XKTPW0c8cx3hXpsXkXIwJNrMXt7zmw2L/qmCFN73O Ap4Y9NC+vCUKGojl4rqZpsaRTl7MNgLYfzOARWs1NdXg69ieXh0dKyvbYn8/xjmt0q fNydMqQf8xASJ6HXj+jJOtayO8GBQBJqU72eKgk/ZruyaGYv1GWqxu8Re+n4ABIZfB nVT6Z9Y0q8uSxiOZTLm0WERgK+66SGxNhG1xQ12pmCSSGuVRF6qbQ4SSX26DfUvIqN iQMQoH3i2ORyzxC9GQjXOfO+RO8KwUldwIEe3fUIZcSAFGvy1BjW9JP0jIzexlMUpX 5KmZwYL+KMMKw3yM8S/j017+2gRHRmSqbxWPeAVg6/xc/jj/4QK2MXK4i4IvI+ctfa d5jXiVAOseEo2sVdpd145SdY0vMN+GUvvUL3oh2Jj92HQosykTLdI5f7LPUUgi6pm3 t6TLlFHnzm6sPBCbvpLeSCkgg/ZclZNOkZfxI5sUFDsOWaSIjhRZoQn+6z5/ZuANT2 SQti9SavOQubLKiTEw4KhLnE= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 83DFB2076B for ; Tue, 5 Nov 2019 23:39:13 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 5 Nov 2019 23:39:13 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 6C7B1166625DE9; Tue, 5 Nov 2019 23:39:12 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id DD56F166625DE7; Tue, 5 Nov 2019 23:39:11 +0000 (UTC) To: arch-projects@archlinux.org Date: Tue, 5 Nov 2019 18:38:53 -0500 Message-Id: <20191105233853.1842304-4-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191105233853.1842304-1-eschwartz@archlinux.org> References: <20191105233853.1842304-1-eschwartz@archlinux.org> MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH 4/4] Use colored diagnostics by default. X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eli Schwartz via arch-projects Reply-To: Arch Linux projects development discussion Cc: Eli Schwartz Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" I like color and feel comfortable using `less -R` to view logs. Signed-off-by: Eli Schwartz --- makepkg-x86_64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 137d412..7fc3611 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -39,8 +39,8 @@ CHOST="x86_64-pc-linux-gnu" #-- Compiler and Linker Flags CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fdiagnostics-color=always" +CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fdiagnostics-color=always" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2"