From 4c08847bfa7776abb884fef289a25c1cef9883fb Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Fri, 27 Dec 2019 11:59:48 -0500 Subject: 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 --- 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}" -- cgit v1.2.3-70-g09d2