[arch-projects] [devtools] [PATCH v2] makerepropkg: correctly reproduce a pkgfile with any compression type
Eli Schwartz
eschwartz at archlinux.org
Fri Dec 27 17:41:41 UTC 2019
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 <eschwartz at archlinux.org>
---
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 at Q}"
done
printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
--
2.24.1
More information about the arch-projects
mailing list