From 54e1bb428fb52c9d6b67fd1f679a2e3571162a30 Mon Sep 17 00:00:00 2001
From: DBongiorno-CG <83716695+DBongiorno-CG@users.noreply.github.com>
Date: Thu, 17 Jun 2021 17:44:30 -0400
Subject: [PATCH 1/3] Added simple catch for default case in which
 PIGEN_DOCKER_OPTS is unspecified during docker build (#522)

---
 build-docker.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-docker.sh b/build-docker.sh
index 9538a8b..01fd517 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -48,6 +48,7 @@ fi
 CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
 CONTINUE=${CONTINUE:-0}
 PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0}
+PIGEN_DOCKER_OPTS=${PIGEN_DOCKER_OPTS:-""}  
 
 if [ -z "${IMG_NAME}" ]; then
 	echo "IMG_NAME not set in 'config'" 1>&2

From d562f2a35b8917cacab9a461626becbce424b652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ciesielski?=
 <45674786+miccies3@users.noreply.github.com>
Date: Tue, 22 Jun 2021 16:04:51 +0200
Subject: [PATCH 2/3] Fix: update dependencies (#526)

---
 Dockerfile | 2 +-
 README.md  | 2 +-
 depends    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb2b4ba..837e430 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -y update && \
     apt-get -y install --no-install-recommends \
         git vim parted \
         quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \
-        bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
+        libarchive-tools libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
         binfmt-support ca-certificates qemu-utils kpartx \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/README.md b/README.md
index f0a757a..62938e9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ To install the required dependencies for `pi-gen` you should run:
 
 ```bash
 apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \
-dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl bc \
+dosfstools libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc \
 qemu-utils kpartx
 ```
 
diff --git a/depends b/depends
index cb029fd..eeb2490 100644
--- a/depends
+++ b/depends
@@ -7,7 +7,7 @@ zerofree
 zip
 mkdosfs:dosfstools
 capsh:libcap2-bin
-bsdtar
+bsdtar:libarchive-tools
 grep
 rsync
 xz:xz-utils

From f9d44edb72e9a153c997266189c79cb1f96b69f3 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Tue, 22 Jun 2021 15:48:09 +0100
Subject: [PATCH 3/3] Copy debootstrap.log on failure

---
 scripts/common | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/common b/scripts/common
index e2048d9..300d30b 100644
--- a/scripts/common
+++ b/scripts/common
@@ -21,8 +21,10 @@ bootstrap(){
 
 	setarch linux32 capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
 
-	if [ -d "$2/debootstrap" ]; then
-		rmdir "$2/debootstrap"
+	if [ -d "$2/debootstrap" ] && ! rmdir "$2/debootstrap"; then
+		cp "$2/debootstrap/debootstrap.log" "${STAGE_WORK_DIR}"
+		log "bootstrap failed: please check ${STAGE_WORK_DIR}/debootstrap.log"
+		return 1
 	fi
 }
 export -f bootstrap