luigifcruz
2 years ago
1 changed files with 3 additions and 2 deletions
Unified View
Diff Options
-
+3 -2scripts/common
+ 3
- 2
scripts/common
View File
| @@ -7,20 +7,21 @@ bootstrap(){ | |||||
| local BOOTSTRAP_CMD=debootstrap | local BOOTSTRAP_CMD=debootstrap | ||||
| local BOOTSTRAP_ARGS=() | local BOOTSTRAP_ARGS=() | ||||
| export http_proxy=${APT_PROXY} | |||||
| #export http_proxy=${APT_PROXY} | |||||
| if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "aarch64" ]; then | if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "aarch64" ]; then | ||||
| BOOTSTRAP_CMD=qemu-debootstrap | BOOTSTRAP_CMD=qemu-debootstrap | ||||
| fi | fi | ||||
| BOOTSTRAP_ARGS+=(--arch arm64) | BOOTSTRAP_ARGS+=(--arch arm64) | ||||
| 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+=("$@") | BOOTSTRAP_ARGS+=("$@") | ||||
| printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}" | printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}" | ||||
| setarch linux32 capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true | |||||
| capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true | |||||
| if [ -d "$2/debootstrap" ] && ! rmdir "$2/debootstrap"; then | if [ -d "$2/debootstrap" ] && ! rmdir "$2/debootstrap"; then | ||||
| cp "$2/debootstrap/debootstrap.log" "${STAGE_WORK_DIR}" | cp "$2/debootstrap/debootstrap.log" "${STAGE_WORK_DIR}" | ||||