From 704a07fd92f72dea28ab30b62ea60ea9ad42b5d2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 5 Oct 2018 19:24:58 +0100
Subject: [PATCH] Separate out non-arm packages
---
src/freedombone-image | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-image b/src/freedombone-image
index 5564ccaa8..b263cecd3 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -164,16 +164,22 @@ function image_setup {
case $setup_type in
debian|ubuntu|trisquel|mint)
+ # NOTE: These packages aren't available on ARM
# shellcheck disable=SC2086
- sudo $REMOVE_PACKAGES vmdebootstrap
- # shellcheck disable=SC2086
- sudo $INSTALL_PACKAGES build-essential gcc-multilib g++-multilib libc6-dev
+ sudo $INSTALL_PACKAGES gcc-multilib g++-multilib
# shellcheck disable=SC2086
sudo $INSTALL_PACKAGES libc6-dev-i386
# shellcheck disable=SC2086
+ sudo $INSTALL_PACKAGES extlinux
+
+ # shellcheck disable=SC2086
+ sudo $REMOVE_PACKAGES vmdebootstrap
+ # shellcheck disable=SC2086
+ sudo $INSTALL_PACKAGES build-essential libc6-dev
+ # shellcheck disable=SC2086
sudo $INSTALL_PACKAGES git python-docutils mktorrent xz-utils debootstrap
# shellcheck disable=SC2086
- sudo $INSTALL_PACKAGES dosfstools btrfs-tools extlinux python-distro-info mbr
+ sudo $INSTALL_PACKAGES dosfstools btrfs-tools python-distro-info mbr
# shellcheck disable=SC2086
sudo $INSTALL_PACKAGES qemu-user-static binfmt-support u-boot-tools qemu
# shellcheck disable=SC2086
--
GitLab