From 47ad1b778ca6fba8b274fda99937e53b1734355e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Wed, 18 Sep 2024 05:52:50 +0200 Subject: [PATCH] make live-dvd independent form live-cd, switch to trixie, include cursor themes for presentation --- live-dvd.mk | 108 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 90 insertions(+), 18 deletions(-) diff --git a/live-dvd.mk b/live-dvd.mk index 8f49c17..a30d122 100644 --- a/live-dvd.mk +++ b/live-dvd.mk @@ -1,28 +1,44 @@ -include live-cd.mk - iso=live-dvd.iso +release=trixie + +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 +endef -packages += audacity aqemu -packages += blender brasero brasero-cdrkit breeze-icon-theme -packages += chromium chromium-sandbox chromium-l10n cifs-utils clementine -packages += dolphin dvdauthor dvd+rw-tools -packages += ffmpeg fonts-liberation fonts-liberation2 frei0r-plugins -packages += gambas3 gcc genisoimage gnumeric growisofs gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-x gwenview +packages += alsa-utils audacity aqemu +packages += brasero brasero-cdrkit breeze-icon-theme +packages += chntpw chromium chromium-sandbox chromium-l10n cifs-utils clementine cryptsetup +packages += debian-installer-launcher debootstrap dolphin dosfstools dvdauthor dvd+rw-tools +packages += eject exfat-fuse exfatprogs +packages += ffmpeg firefox-esr firefox-esr-l10n-de fonts-liberation fonts-liberation2 frei0r-plugins +packages += gambas3 gcc gdebi genisoimage git gnumeric gparted growisofs gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-x gwenview packages += hunspell hunspell-de-de hyphen-de packages += inkscape inkscape-tutorials ipython3 -packages += k3b k3b-i18n kcalc kdenlive kde-spectacle kde-style-breeze konsole krita krita-l10n -packages += locales lazarus libc-dev libk3b-extracodecs libreoffice-calc libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze libreoffice-writer -packages += marble mencoder mesa-utils mplayer mumble mypaint -packages += normalize-audio -packages += obs-studio okular osspd -packages += pdfchain php-cli +packages += k3b- k3b-i18n- kcalc kdenlive kde-spectacle kde-style-breeze krita krita-l10n +packages += locales lazarus libblockdev-crypto3 libc-dev libk3b-extracodecs libreoffice-calc libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze libreoffice-writer lvm2 +packages += man-db manpages-de marble- mdadm mesa-utils mousepad mpv mypaint +packages += nbd-client ncat network-manager-gnome normalize-audio ntfs-3g +packages += okular osspd oxygencursors +packages += p7zip-full pavucontrol pdfchain php-cli pulseaudio pulseaudio-module-bluetooth packages += qemu-system-x86 qemu-system-gui qemu-utils packages += recordmydesktop -packages += samba-common-bin sane-airscan scribus skanlite sox -packages += va-driver-all vdpau-driver-all -packages += x264 xdotool xfce4-goodies xfce4-power-manager-plugins +packages += samba-common-bin sane-airscan scribus skanlite sox synaptic +packages += telnet tmux +packages += unace unrar-free +packages += va-driver-all vdpau-driver-all vlc +packages += x264 xdotool xfce4-goodies xfce4-power-manager-plugins xinput xpdf packages += yt-dlp zenity +PACKAGES := $(filter-out xscreensaver,${PACKAGES}) xfce4-screensaver + +# packages += linux-image-amd64 +packages += linux-image-6.1.0-25-amd64 +packages += firmware-atheros firmware-brcm80211 firmware-iwlwifi firmware-misc-nonfree firmware-libertas firmware-realtek +# packages+=firmware-ipw2x00 + # packages += 0ad packages += extremetuxracer # packages += flare-game freeciv freeciv-client-sdl @@ -42,7 +58,63 @@ packages += torus-trooper # packages += minetest-mod-pipeworks minetest-mod-protector # packages += minetest-mod-unified-inventory -modules+=,gimp +modules=nodm,xfce,gimp,live #,approx +hostname=live +rootpass=root +# rootkey=image_ssh +users=live +# wifi=MyWiFi +# wifipass=P4ssW0rD +timezone=Europe/Berlin +locales=de_DE.UTF-8 #,en_US.UTF-8 +keyboard=de +nodm_user=live +approx=http://localhost:9000/debian + +.PHONY: _live_initrd +_config: _live_initrd +_live_initrd: cfg_root _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 +_config: _favorites +_favorites: _xfce + printf 'favorites=debian-installer-launcher.desktop,libreoffice-startcenter.desktop,epiphany.desktop,xfce4-terminal.desktop,xfce4-file-manager.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \ + >"$${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 + mkdir "$${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' \ + >$@ + chroot "$${CFGROOT}" chown live:live -R /home/live + +# 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: + 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/initrd.gz: /usr/lib/debian-installer/images/12/amd64/gtk/debian-installer/amd64/initrd.gz + mkdir -p "$(dir $@)" + cp "$<" "$@" + +# 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 + 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' \ + '/run/live/medium /boot/ bind auto,bind' \ + '/run/live/medium /lib/live/mount/medium bind auto,bind' \ + >"$${CFGROOT}/etc/fstab" # Bugfix: prevent warning from faulty dolphin config _config: cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc -- 2.39.2