From patchwork Mon Nov 18 02:32:41 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: 1375 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 485A3152612BD for ; Mon, 18 Nov 2019 02:33:18 +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 ; Mon, 18 Nov 2019 02:33:18 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id A9E1816B40D208; Mon, 18 Nov 2019 02:33:03 +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 1443F16B40D1E2; Mon, 18 Nov 2019 02:33:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1574044381; bh=sD7RmUZy9B9grQpTw9CHUCN14feP8/MngeJC+PrU3dQ=; 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=Uf8Q/61kfOaoWZAmew1HNYyGjoQlZr/S/OZ24kdAng0CQbK87p00snjGDEMwfTNQy rGvzwWkSqx0qh75gWlmAp5ilNS5zx0geuBvt6CCFBHg8sW9Jjy8JX7pJDzH0oJ94YF IP7h8pUwomJm977rFXQ7B8i1E+CNb8O/fMpGB49lxVlr6Mx2pTPAQhE7LGQTY2jdzm diPLi04QGdzk+1LmWlyO/ZseF0pQ5EVzPd0lsnid4TYjdfBxmcJkTx+EbodYYwNeQd y1saABVyDpbrSabbE5QWnwhlNN4L4qSrKQUNOqUY5mj9/FTVpOID591KQEnnybBk1H zlNY2ltc8nIiUAIOYF5+DJZwICUes1o/cu1sYLPWLR67NtYSFQexVx2Q/fWffdWFsc +8sPX1nlg3h4OzDc7JiClwYaXLx8xI8VNCKAz4hQ2BxKdxA2M13dJTouHqwGtQBKM+ UcBiG2Vaw50zPehlLX0rBvzTNUM6zvRJf1vMHUH68T5vRUmCD+Z0cPM8GLKmxW2TNP RX0W8TOawvN3e7nweOOw/pJ7Bttv7wIxbq7mu8ECRvZL7CAjFVnjRxcWxfI0f3kb1C +h4rwRMCO7Yu2naYZXB09T/AfaMpoHPxn1wfq/cUwTziswaDFcqPOBXFm5n8IC512v pjnJ0wjXV/aFpE+suMmnfXKQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CB4AD20F0C; Mon, 18 Nov 2019 02:33:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1574044380; bh=sD7RmUZy9B9grQpTw9CHUCN14feP8/MngeJC+PrU3dQ=; 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=SwMJXUkm2ua5tb6h0XygLpjoFJxs5LrCM0GC7mi8/VFaiRqXDb+IXFbMdAYaww+x5 engckHHu+pmMLom5dDzileXQ3cJS9qEm9/BGkAh3LzV0x7na/H0i+j+jOs3cxdceiz iQx4NTit0NumW4zUIQq+AW4rEn+72uGrU5LRk6B/vF+XQnHgn9h0yunYZZCsrmtNoP 1vsuTuFpyHNAxYmB2nt+fwMxUcNUrlDVKKjvz90xvrC4U2nCroKAFEDKy517bzf7eA vgK7+fxuCossRhE7NkzkAT0YINllno1PkdeFJPxapEWggXSkT8YX1rHPiK7bPLhjIu 8k84E4I0WgSB59q2MZ0li+b2KYc/jHYsJ9BZcXudxOY9NT3yLMmHMmQ4bWDhVumLkE nWuFNw2ktQdONZu2rrtZo8fiGK7p850XO+VPV1zKWRpMjebNGAN7GkMoK1bj5Y1sxV wt+O9cJ3oQ3+hKoxhHLbbsmeA3GPKOMXbX9LVYLO5YeJopl9TwiJiMZgZ7oRB3sYs5 6rPjTwn4mOXwIxuPdlmmVdI7/IsjKYXpW4tycvm7KPjcp66T40vAe63AS3UFoxs0Lt yLS82Z3aBXiUrsa1nU8nBCbbjjKQW5/OjqZd0N8B+ko8ssjrb5KtLOnPFuhwXMf8bK eZN0QSqbvXF/oXoH8L+LGiV0= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D2ECD2077B for ; Mon, 18 Nov 2019 02:32:57 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 18 Nov 2019 02:32:57 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id ACC6F16B40D1C8; Mon, 18 Nov 2019 02:32:56 +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 2E3ED16B40D1C7; Mon, 18 Nov 2019 02:32:56 +0000 (UTC) To: arch-projects@archlinux.org Date: Sun, 17 Nov 2019 21:32:41 -0500 Message-Id: <20191118023243.339374-2-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191118023243.339374-1-eschwartz@archlinux.org> References: <20191118023243.339374-1-eschwartz@archlinux.org> MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH 1/3] mkarchroot: support wrapping pacstrap -U 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" Needed to support reproducible builds. Signed-off-by: Eli Schwartz --- doc/mkarchroot.1.asciidoc | 3 +++ mkarchroot.in | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/mkarchroot.1.asciidoc b/doc/mkarchroot.1.asciidoc index 03d032c..eb0670a 100644 --- a/doc/mkarchroot.1.asciidoc +++ b/doc/mkarchroot.1.asciidoc @@ -20,6 +20,9 @@ en_US.UTF-8 and de_DE.UTF-8 locale and a generated machine-id. Options ------- +*-U*:: + Use 'pacman -U' to install packages. + *-C* :: Location of a pacman config file. diff --git a/mkarchroot.in b/mkarchroot.in index 6c42d3b..37f6802 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -18,6 +18,7 @@ m4_include(lib/archroot.sh) umask 0022 working_dir='' +umode='' files=() nspawn_args=() @@ -25,6 +26,7 @@ nspawn_args=() usage() { echo "Usage: ${0##*/} [options] working-dir package-list..." echo ' options:' + echo ' -U Use pacman -U to install packages' echo ' -C Location of a pacman config file' echo ' -M Location of a makepkg config file' echo ' -c Set pacman cache' @@ -34,8 +36,9 @@ usage() { exit 1 } -while getopts 'hC:M:c:f:s' arg; do +while getopts 'hUC:M:c:f:s' arg; do case "$arg" in + U) umode=U ;; C) pac_conf="$OPTARG" ;; M) makepkg_conf="$OPTARG" ;; c) cache_dirs+=("$OPTARG") ;; @@ -44,8 +47,10 @@ while getopts 'hC:M:c:f:s' arg; do h|?) usage ;; *) error "invalid argument '%s'" "$arg"; usage ;; esac - nspawn_args+=("-$arg") - [[ -v OPTARG ]] && nspawn_args+=("$OPTARG") + if [[ $arg != U ]]; then + nspawn_args+=("-$arg") + [[ -v OPTARG ]] && nspawn_args+=("$OPTARG") + fi done shift $((OPTIND - 1)) @@ -85,7 +90,7 @@ for file in "${files[@]}"; do cp "$file" "$working_dir$file" done -pacstrap -Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ +pacstrap -${umode}Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"