From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 May 2021 15:42:46 +0000 (+0000)
Subject: master: Pakfire now supports different architectures than the host
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=124f12070483897e9ca9ee040603a0bdcfc7b12c;p=people%2Fms%2Fbricklayer.git

master: Pakfire now supports different architectures than the host

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/bricklayer-master b/src/bricklayer-master
index b2918c8..3d87f06 100644
--- a/src/bricklayer-master
+++ b/src/bricklayer-master
@@ -69,7 +69,7 @@ make_buildsystem() {
 	)
 
 	# Install packages
-	if ! pakfire --config="${PAKFIRE_CONFIG}" --root="${path}" \
+	if ! pakfire --arch="${arch}" --config="${PAKFIRE_CONFIG}" --root="${path}" \
 			install --without-recommends "${packages[@]}"; then
 		echo "Could not install build system" >&2
 		return 1
@@ -91,8 +91,7 @@ make_live_system_image() {
 	local tempdir="$(mktemp -d)"
 
 	# Install a very basic system
-	# XXX --arch="${arch}"
-	if ! pakfire --config="${PAKFIRE_CONFIG}" --root="${tempdir}" \
+	if ! pakfire --arch="${arch}" --config="${PAKFIRE_CONFIG}" --root="${tempdir}" \
 			install --without-recommends "${PACKAGES[@]}"; then
 		echo "Could not install live system" >&2
 		rm -rf "${tempdir}"