]> git.ipfire.org Git - people/ms/bricklayer.git/commitdiff
master: Pakfire now supports different architectures than the host
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 May 2021 15:42:46 +0000 (15:42 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 May 2021 15:45:23 +0000 (15:45 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/bricklayer-master

index b2918c87cd4e2150c092ac22530bcec7dcb3207c..3d87f063c65877ff59db785364a099047b1ed3ff 100644 (file)
@@ -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}"