From patchwork Mon Mar 18 09:52: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: 1044 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 1DF80C9618AF for ; Mon, 18 Mar 2019 09:53:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00=-1, 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, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Mon, 18 Mar 2019 09:53:03 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id A88521151055B9; Mon, 18 Mar 2019 09:53:01 +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) by orion.archlinux.org (Postfix) with ESMTPS; Mon, 18 Mar 2019 09:53:01 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 709BC2C199; Mon, 18 Mar 2019 09:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1552902781; bh=ZwTQjJzgA4KjHXMbBogHGJeHCBgpJhMsox4jAMZ721g=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=vRZxm5MClo+gMobx4Xj9+uraM4FqfvtU+5U5EQS4tFD02nz6qZ2UPZwS9E/8bKhPw QwVM5yuU8ZBO0FIn2XjQmx8wURYsRuN5v0i7lDKXVLiefQfcURAZyRAt/J7Vbq86oC 6ol7+5xnlRnEPpL+qG2iTh1sOFBQSLN+7iAMaXtrruUT5c8vk0nmuY6lEUZDoP7H4S PoOyqlKCmsWAFv/ty6Fc/j8z24GL+N2C+zJ5WvYZe3ol6cSGEbD48MQs5q6K0coZ7f 5coRQqJyAn868WJUrIXKdJuBhdMf0AztwzvtDyZQgltNIMRsdUKKT75+1NLeVc1XWn zpJS2qHIPGm+CIHV+B9bq3kvGAOBY/fWLolR1u7meDZWqa9NwMo6/uU6dt1GlDAHPe RA9JhyLh9Z5HUpM2F9Oln4nTbD+vQGRPawuQeM5JevHmKNFgeGzX8JwqBrS7GvK2TY v8LodA14rnDARoiqOFmtuNCI1B8CiA99xTFOkkGQD21jL1Gt7CnjX5hHlEGePBXjZn ZOcauLweP1ZuKvdWGP2fU8Iw+DvQ8xaiKCmXtDeDVwfUXc5tyvunnZ2yZbLurFgwEW 6I3uKwe1XLWeEeElWkBnO5S5uLbHZMZN92eXlkb6ufwS9/A2mGuP6RkkJ8y+hQIkkP ST+7ozVyAWglXLtHolHRJ3PU= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 3EC3F2C176 for ; Mon, 18 Mar 2019 09:53:00 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 18 Mar 2019 09:53:00 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id E30D81151055B6 for ; Mon, 18 Mar 2019 09:52:58 +0000 (UTC) Received: from mail.maximbaz.com (mail.maximbaz.com [40.68.155.0]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Mon, 18 Mar 2019 09:52:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: me@maximbaz.com) by mail.maximbaz.com (Postcow) with ESMTPSA id 285908E2C5 for ; Mon, 18 Mar 2019 09:52:57 +0000 (UTC) Date: Mon, 18 Mar 2019 10:52:51 +0100 To: arch-projects@archlinux.org Message-ID: <20190318095251.g2gnwxeiz4md22lt@maximbaz.com> Mail-Followup-To: arch-projects@archlinux.org MIME-Version: 1.0 Content-Disposition: inline ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=maximbaz.com; s=dkim; t=1552902777; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=MeqPtg2ocC709US3e0Hxk8varFUVOMJM3EMihFi6AAo=; b=GnQXmEyFvuTvvKxMHguLnp+W2Hp+YVkyT+R8Ma0cXboEOKabBtDoNIq8BZ54yKrHkz1aES bNqW01UgjDD6hP3DSNAOTm5+Ea4VaVnCfs4TvYVjgrTRrSPUHBcroUXfgyUXNPbd/PQwhe 6NgXRK68WT8bg79cEq9jfUSb0bVfSLEBq5ubSdqG70JdDXiT3/Ryv5towqVzbbLX7BmhhE IdLUlEhjnHahlZKDC/QdQu4ydQ/fBtY9rp+V9T8Jqq3Hso/jPLFGrMwfabn7u1mhUy7G1h 6cG6ZvSp/h+NruwilGMgtgGrDkeQu4de6lcnmHHa+glc2pqJf1XhauMAVX7rYQ== ARC-Seal: i=1; s=dkim; d=maximbaz.com; t=1552902777; a=rsa-sha256; cv=none; b=hy3EsMN3fq4EBn+qCbWqfUDZFQu5Gn3jTD8q5z6eqT89hH0+tpsXsHCvjaMRNzfAxa2Rwo bzxsxpFxPZd41Fi0JAcb8E+lmRS5vRFpgQ2fB9cYAbYpStyCpawBjO5fzJs4K6WlgET8p2 pO5ONeoVfB2ba7gJMGezBdlmAAcutkAsq9omlWxxifYJJcYmQlfu4F/oKh0z373upqnEg7 +2IzwlSGM/nQuzxC30HkPKc8Md/Kb5/lJR1yP0CJvIk7re1HkzKHe2TU+3mw6uGcSpywF+ y01UIgrgEJ0zJREJiyOERaOVTNAznI+FyzdKgQxkjZ0jc6YA6+uNPPMCdVoEGw== ARC-Authentication-Results: i=1; mail.maximbaz.com; auth=pass smtp.auth=me@maximbaz.com smtp.mailfrom=archlinux@maximbaz.com Subject: [arch-projects] [PATCH] [devtools] makechrootpkg: load COMPRESS* vars from 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: Maxim Baz via arch-projects Reply-To: Arch Linux projects development discussion Cc: Maxim Baz Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" This allows using faster multicore compression tools like pixz Signed-off-by: Maxim Baz --- archbuild.in | 2 +- makechrootpkg.in | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) -- 2.21.0 diff --git a/archbuild.in b/archbuild.in index bd5706d..e3d53ec 100644 --- a/archbuild.in +++ b/archbuild.in @@ -39,7 +39,7 @@ while getopts 'hcr:' arg; do esac done -check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME +check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME,COMPRESSGZ,COMPRESSXZ,COMPRESSLRZ,COMPRESSZ,COMPRESSBZ2,COMPRESSLZO # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") diff --git a/makechrootpkg.in b/makechrootpkg.in index 4b72a36..e4b7ca3 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -29,9 +29,9 @@ usage() { echo 'command:' echo ' mkarchroot /root base-devel' echo '' - echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER' - echo 'from makepkg.conf(5), if those variables are not part of the' - echo 'environment.' + echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS, PACKAGER' + echo 'and COMPRESS{{G,X,LR,}Z,BZ2,LZO} from makepkg.conf(5),' + echo 'if those variables are not part of the environment.' echo '' echo "Default makepkg args: ${default_makepkg_args[*]}" echo '' @@ -63,12 +63,18 @@ usage() { # - LOGDEST # - MAKEFLAGS # - PACKAGER +# - COMPRESSGZ +# - COMPRESSXZ +# - COMPRESSLRZ +# - COMPRESSZ +# - COMPRESSBZ2 +# - COMPRESSLZO load_vars() { local makepkg_conf="$1" var [[ -f $makepkg_conf ]] || return 1 - for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do + for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER COMPRESS{{G,X,LR,}Z,BZ2,LZO}; do [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$makepkg_conf")" done @@ -185,7 +191,9 @@ prepare_chroot() { sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf" for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \ - "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'" + "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'" "COMPRESSGZ=(${COMPRESSGZ[*]:-})" \ + "COMPRESSXZ=(${COMPRESSXZ[*]:-})" "COMPRESSLRZ=(${COMPRESSLRZ[*]:-})" "COMPRESSZ=(${COMPRESSZ[*]:-})" \ + "COMPRESSBZ2=(${COMPRESSBZ2[*]:-})" "COMPRESSLZO=(${COMPRESSLZO[*]:-})" do grep -q "^$x" "$copydir/etc/makepkg.conf" && continue echo "$x" >>"$copydir/etc/makepkg.conf"