From 1b073882f828da03a5c55fb651fe075fa8d1813a Mon Sep 17 00:00:00 2001
From: luigifcruz <luigifcruz@gmail.com>
Date: Fri, 17 Dec 2021 12:16:17 -0300
Subject: [PATCH] add gnupg

---
 scripts/common | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/common b/scripts/common
index 91a7811..ce9f880 100644
--- a/scripts/common
+++ b/scripts/common
@@ -7,20 +7,21 @@ bootstrap(){
 	local BOOTSTRAP_CMD=debootstrap
 	local BOOTSTRAP_ARGS=()
 
-	export http_proxy=${APT_PROXY}
+	#export http_proxy=${APT_PROXY}
 
 	if [ "$(dpkg --print-architecture)" !=  "armhf" ] && [ "$(dpkg --print-architecture)" !=  "aarch64" ]; then
 		BOOTSTRAP_CMD=qemu-debootstrap
 	fi
 
 	BOOTSTRAP_ARGS+=(--arch arm64)
+	BOOTSTRAP_ARGS+=(--include gnupg)
 	BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
 	#BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
 	BOOTSTRAP_ARGS+=(--exclude=info)
 	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
 		cp "$2/debootstrap/debootstrap.log" "${STAGE_WORK_DIR}"