From patchwork Fri Dec 27 17:08:30 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: 1423 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 78A4115E20A50 for ; Fri, 27 Dec 2019 17:08:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org 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=ham autolearn_force=no version=3.4.3 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 ; Fri, 27 Dec 2019 17:08:55 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 69BFA179087B73; Fri, 27 Dec 2019 17:08:53 +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 1199F179087B6C; Fri, 27 Dec 2019 17:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1577466533; bh=6HA0jqH3AcPk7qkqf4HJzVikCoDK38PH8DWTNIYzvns=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=AplE01WSnMouq2kDHUth4B5XF0DzJzYUxnaOOLtjY+6pF5KEvDQyCY7j0RAWojcK/ XVXcAl3QdNKrNOZMcF85ipe2dj2DYu4j9Cz9S7lvkrxq3hN/4PrVHe5b4kVqbaTsZx O2yZuL8GcyN9lSUZ4IUt9oh6MG86FYJZZFt7hx7dK21u11w2URsOyzIL3g6uYjdHB6 goBBx1K/wRpnU5Yu1n5q96rssnvgELuTPqRAYNm1aAecIGskTfgbQlHTYvVkdb7Qq9 FyP/zRIBC5L8OZ2X+x1D6bBlesZNlmR6D8aE4X07n+XzVgGmBRfJLFDt8oInHdLfRe QpAdUMKDq7+Nfyzws24poZguRy8fu+8tclwSsGVzGYHTu2xb8KMSoPU3BrznwEpOOu OnqrfC9sdGyZUpTMyCtD/dIkStbPe6tnVAha0myD5ik2LTyhQuAuvQ9X1oQfTaoKFw 9tKZ0mRF7KOY3xVNKN2YnGtc2YoGl56REs3Hk19JJ4jBeFnzB4WNIv0Ogf0tMlYKAa 1WgXzwb/qxxU+9EIeOXiNeKW5g6BrEBsmkcsxFc11q4zDI3rfC7nWTLHFx8mtQplfZ qhpG9WLr1XTL1q1z7hFHdPTK9jEu2BEv3/r/V+AKWm9xncOYlSKap6pFy435NuwnvT hqvdVQyH47wX4SnLpkNw3Mqw= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id F023C2B391; Fri, 27 Dec 2019 17:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1577466532; bh=6HA0jqH3AcPk7qkqf4HJzVikCoDK38PH8DWTNIYzvns=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=sHo3AGT6+uNgIn9Hixf3WGOhhokjbEMTP93IkzDWVhlJEzjyN8L4JLwAn0LNcjnrw uerk+vyc9QXg4dWPHZQr5RxLy4xOpJeRNXkMVB/MIJquLhyt61qmhXdClJbY4vvDMf HCnKFTbN/46xTIqVSbzLL3zVtup3+ImhmSPRTk7tnikr+4HFECvaStzOMKimCY05kX HGxeLgihY7PwvmXgWPjSa6GZ1E/T+oP7FN+oSpdWxfEHmcohocalkhZxVwFS/8Lj8+ XsnBBcGopc0n5a1okD0nLxnJz+pLJQtMTq3C1yZdVhLNQkhQrb6nMHqgtI0p0UwX1A 7EYTuQZ7TO+0JaIobIXpAABjvj4QiE9tTen3npl+3LflcoD/a5g/CXXyoaQ0JHii/Z akm6QtYQRGfuKYp6jriSzwiwD7bpu+h7nxfw9Bd/5rjQCF+bF6K3yTrEegaYN3CYfZ oe9iic41rl1cRe2Ji2oRiw07xLAWDULhZ7SB8IHf4XApwRXxSjCIcgGsEgS0cMNgCY gLv4WVay/R6wvDwXGzekTa7UUshPgaey2edwtVeYKkqLgVx0/pHCTy4RfownmCnHRi NB3IOeDyPXIcOHshJ08P9k03gBHgDJGVx5f5KfAEXAwWoglwyOIHo8BvKf+QBvLYuc kMlOIW0+DLv8TjLTbl/cwfT8= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 0A7072B38A for ; Fri, 27 Dec 2019 17:08:50 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 27 Dec 2019 17:08:50 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 09985179087B67; Fri, 27 Dec 2019 17:08:49 +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 77224179087B66; Fri, 27 Dec 2019 17:08:48 +0000 (UTC) To: arch-projects@archlinux.org Date: Fri, 27 Dec 2019 12:08:30 -0500 Message-Id: <20191227170830.1154340-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH] makerepropkg: correctly reproduce a pkgfile with any compression type 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" We don't want the default PKGEXT in the current version of devtools, we want the PKGEXT we *know* the input file used. Signed-off-by: Eli Schwartz --- makerepropkg.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makerepropkg.in b/makerepropkg.in index 51c2dd2..0721f65 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -144,6 +144,9 @@ export SOURCE_DATE_EPOCH="${buildinfo[builddate]}" PACKAGER="${buildinfo[packager]}" BUILDDIR="${buildinfo[builddir]}" +trimprefix=${pkgfile%.pkg.tar*} +PKGEXT=${pkgfile#$trimprefix} + # nuke and restore reproducible testenv for copy in "${buildroot}"/*/; do [[ -d ${copy} ]] || continue @@ -166,7 +169,7 @@ makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1 # set detected makepkg.conf options { - for var in PACKAGER BUILDDIR; do + for var in PACKAGER BUILDDIR PKGEXT; do printf '%s=%s\n' "${var}" "${!var@Q}" done printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"