From 42a1565f5519c40568d2acabc1b4f770276f6d18 2017-11-05 10:12:54
From: Gérard Vidal <gerard.vidal@ens-lyon.fr>
Date: 2017-11-05 10:12:54
Subject: [PATCH] Merge branch 'master' into rpifegen

---

diff --git a/.gitignore b/.gitignore
index a65ad1d..239ef3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 images
 custom.d
-packages
 *.swp
 *.bak
 *.log
diff --git a/README.md b/README.md
index 9fa4895..d7d1642 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # rpi23-gen-image
 ## Introduction
-`rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for Raspberry Pi 2 (RPi2) and Raspberry Pi 3 (RPi3) computers. The script at this time supports the bootstrapping of the Debian (armhf) releases `jessie` and `stretch`. This fork enables also `buster` release. Raspberry Pi 3 images are generated for 32-bit mode only. Raspberry Pi 3 64-bit images can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.11.y```).
+`rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for Raspberry Pi 2 (RPi2) and Raspberry Pi 3 (RPi3) computers. The script at this time supports the bootstrapping of the Debian (armhf) releases `jessie` and `stretch`. This fork enables also `buster` release. Raspberry Pi 3 images are generated for 32-bit mode only. Raspberry Pi 3 64-bit images can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.11.y raspife3-buster-arm64```).
 
 ## Build dependencies
 The following list of Debian packages must be installed on the build system because they are essentially required for the bootstrapping process. The script will check if all required packages are installed and missing packages will be installed automatically if confirmed by the user.
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index de68af5..1046ab0 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -212,13 +212,14 @@ CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
 
 # Packages required in the chroot build environment
 APT_INCLUDES=${APT_INCLUDES:=""}
-# apt-transport-https has been removed from repositories
+APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+
+# Package apt-transport-https has been removed from Debian Buster release
 # this induces qemu error 383 which does not prevent building an image
 if [ "$RELEASE" = "buster" ] ; then
-  APT_INCLUDES="${APT_INCLUDES},apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
-else
-  APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+  APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/apt-transport-https,//")"
 fi
+
 # Packages required for bootstrapping
 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
 MISSING_PACKAGES=""