use CFGROOT more consistently, fix _config receipes, small adaptations

diff --git a/live-dvd.mk b/live-dvd.mk
index 8125162aeaac7d5423e6310603e0a40dc2163823..242db7b81b29f87f6043b629cb51278a58e82444 100644 (file)
--- a/live-dvd.mk
+++ b/live-dvd.mk
@@ -3,7 +3,6 @@ release=trixie
 ISOLABEL:=Trixie_Live_$(shell date +%F)
 
 define SOURCES :=
-# deb  http://deb.debian.org/debian            bookworm                main
 deb    http://deb.debian.org/debian            ${release}              main non-free-firmware
 deb    http://deb.debian.org/debian            ${release}-backports    main
 deb    http://deb.debian.org/debian-security/  ${release}-security     main
@@ -76,7 +75,7 @@ approx=http://localhost:9000/debian
 
 .PHONY: _live_initrd
 _config: _live_initrd
-_live_initrd: cfg_root _live_modules
+_live_initrd: _copy _live_modules
        # printf '%s\n' "isofs" "squashfs" "ata_generic" "usb_storage" "sr_mod" "mmc_block" >>"$${CFGROOT}/etc/initramfs-tools/modules"
        sed -i 's;^MODULES=.*$$;MODULES=most;' "$${CFGROOT}/etc/initramfs-tools/initramfs.conf"
 .PHONY: _favorites
@@ -86,8 +85,8 @@ _favorites: _xfce
                >"$${CFGROOT}/etc/xdg/xfce4/panel/whiskermenu-10.rc"
 
 # Place some helpers in bash history ;-)
-_config: cfg_root/home/live/.bash_history
-cfg_root/home/live/.bash_history: cfg_root _users cfg_root/home/live/
+_config: ${CFGROOT}/home/live/.bash_history
+${CFGROOT}/home/live/.bash_history: _copy _users ${CFGROOT}/home/live/
        printf '%s\n' \
                'sudo git clone https://git.plutz.net/git/blast /mnt/blast' \
                'for m in /proc /sys /dev /run; do sudo mount -o rbind $$m /mnt/$$m; done' \
@@ -95,42 +94,51 @@ cfg_root/home/live/.bash_history: cfg_root _users cfg_root/home/live/
                >>$@
        chroot "$${CFGROOT}" chown live:live "/home/live/.bash_history"
 
-cfg_root/home/live/: cfg_root/etc/skel/. cfg_root _users
+${CFGROOT}/home/live/: ${CFGROOT}/etc/skel/. _copy _users
        cp -a -- "$<" "$@"
        chroot "$${CFGROOT}" chmod 750 "/home/live/"
        chroot "$${CFGROOT}" chown live:live -R "/home/live/"
 
-_config: cfg_root/usr/local/share/applications/org.xfce.mousepad.desktop cfg_root/usr/local/share/applications/xfce4-terminal.desktop
-cfg_root/usr/local/share/applications/%.desktop: cfg_root/usr/share/applications/%.desktop
+_config: ${CFGROOT}/usr/local/share/applications/org.xfce.mousepad.desktop ${CFGROOT}/usr/local/share/applications/xfce4-terminal.desktop
+${CFGROOT}/usr/local/share/applications/%.desktop: ${CFGROOT}/usr/share/applications/%.desktop
        mkdir -p "$(dir $@)"
        sed -E 's;^(Exec=.*)$$;\1 --disable-server;;' <"$<" >"$@"
 
 .PHONY: _noscreenlock
 _config: _noscreenlock
-_noscreenlock: cfg_root/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
+_noscreenlock: ${CFGROOT}/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
        sed -i '/<property name="lock" type="empty">/a<property name="enabled" type="bool" value="false"/>' "$<"
 
 # # Fake gksu/gksudo, because live password is empty anyway, needed for installer
-# _config: cfg_root/usr/local/bin/gksu
-# cfg_root/usr/local/bin/gksu:
+# _config: ${CFGROOT}/usr/local/bin/gksu
+# ${CFGROOT}/usr/local/bin/gksu:
 #      ln -s /usr/bin/sudo $@
 #      ln -s /usr/bin/sudo $@do
 
 # include debian installer
-_iso_image: iso_root/install/gtk/initrd.gz iso_root/install/gtk/linux
-iso_root/install/gtk/initrd.gz: /usr/lib/debian-installer/images/13/amd64/gtk/debian-installer/amd64/initrd.gz
+_bootloader_iso: iso_root/install/gtk/initrd.gz iso_root/install/gtk/linux _bootmenu_install
+iso_root/install/gtk/%: /usr/lib/debian-installer/images/13/amd64/gtk/debian-installer/amd64/%
        mkdir -p "$(dir $@)"
-       cp "$<" "$@"
+       cp -- "$<" "$@"
 
-iso_root/install/gtk/linux: /usr/lib/debian-installer/images/13/amd64/gtk/debian-installer/amd64/linux
-       mkdir -p "$(dir $@)"
-       cp "$<" "$@"
+.PHONY: _bootmenu_install
+
+define GRUBCFGINSTALL
+menuentry 'Install Debian ${release}' --id 'installgtk' {
+  linux /install/gtk/linux
+  initrd /install/gtk/initrd.gz
+}
+endef
+export GRUBCFGINSTALL
+
+_bootmenu_install: iso_root/boot/grub/grub.cfg
+       printf '%s\n' "$${GRUBCFGINSTALL}" >>"$<"
 
 # Make boot folder available for browsing and for debian-installer
 # Need to create boot folder in ramdrive because it will not be contained in squashfs
 .PHONY: _bootmount
-_isosquash: _bootmount
-_bootmount: cfg_root _config
+_config: _bootmount
+_bootmount: _copy
        printf '@reboot mkdir -m755 /boot\n' >>"$${CFGROOT}/var/spool/cron/crontabs/root"
        chmod 600 "$${CFGROOT}/var/spool/cron/crontabs/root"
        printf  '%s     0 0\n' \
@@ -139,8 +147,8 @@ _bootmount: cfg_root _config
                >"$${CFGROOT}/etc/fstab"
 
 # Bugfix: prevent warning from faulty dolphin config
-# _config: cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc
-# cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc: cfg_root _xfce
+# _config: ${CFGROOT}/usr/share/kxmlgui5/dolphin/dolphinui.rc
+# ${CFGROOT}/usr/share/kxmlgui5/dolphin/dolphinui.rc: ${CFGROOT} _xfce
 #      mkdir -p "$(dir $@)"
 #      printf '%s\n' \
 #              '<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">' \