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>
This commit is contained in:
parent
74d7a70915
commit
4c08847bfa
|
@ -137,6 +137,7 @@ parse_buildinfo < <(bsdtar -xOqf "${pkgfile}" .BUILDINFO)
|
||||||
export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
|
export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
|
||||||
PACKAGER="${buildinfo[packager]}"
|
PACKAGER="${buildinfo[packager]}"
|
||||||
BUILDDIR="${buildinfo[builddir]}"
|
BUILDDIR="${buildinfo[builddir]}"
|
||||||
|
PKGEXT=${pkgfile#${pkgfile%.pkg.tar*}}
|
||||||
|
|
||||||
# nuke and restore reproducible testenv
|
# nuke and restore reproducible testenv
|
||||||
for copy in "${buildroot}"/*/; do
|
for copy in "${buildroot}"/*/; do
|
||||||
|
@ -160,7 +161,7 @@ makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1
|
||||||
|
|
||||||
# set detected makepkg.conf options
|
# 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}"
|
printf '%s=%s\n' "${var}" "${!var@Q}"
|
||||||
done
|
done
|
||||||
printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
|
printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
|
||||||
|
|
Loading…
Reference in New Issue