From cb531218d6a8f096873b1797e5435978be73a63c 2020-02-05 09:56:39
From: Gérard Vidal <gerard.vidal@ens-lyon.fr>
Date: 2020-02-05 09:56:39
Subject: [PATCH] Align vidal repo on drtyhlpr

---

diff --git a/bootstrap.d/10-bootstrap.sh b/bootstrap.d/10-bootstrap.sh
index 7ea1b87..68ed634 100644
--- a/bootstrap.d/10-bootstrap.sh
+++ b/bootstrap.d/10-bootstrap.sh
@@ -20,9 +20,9 @@ fi
 
 
 # Exclude packages if required by Debian release
-if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-  EXCLUDES="--exclude=init,systemd-sysv"
-fi
+#if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+#  APT_EXCLUDES="--exclude=init,systemd-sysv"
+#fi
   
 
 # Base debootstrap (unpack only)
diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 1d46aa9..b84a2c5 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -36,7 +36,7 @@ fi
 # Use specified APT server and release
 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
 
-#Fix for changing path for security updates in testing/bullseye
+#Fix for changing path for security updates in testing
 if [ "$RELEASE" = "testing" ] ; then
 sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
diff --git a/bootstrap.d/42-fbturbo.sh b/bootstrap.d/42-fbturbo.sh
index 9291326..0835552 100644
--- a/bootstrap.d/42-fbturbo.sh
+++ b/bootstrap.d/42-fbturbo.sh
@@ -28,13 +28,7 @@ if [ "$ENABLE_FBTURBO" = true ] ; then
   fi
 
   # Install Xorg build dependencies
-
-  if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-    chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-  elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-    chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-  fi
-
+  chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
 
   # Build and install fbturbo driver inside chroot
   chroot_exec /bin/bash -x <<'EOF'
diff --git a/functions.sh b/functions.sh
index d6e8b1d..0bcf942 100644
--- a/functions.sh
+++ b/functions.sh
@@ -76,9 +76,9 @@ chroot_install_cc() {
     COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
 
 
-    if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+    if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then
       chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
-    elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+    elif [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then
       chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
     fi
 
@@ -119,4 +119,4 @@ unset_kernel_config() {
   # unsets flag with the value of $1, config must exist at "./.config"
   TGT="CONFIG_${1#CONFIG_}"
   sed -i "s/^${TGT}=.*/# ${TGT} is not set/" .config
-}
\ No newline at end of file
+}
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index e52225e..57ff4b0 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -2,7 +2,7 @@
 ########################################################################
 # rpi23-gen-image.sh					       2015-2017
 #
-# Advanced Debian "stretch" and "buster" bootstrap script for Raspberry Pi
+# Advanced Debian "buster" and "bullseye" bootstrap script for Raspberry Pi
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -36,11 +36,11 @@ fi
 
 # Introduce settings
 set -e
-echo -n -e "\n#\n# RPi 0/1/2/3 Bootstrap Settings\n#\n"
+echo -n -e "\n#\n# RPi 0/1/2/3/4 Bootstrap Settings\n#\n"
 set -x
 
 # Raspberry Pi model configuration
-RPI_MODEL=${RPI_MODEL:=2}
+RPI_MODEL=${RPI_MODEL:=3}
 
 # Debian release
 RELEASE=${RELEASE:=buster}