From patchwork Fri Dec 27 17:41: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: 1424 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 B98EA15E223BC for ; Fri, 27 Dec 2019 17:42:01 +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 [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Fri, 27 Dec 2019 17:42:01 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 7A6C01790B0490; Fri, 27 Dec 2019 17:42:00 +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 F2C281790B0487; Fri, 27 Dec 2019 17:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1577468520; bh=Bvf9x9BjHKKh2jiKtOiK6WL1gEt1SrGs8dnMUmroVMI=; 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=iAvVH3lBpy7y2jxK20xWLf9HUDcSEFmRYBt3gi5JhsQabyARSuHA4JaXRM151yVCX 0PZ+0UcZm+I/rQR86AqKRFzRV0oQm47Yfi+W5Z27ikTOk7c8WUBgl9oCFdRHnbGst2 mXEBThxHUu7VE7M4BIdsPpVoqG0l0KyOb5pNlYPlzb/DRxPu7/G+gxMzZAvPAd1ST5 bxOer9U3rvfB9mXgH+BwLKHiRfpjJ9e71BSuAGZracCWFB3NdEgpsTcM5kvOTt4Jaw somPjwoG1vqB1L/F73or21P70EULygPuYUYnRkQLEV+nVLdlDj336BnKCXyLDdhi+r g6/OgAVSSflpO8SS+7Xg7Exc/i64+FacRGjTneGnDfOS18PVa1JlvaxW1RQCpl0a52 AfQ2zaBG4h5wNXTZg1lHKdQ8h4xy+U+mWPHcCdHjmk6MyDA5K8+FhFulMt051TYili t1IWO4xE/9CERFVdcl6V/HMM8nuUrHeMScqCqV+McKtKcDYdcKXI79cpHYDe/NiOik /TnTOhBWUT6V5cX7Cmr33E4xx0tFFDubfP0AxhdF3eNe7j8nJOpofphWSFkEnD5fMR 87Y3jufJga4QJa/ePcLqvqwEwQfSRfp7FbcIJ1CueMCvfoUpdeev+xQCwXTX4Az3MP nKbJeTXigjw0AX38MV9cbBKE= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id E2B622B38A; Fri, 27 Dec 2019 17:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1577468519; bh=Bvf9x9BjHKKh2jiKtOiK6WL1gEt1SrGs8dnMUmroVMI=; 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=drjjIRwetC401P97H/cCWR/T1OP4zBL7zYVEv6Rr3Poi+k8KShmTwf0xNUYc7CZo5 4LbNu7ylZAYmzOLvko9uY+dMxjtoELhmr5uMwkjrm41U9A8Y7f7xXzvjww17AVBK/M KWg1WWZ1xn5kUmVl/XL+pb4Sl1fV+kWcVYTUXAnX4qgKHN53y8JgyUxmXV5Yf7KTC6 Z/V3VWmu25RnsqGxHhPlHicnAWlHSoIFqP73sTgWNMSZPsmPexAhBgWnm6vgqrp324 3HEYEASpPerMeC1JOV72XVkdh6RPVCYF9TMMvkW95SEQgCJNyr9KR4kaxj/ItXt+uJ rPxhC9PlGu8MsKdc/YJEFjdommvsDodMKkiXfM5YGnHg4OOQKDQiMmpeDMXnPqUtH2 RzgWcbWiGGs6JpYvjBRm42PRvyJRWcicxRftWK+Yi5ZJ+KgISuYHN5wM+iYGJR115r flD++eaYf+qzGDcmNuIfqxmOHqtlRXjqfcu2RoGKDjuGlaOLy/aftN5rnsiOfPmTaV 30I/DmauhEkNE5tlVVRBw5hIhR6DdxMyvH9Ayb0cpX1tA5ALfvX3bslQSZui83HzB+ +e58Yw3iL205mQu3bv1WwlY3EgIjBwNTRCWRvJWYRtH3rr7ch5m0bxBqatvfXm8G5n 3MrrrMfeb8rxS6TQcrEQWHrs= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 8CD7020F16 for ; Fri, 27 Dec 2019 17:41:56 +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:41:56 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 98DB31790B0482; Fri, 27 Dec 2019 17:41:55 +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 156731790B0481; Fri, 27 Dec 2019 17:41:54 +0000 (UTC) To: arch-projects@archlinux.org Date: Fri, 27 Dec 2019 12:41:41 -0500 Message-Id: <20191227174141.3018-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191227170830.1154340-1-eschwartz@archlinux.org> References: <20191227170830.1154340-1-eschwartz@archlinux.org> MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH v2] 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 --- v2: use one less line when defining PKGEXT, as per anthraxx review makerepropkg.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makerepropkg.in b/makerepropkg.in index 40806cb..121456c 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -137,6 +137,7 @@ parse_buildinfo < <(bsdtar -xOqf "${pkgfile}" .BUILDINFO) export SOURCE_DATE_EPOCH="${buildinfo[builddate]}" PACKAGER="${buildinfo[packager]}" BUILDDIR="${buildinfo[builddir]}" +PKGEXT=${pkgfile#${pkgfile%.pkg.tar*}} # nuke and restore reproducible testenv for copy in "${buildroot}"/*/; do @@ -160,7 +161,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}"