From 4c206ab549b7944801f11387cbc57807e8e24338 Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Sat, 28 Dec 2019 18:59:42 +0100 Subject: makerepropkg: take makepkg.conf from devtools pkgdatadir location This ensures we use the same configuration for reproducing packages as we use for building them via devtools. One example of why we care about this are the COMPRESS* settings that may differ from the guest's pacman shipped makepkg.conf that affect the reproducibility of packages. --- makerepropkg.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/makerepropkg.in b/makerepropkg.in index 121456c..26534b6 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -153,8 +153,7 @@ for fname in "${installed[@]}"; do exit 1 fi done -printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -U "${archroot_args[@]}" "${buildroot}"/root - || exit 1 - +printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M @pkgdatadir@/makepkg-x86_64.conf -U "${archroot_args[@]}" "${buildroot}"/root - || exit 1 # use makechrootpkg to prep the build directory makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1 -- cgit v1.2.3-54-g00ecf