From 6d2d36e7f2ce37abe77b58cf883dbd0ed124e8b7 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 14 Jan 2022 09:11:46 +0000 Subject: [PATCH 1/2] Don't try to use qemu-debootstrap Fixes #563 --- scripts/common | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/common b/scripts/common index 5b0df12..af4c1f3 100644 --- a/scripts/common +++ b/scripts/common @@ -9,10 +9,6 @@ bootstrap(){ export http_proxy=${APT_PROXY} - if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "aarch64" ]; then - BOOTSTRAP_CMD=qemu-debootstrap - fi - BOOTSTRAP_ARGS+=(--arch armhf) BOOTSTRAP_ARGS+=(--components "main,contrib,non-free") BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg") From 40f67ce4bac65cb8f92a4a9ac72b05bc36ccedeb Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 14 Jan 2022 09:12:38 +0000 Subject: [PATCH 2/2] Install ca-certificates during bootstrap Fixes #424 --- scripts/common | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/common b/scripts/common index af4c1f3..e476f0f 100644 --- a/scripts/common +++ b/scripts/common @@ -13,6 +13,7 @@ bootstrap(){ BOOTSTRAP_ARGS+=(--components "main,contrib,non-free") BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg") BOOTSTRAP_ARGS+=(--exclude=info) + BOOTSTRAP_ARGS+=(--include=ca-certificates) BOOTSTRAP_ARGS+=("$@") printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"