Merge branch 'master' into arm64
This commit is contained in:
commit
61c6294e23
1 changed files with 1 additions and 4 deletions
|
@ -9,15 +9,12 @@ bootstrap(){
|
||||||
|
|
||||||
#export http_proxy=${APT_PROXY}
|
#export http_proxy=${APT_PROXY}
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "arm64" ]; then
|
|
||||||
BOOTSTRAP_CMD=qemu-debootstrap
|
|
||||||
fi
|
|
||||||
|
|
||||||
BOOTSTRAP_ARGS+=(--arch arm64)
|
BOOTSTRAP_ARGS+=(--arch arm64)
|
||||||
BOOTSTRAP_ARGS+=(--include gnupg)
|
BOOTSTRAP_ARGS+=(--include gnupg)
|
||||||
BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
|
BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
|
||||||
#BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
|
#BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
|
||||||
BOOTSTRAP_ARGS+=(--exclude=info)
|
BOOTSTRAP_ARGS+=(--exclude=info)
|
||||||
|
BOOTSTRAP_ARGS+=(--include=ca-certificates)
|
||||||
BOOTSTRAP_ARGS+=("$@")
|
BOOTSTRAP_ARGS+=("$@")
|
||||||
printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
|
printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue