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