summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2019-12-27 11:59:48 -0500
committerLevente Polyak <anthraxx@archlinux.org>2019-12-27 18:54:26 +0100
commit4c08847bfa7776abb884fef289a25c1cef9883fb (patch)
tree730e36ee06dff8791be1961ba15a3b63bb8780c8
parent74d7a70915d7143938f560e6f7051e0147855d3f (diff)
downloaddevtools-4c08847bfa7776abb884fef289a25c1cef9883fb.tar.xz
makerepropkg: correctly reproduce a pkgfile with any compression type
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: Levente Polyak <anthraxx@archlinux.org>
-rwxr-xr-xmakerepropkg.in3
1 files changed, 2 insertions, 1 deletions
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}"