Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/common-functions31
-rwxr-xr-xbin/mksrcinfo3
2 files changed, 29 insertions, 5 deletions
diff --git a/bin/common-functions b/bin/common-functions
index b07e75d..714a05a 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -194,15 +194,36 @@ generate_package_metadata() {
exit 1
fi
+ overlays_dir="$(mktemp -d)"
+
+ sudo mount -t tmpfs none "${overlays_dir}"
+
+ mkdir \
+ "${overlays_dir}/upper" \
+ "${overlays_dir}/work" \
+ "${overlays_dir}/merged"
+
+ sudo mount -t overlay overlay -o lowerdir="${PKGBUILD%/*}":"/",upperdir="${overlays_dir}/upper",workdir="${overlays_dir}/work" "${overlays_dir}/merged"
+
(
- cd "${PKGBUILD%/*}"
+ cd "${overlays_dir}/merged"
apply_package_customizations
- grep -q '\$CARCH' 'PKGBUILD' && \
- CARCH=i686 makepkg --printsrcinfo > \
- "${file_prefix}.SRCINFO" || \
- mksrcinfo -o "${file_prefix}.SRCINFO"
)
+ sudo systemd-nspawn -q \
+ -D "${overlays_dir}/merged" \
+ --register=no \
+ ${base_dir}/bin/mksrcinfo
+
+ sudo umount -f "${overlays_dir}/merged"
+
+ mv \
+ "${overlays_dir}/upper/.SRCINFO" \
+ "${file_prefix}.SRCINFO"
+
+ sudo umount -f "${overlays_dir}"
+ rmdir "${overlays_dir}"
+
# otherwise this just calls for trouble
sed -i '/=\s*$/d' "${file_prefix}.SRCINFO"
diff --git a/bin/mksrcinfo b/bin/mksrcinfo
new file mode 100755
index 0000000..a033a6a
--- /dev/null
+++ b/bin/mksrcinfo
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mksrcinfo -o .SRCINFO