From ad8286afe649530c0f64c3cb74c772a1d961ae44 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Wed, 3 May 2023 16:30:55 +0200
Subject: [PATCH] use now debian bookworm 12.0, still in testing but get
 release in june 2023

---
 makeanything.sh               | 17 ++++++++++++-----
 templates/install_base.tpl.sh | 18 +++++++++---------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/makeanything.sh b/makeanything.sh
index 32ebc0b..2994006 100755
--- a/makeanything.sh
+++ b/makeanything.sh
@@ -65,6 +65,8 @@ sudo apt install \
   coreutils \
   pandoc || error
 
+
+
 message "start building nanodesk ${YELLOW}${VERSION}${ENDCOLOR}"
 
 read -p "press [enter] to continue"
@@ -72,15 +74,20 @@ read -p "press [enter] to continue"
 ### stuff begins here
 
 message "creating build directories"
-for dir in $(echo build/{staging/{EFI/BOOT,boot/grub/x86_64-efi,isolinux,live}tmp,chroot,nanodesk-files})
+for dir in $(echo build/{staging/{EFI/BOOT,boot/grub/x86_64-efi,isolinux,live},tmp,chroot,nanodesk-files})
 do
   message "$dir"
   test -d $dir || mkdir -p $dir
 done
 
 ### i have the problem, that fakechroot will not work atm. in ubuntu 22.04 i get libc6 version mismatch errors. so we run it direct as root. not my favorite, but works for now.
-message "running debootstrap with mirror $MIRROR"
-sudo debootstrap bullseye build/chroot/ $MIRROR || sudo debootstrap bullseye build/chroot/ $MIRROR 
+#DEBOOTSTRAP_SUITE="bullseye"
+#DEBOOTSTRAP_OPTS="--extra-suites=bullseye-backports,bullseye-updates --components=main,contrib,non-free"
+DEBOOTSTRAP_SUITE="bookworm"
+DEBOOTSTRAP_OPTS="--extra-suites=${DEBOOTSTRAP_SUITE}-updates --components=main,contrib,non-free,non-free-firmware"
+
+message "running debootstrap $DEBOOTSTRAP_OPTS $DEBOOTSTRAP_SUITE $MIRROR"
+sudo debootstrap ${DEBOOTSTRAP_OPTS} ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR || sudo debootstrap ${DEBOOTSTRAP_OPTS} ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR
 
 message "copy xdgmenumaker deb file into chroot"
 sudo cp deb/xdgmenumaker* build/chroot/tmp || error
@@ -101,10 +108,10 @@ $CHROOTCMD /usr/bin/rm -Rf /tmp/* || error
 ### copy nanodesk files in nanodesk-files/ to build/nanodesk-files/ so we can make changes there,
 ### like generate version file and convert .md to .html in usr/share/docs/nanodesk
 message "copy nanodesk-files/ to build/nanodesk-files/"
-sudo cp -r nanodesk-files/* build/nanodesk-files/
+cp -r nanodesk-files/* build/nanodesk-files/
 
 message "write nanodesk version $VERSION into build/nanodesk-files/usr/share/nanodesk/version"
-echo $VERSION > nanodesk-files/usr/share/nanodesk/version
+echo $VERSION > build/nanodesk-files/usr/share/nanodesk/version
 
 message "convert .md files in build/nanodesk-files/usr/doc/nanodesk/ to .html"
 for md in $(find build/nanodesk-files/usr/share/doc/nanodesk/ -name "*.md")
diff --git a/templates/install_base.tpl.sh b/templates/install_base.tpl.sh
index c7ed810..e6a03c3 100644
--- a/templates/install_base.tpl.sh
+++ b/templates/install_base.tpl.sh
@@ -39,11 +39,11 @@ echo nanodesk > /etc/hostname
 DEBIAN_FRONTEND=noninteractive
 export DEBIAN_FRONTEND
 
-message "activate contrib and non-free repositories"
-sed -i 's/main$/main contrib non-free/g' /etc/apt/sources.list || error
-
-message "activate backports repository"
-sed 's/bullseye/bullseye-backports/g' /etc/apt/sources.list > /etc/apt/sources.list.d/bullseye-backports.list || error
+##message "activate contrib and non-free repositories"
+##sed -i 's/main$/main contrib non-free/g' /etc/apt/sources.list || error
+##
+##message "activate backports repository"
+##sed 's/bullseye/bullseye-backports/g' /etc/apt/sources.list > /etc/apt/sources.list.d/bullseye-backports.list || error
 
 message "apt update"
 apt update || error
@@ -51,6 +51,7 @@ apt update || error
 ### packages
 message "install nanodesk base packages"
 apt install -y  \
+	linux-image-amd64 \
 	live-boot \
 	dialog \
 	sudo \
@@ -71,6 +72,7 @@ apt install -y  \
 	xfonts-75dpi \
 	xfonts-100dpi \
 	x11-apps \
+	x11-utils \
 	xterm \
 	xdm \
 	jwm \
@@ -116,10 +118,8 @@ message "install custom packages from templates/install_base.custompkg.tpl.sh"
 ####
 ######
 
-
-
-message "install linux-kernel from backports"
-apt install -t bullseye-backports -y linux-image-amd64
+#message "install linux-kernel from backports"
+#apt install -t bullseye-backports -y linux-image-amd64
 
 message "set hostname in hosts"
 sed -i 's/localhost/localhost nanodesk/g' /etc/hosts