From patchwork Mon Apr 1 09:41:54 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: 1056 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 87A9CCE314FD for ; Mon, 1 Apr 2019 09:42:14 +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, 1 Apr 2019 09:42:14 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 797D211A465C84; Mon, 1 Apr 2019 09:42:10 +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) by orion.archlinux.org (Postfix) with ESMTPS; Mon, 1 Apr 2019 09:42:10 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 4604A207AA; Mon, 1 Apr 2019 09:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1554111730; bh=+0cVTFYvpjclYarg1thr1B7S3B4ms9nCW+JKrGHQKCs=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=QDxLh/4nR5PtSZXlJ0aROQ3SejAQILeCL0tTntnwlGIyqrBg/NQEe1eBCLIOkM9Jb ENV4fcDpiHdnuIArKhGwxtAE+u9ZdkFz4EOQa56ThKNDaYdXixCnRL8b4cz3uFjkBT c5+OwgLWXf5T4yzRKZrvqcD9pCt7fLQEQfIBBwHZIeZahaayeJhFkgNUUq7fcWIbHv 8yzyRqWChC9ZI/h3g+4NrCoK2Aw0Oqf/VyBkk3i8KDA0uzjFXM94tWc7Ca+kSvXZiG 7RholVJenNeNuZBVlrCugdK+xntFPAXKl0qeU7OQnRy/ml2QbFK13ZYQETaZX1wQ9Y fmCO4DsAj9t93fg00rya3F5tOjtskGeu9VjKhUaL+zQBJLO33h3NSpros/XeotklsR Qzv0xLXXZKS/0iShkBRVS+SBYh65oAH9hPGledL3z5svCbL/aelt3WuO1Dn/jKAqpJ +cgwCamQJUUqXNH8dX3IpSBIyXDpGOQ57m5EoQpJkRe1eFtrJtBNXUrpHAzyN+bRcQ axpy8Jzgq1F/NfU8nZ9ivvhGlooerVL5Va8LQNjxvEO/UgREF1u/HdgS2lxWwnT0nt DZory8uX0lKWygRa8gR5wgzoietzoVDNXYJdvyumOhQ0sACMIH/k/iL6DnucmsTRuo trPzh9HoYHjszFhgfmZYfcrA= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2FAE9207A5 for ; Mon, 1 Apr 2019 09:42:09 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 1 Apr 2019 09:42:09 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 3662011A465C81 for ; Mon, 1 Apr 2019 09:42:04 +0000 (UTC) Received: from szilassi.eckner.net (szilassi.eckner.net [IPv6:2a03:4000:2a:1bc::1]) (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) by orion.archlinux.org (Postfix) with ESMTPS for ; Mon, 1 Apr 2019 09:42:04 +0000 (UTC) Received-SPF: none (Address does not pass the Sender Policy Framework) SPF=HELO; sender=nlopc43.ioq.uni-jena.de; remoteip=::ffff:141.35.50.156; remotehost=nlopc43.ioq.uni-jena.de; helo=nlopc43.ioq.uni-jena.de; receiver=szilassi.eckner.net; Received-SPF: fail (Address does not pass the Sender Policy Framework) SPF=MAILFROM; sender=arch@eckner.net; remoteip=::ffff:141.35.50.156; remotehost=nlopc43.ioq.uni-jena.de; helo=nlopc43.ioq.uni-jena.de; receiver=szilassi.eckner.net; Received: from nlopc43.ioq.uni-jena.de (nlopc43.ioq.uni-jena.de [::ffff:141.35.50.156]) (AUTH: PLAIN erich@eckner.net, ) by szilassi.eckner.net with ESMTPSA id 0000000000820004.000000005CA1DCEB.00007686; Mon, 01 Apr 2019 11:42:03 +0200 To: arch-projects@archlinux.org Date: Mon, 1 Apr 2019 11:41:54 +0200 Message-Id: <20190401094154.27020-1-arch@eckner.net> X-Mailer: git-send-email 2.21.0 Mime-Version: 1.0 Received-SPF: fail (Address does not pass the Sender Policy Framework) SPF=FROM; sender=arch@eckner.net; remoteip=::ffff:141.35.50.156; remotehost=nlopc43.ioq.uni-jena.de; helo=nlopc43.ioq.uni-jena.de; receiver=szilassi.eckner.net; X-Mime-Autoconverted: from 8bit to 7bit by courier 1.0 Subject: [arch-projects] [devtools] [PATCH] $pacconf_cmd in arch-nspawn should use the provided config file (-C) 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: arch--- via arch-projects Reply-To: Arch Linux projects development discussion Cc: arch@eckner.net, Erich Eckner Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" From: Erich Eckner If arch-nspawn is called with -C, pacman inside the chroot will use the provided configuration file. This should also be the case for $pacconf_cmd when determining the remote servers. For example, Arch Linux 32 provides separate pacman configurations which use /etc/pacman.d/mirrorlist32 as mirrorlist for their build commands (extra-i686-build, etc.). This way, we can build i686 and x86_64 packages on the same x86_64 host with very minimal changes to devtools. Signed-off-by: Erich Eckner --- arch-nspawn.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index e68e2e75..461154eb 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,8 +60,7 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) -# shellcheck disable=2016 +host_mirrors=($($pacconf_cmd ${pac_conf+--conf $pac_conf} --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) # {{{ functions build_mount_args() {