From 9a4c12721222117a269a13fc5aed6690394ad698 Mon Sep 17 00:00:00 2001
From: Luigi Freitas Cruz <luigifcruz@me.com>
Date: Thu, 20 Feb 2020 16:38:01 -0300
Subject: [PATCH] Fixing build problems.

---
 builder/build-docker.sh | 1 -
 builder/build.sh        | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/builder/build-docker.sh b/builder/build-docker.sh
index f5a8ca6..79b68d4 100755
--- a/builder/build-docker.sh
+++ b/builder/build-docker.sh
@@ -90,7 +90,6 @@ else
 	time ${DOCKER} run --name "${CONTAINER_NAME}" --privileged \
 		--volume "${CONFIG_FILE}":/config:ro \
 		-e "GIT_HASH=${GIT_HASH}" \
-		--ipv6 \
 		pi-gen \
 		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
 	cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
diff --git a/builder/build.sh b/builder/build.sh
index 9aa0dd7..8cc77ec 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -20,7 +20,7 @@ EOF
 			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
 			if [ -n "$PACKAGES" ]; then
 				on_chroot << EOF
-apt-get -o Acquire::ForceIPv6=true -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
+apt-get -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
@@ -30,7 +30,7 @@ EOF
 			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
 			if [ -n "$PACKAGES" ]; then
 				on_chroot << EOF
-apt-get -o Acquire::ForceIPv6=true -o APT::Acquire::Retries=3 install -y $PACKAGES
+apt-get -o APT::Acquire::Retries=3 install -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages"