Version 20200213

offload-build: handle user specific makepkg.conf on the remote host
This ensures we take user specific config values for PKGDEST into account when printing the package list. This is required as devtools archbuild_cmd puts packages potentially into the user defined PKGDEST which the package list would otherwise miss.
2025-09-13 09:56:18 +02:00 · 2020-02-13 01:53:45 +01:00 · 2020-02-12 00:05:00 +01:00 · 2020-02-11 01:42:17 +01:00 · 2020-02-10 23:02:41 +01:00 · 2020-02-10 23:02:16 +01:00
4 changed files with 16 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ lddd
 makechrootpkg
 makerepropkg
 mkarchroot
+offload-build
 rebuildpkgs
 zsh_completion
 find-libdeps
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-V=20191227
+V=20200213

 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
@@ -17,12 +17,12 @@ IN_PROGS = \
 	makerepropkg \
 	mkarchroot \
 	makechrootpkg \
+	offload-build \
 	rebuildpkgs \
 	sogrep

 BINPROGS = \
-	$(IN_PROGS) \
-	offload-build \
+	$(IN_PROGS)

 CONFIGFILES = \
 	makepkg-x86_64.conf \
--- 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
@@ -152,15 +153,14 @@ 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

 # 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}"
--- a/offload-build.in
+++ b/offload-build.in
@@ -74,11 +74,12 @@ while (( $# )); do
 done

 # multilib must be handled specially
+archbuild_arch="${arch}"
 if [[ $repo = multilib* ]]; then
-    arch=
+    archbuild_arch=
 fi

-archbuild_cmd=("${repo}${arch:+-$arch}-build" "$@")
+archbuild_cmd=("${repo}${archbuild_arch:+-$archbuild_arch}-build" "$@")

 trap 'rm -rf $SRCPKGDEST' EXIT INT TERM QUIT

@@ -108,7 +109,12 @@ mapfile -t files < <(
                printf "%s\n" "" "-> build complete" &&
                printf "\t%s\n" "$temp"/*
            } >&2 &&
-            makepkg --packagelist
+            makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
+            makepkg_config="/usr/share/devtools/makepkg-'"${arch}"'.conf" &&
+            if [[ -f /usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf ]]; then
+                makepkg_config="/usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf"
+            fi &&
+            makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist
 ')
Author	SHA1	Message	Date
Levente Polyak	cb6484fe45	Version `20200213`	2020-02-13 01:53:45 +01:00
Levente Polyak	bcb1b4a163	offload-build: handle user specific makepkg.conf on the remote host This ensures we take user specific config values for PKGDEST into account when printing the package list. This is required as devtools archbuild_cmd puts packages potentially into the user defined PKGDEST which the package list would otherwise miss.	2020-02-12 00:05:00 +01:00
Levente Polyak	57fb44b976	offload-build: take makepkg.conf from devtools for appropriate packagelist This fixes an issue with the usage of makepkg --packagelist to get the produced artifacts filenames according to the PKGEXT used in devtools' makepkg.conf instead of the one defined in pacman. One goal we want to preserve is that devtools configuration should be self contained and not require any editing of non owned files like the host /etc/makepkg.conf to produce expected results. Additionally modify the archbuild_cmd override for multilib builds to use an independent variable and not fiddle with the actual arch variable to select the appropriate cmd.	2020-02-11 01:42:17 +01:00
Levente Polyak	9b4d8ae930	offload-build: convert to in-prog so we can perform pre-processing	2020-02-10 23:02:41 +01:00
Levente Polyak	4c206ab549	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.	2020-02-10 23:02:16 +01:00
Eli Schwartz	4c08847bfa	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>	2019-12-27 18:54:26 +01:00