rudefox/burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

script/common: Handle aarch64 host builds

Browse Source
This commit is contained in:
Serge Schneider 2019-06-07 16:34:17 +01:00
parent e14a403533
commit f86cb0d54a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/common
View File

@ -9,7 +9,7 @@ bootstrap(){
export http_proxy=${APT_PROXY} export http_proxy=${APT_PROXY}
if [ "$(dpkg --print-architecture)" != "armhf" ]; then if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "aarch64" ]; then
BOOTSTRAP_CMD=qemu-debootstrap BOOTSTRAP_CMD=qemu-debootstrap
fi fi
@ -18,7 +18,7 @@ bootstrap(){
BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg") BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
BOOTSTRAP_ARGS+=("$@") BOOTSTRAP_ARGS+=("$@")
capsh --drop=cap_setfcap -- "${BOOTSTRAP_CMD}" "${BOOTSTRAP_ARGS[@]}" || true setarch linux32 capsh --drop=cap_setfcap -- "${BOOTSTRAP_CMD}" "${BOOTSTRAP_ARGS[@]}" || true
if [ -d "$2/debootstrap" ]; then if [ -d "$2/debootstrap" ]; then
rmdir "$2/debootstrap" rmdir "$2/debootstrap"
@ -89,7 +89,7 @@ on_chroot() {
mount --bind /sys "${ROOTFS_DIR}/sys" mount --bind /sys "${ROOTFS_DIR}/sys"
fi fi
capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@" setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
} }
export -f on_chroot export -f on_chroot