diff options
26 files changed, 215 insertions, 137 deletions
diff --git a/config/binary_burg/burg.cfg b/config/binary_burg/burg.cfg index ed49810..49d2c15 100644 --- a/config/binary_burg/burg.cfg +++ b/config/binary_burg/burg.cfg @@ -38,7 +38,7 @@ insmod gettext menuentry 'Start Kanotix' --class kanotix --group main { echo 'Loading Linux ...' - linux /live/vmlinuz boot=live config ${lang_opt} quiet splash + linux /live/vmlinuz boot=live config ${lang_opt} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -46,7 +46,7 @@ menuentry 'Start Kanotix' --class kanotix --group main { if test -d /gfxoverlay ; then menuentry 'Start Kanotix (gfxoverlay)' --class kanotix --group main { echo 'Loading Linux ...' - linux /live/vmlinuz boot=live config ${lang_opt} gfx=auto quiet splash + linux /live/vmlinuz boot=live config ${lang_opt} gfx=auto quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -54,7 +54,7 @@ fi menuentry 'Start Kanotix (failsafe)' --class kanotix --group main { echo 'Loading Linux ...' - linux /live/vmlinuz boot=live config ${lang_opt} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz boot=live config ${lang_opt} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg index c49c37a..57f248d 100644 --- a/config/binary_grub/grub.cfg +++ b/config/binary_grub/grub.cfg @@ -57,7 +57,7 @@ fi ##### menuentry 'Start Kanotix DE' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -71,7 +71,7 @@ menuentry 'Start Kanotix DE (gfxdetect)' { menuentry 'Start Kanotix EN' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -85,7 +85,7 @@ menuentry 'Start Kanotix EN (gfxdetect)' { menuentry 'Start Kanotix DE (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -93,7 +93,7 @@ menuentry 'Start Kanotix DE (failsafe)' { menuentry 'Start Kanotix EN (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_grub/grub.cfg.cz b/config/binary_grub/grub.cfg.cz index 4ddfff3..83e1842 100644 --- a/config/binary_grub/grub.cfg.cz +++ b/config/binary_grub/grub.cfg.cz @@ -58,7 +58,7 @@ fi ##### menuentry 'Start Kanotix DE' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -72,7 +72,7 @@ menuentry 'Start Kanotix DE (gfxdetect)' { menuentry 'Start Kanotix EN' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -86,7 +86,7 @@ menuentry 'Start Kanotix EN (gfxdetect)' { menuentry 'Start Kanotix CZ' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_cs} quiet splash + linux /live/vmlinuz ${boot_cs} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -100,7 +100,7 @@ menuentry 'Start Kanotix CZ (gfxdetect)' { menuentry 'Start Kanotix DE (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -108,14 +108,14 @@ menuentry 'Start Kanotix DE (failsafe)' { menuentry 'Start Kanotix EN (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix CZ (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_cs} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_cs} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_grub/loopback.cfg b/config/binary_grub/loopback.cfg index b69cb37..288027c 100644 --- a/config/binary_grub/loopback.cfg +++ b/config/binary_grub/loopback.cfg @@ -61,28 +61,28 @@ fi ##### menuentry 'Start Kanotix DE' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} ${loopback} quiet splash + linux /live/vmlinuz ${boot_de} ${loopback} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix EN' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} ${loopback} quiet splash + linux /live/vmlinuz ${boot_en} ${loopback} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix DE (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} ${loopback} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_de} ${loopback} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix EN (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} ${loopback} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_en} ${loopback} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_syslinux/live.cfg b/config/binary_syslinux/live.cfg index f186aa3..d562bd4 100644 --- a/config/binary_syslinux/live.cfg +++ b/config/binary_syslinux/live.cfg @@ -5,22 +5,22 @@ label kanotix-live-de menu label Start Kanotix-DE menu default kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys nocompiz quiet splash + append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys nocompiz quiet splash loglevel=3 label kanotix-live-en menu label Start Kanotix-EN kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config utc=yes locales=en_US.UTF-8_US nocompiz quiet splash + append initrd=/live/initrd.img boot=live config utc=yes locales=en_US.UTF-8_US nocompiz quiet splash loglevel=3 label kanotix-live-de-failsafe menu label Start Kanotix-DE (failsafe) kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal nocompiz quiet splash + append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal nocompiz quiet splash loglevel=3 label kanotix-live-en-failsafe menu label Start Kanotix EN (failsafe) kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config utc=yes locales=en_US.UTF-8_US noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal nocompiz quiet splash + append initrd=/live/initrd.img boot=live config utc=yes locales=en_US.UTF-8_US noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal nocompiz quiet splash loglevel=3 label memtest menu label Memtest86+ diff --git a/config/chroot_local-hooks/03-distro b/config/chroot_local-hooks/03-distro index a26ee4f..12c3a01 100755 --- a/config/chroot_local-hooks/03-distro +++ b/config/chroot_local-hooks/03-distro @@ -12,7 +12,7 @@ rsync -Ha --ignore-existing /usr/share/kanotix/profile/ /etc/skel/ perl -pi -e 's/^(GRUB_DISTRIBUTOR)=.*/\1=`[ "\$\(uname -m\)" = "x86_64" ] && echo Kanotix64 || echo Kanotix`/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_LINUX_RECOVERY)=.*/\1="true"/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_RECOVERY)=.*/\1="true"/' /etc/default/grub -perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash"/' /etc/default/grub +perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash loglevel=3"/' /etc/default/grub perl -pi -e 's/#GRUB_DISABLE_OS_PROBER=false/GRUB_DISABLE_OS_PROBER=false/g' /etc/default/grub diff --git a/config/chroot_local-hooks/03-lxde-fixes b/config/chroot_local-hooks/03-lxde-fixes index abdbaec..78143f7 100755 --- a/config/chroot_local-hooks/03-lxde-fixes +++ b/config/chroot_local-hooks/03-lxde-fixes @@ -45,6 +45,20 @@ cat <<"EOF" >/etc/skel/.config/lxsession/LXDE/autostart @xfce4-power-manager-wrapper EOF + # hotfix for key PRINT + if [ -e /etc/skel/.config/openbox/lxde-rc.xml ]; then + sed -i 's/gnome-screenshot --interactive/ksnip/' /etc/skel/.config/openbox/lxde-rc.xml + if [ -e /var/lib/dpkg/info/xfce4-screenshooter.list ]; then + sed -i 's/ksnip/xfce4-screenshooter/' /etc/skel/.config/openbox/lxde-rc.xml + fi + fi + if [ -e /etc/skel/.config/compiz/compizconfig/Default.ini ]; then + sed -i 's/gnome-screenshot -i -w/ksnip/' /etc/skel/.config/compiz/compizconfig/Default.ini + sed -i 's/gnome-screenshot -i/ksnip/' /etc/skel/.config/compiz/compizconfig/Default.ini + if [ -e /var/lib/dpkg/info/xfce4-screenshooter.list ]; then + sed -i 's/ksnip/xfce4-screenshooter/' /etc/skel/.config/compiz/compizconfig/Default.ini + fi + fi # awesome in lightdm-menu if [ -e /usr/share/xsessions/awesome.desktop ]; then sed -i '/NoDisplay/d' /usr/share/xsessions/awesome.desktop diff --git a/config/chroot_local-hooks/03-ntfs3-override b/config/chroot_local-hooks/03-ntfs3-override new file mode 100755 index 0000000..2e7a3f9 --- /dev/null +++ b/config/chroot_local-hooks/03-ntfs3-override @@ -0,0 +1,10 @@ +#!/bin/sh + +for file in /root/config/*; do [ -r $file ] && . $file; done + +case "${LB_DISTRIBUTION}" in + +bookworm|trixie) + [ -e /sbin/mount.ntfs3 ] || ln -sfv $(readlink /sbin/mount.ntfs-3g) /sbin/mount.ntfs3 + ;; +esac diff --git a/config/chroot_local-hooks/03-towelfire-fixes b/config/chroot_local-hooks/03-towelfire-fixes index 29c4123..3ea8a0c 100755 --- a/config/chroot_local-hooks/03-towelfire-fixes +++ b/config/chroot_local-hooks/03-towelfire-fixes @@ -9,6 +9,12 @@ if [ -f /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/m sed -i 's/applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager,preferred:\/\/browser//' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml fi +# plasmamobile + +if [ -f /usr/share/plasma/look-and-feel/org.kde.breeze.mobile/contents/defaults ]; then + sed -i 's/Image=Next/Image=kanotix-spring/' /usr/share/plasma/look-and-feel/org.kde.breeze.mobile/contents/defaults +fi + # set flag as default in keyboard layout if [ -f /usr/share/plasma/plasmoids/org.kde.plasma.keyboardlayout/contents/config/main.xml ]; then sed -i 's/<default>0/<default>1/' /usr/share/plasma/plasmoids/org.kde.plasma.keyboardlayout/contents/config/main.xml diff --git a/config/chroot_local-hooks/hotfixes.sh b/config/chroot_local-hooks/hotfixes.sh index e437794..ea620dc 100755 --- a/config/chroot_local-hooks/hotfixes.sh +++ b/config/chroot_local-hooks/hotfixes.sh @@ -33,11 +33,6 @@ rm -rf /etc/sysconfig # rm/cp/mv aliases and bash completion for login shell cat <<EOT >> /etc/profile -# enable bash completion in interactive shells -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion -fi - # Some more alias to avoid making mistakes: alias rm='rm -i' alias cp='cp -i' diff --git a/config/chroot_local-hooks/xx-sources.list b/config/chroot_local-hooks/xx-sources.list index caf7cd6..a0597ee 100755 --- a/config/chroot_local-hooks/xx-sources.list +++ b/config/chroot_local-hooks/xx-sources.list @@ -23,28 +23,18 @@ case "${LB_DISTRIBUTION}" in stretch|buster|bullseye) exit ;; esac -# add signed-by to sources.list -# TODO dep822 -# TODO wine -# TODO fix it - -#sed -i 's/^deb-src/dummy/g' /etc/apt/sources.list +# Provide LB_DISTRIBUTION-updates Repo +# Fix as lb build with updates -#sed -i '/kanotix/s/^deb/deb [signed-by=\/usr\/share\/keyrings\/kanotix25.asc]/g' /etc/apt/sources.list -#sed -i '/debian.org/s/^deb/deb [signed-by=\/usr\/share\/keyrings\/debian-archive-keyring.gpg]/g' /etc/apt/sources.list -#sed -i '/dl.winehq/s/^deb/deb [signed-by=\/etc\/apt\/keyrings\/wine-staging.key.asc]/g' /etc/apt/sources.list +cat <<EOF >>/etc/apt/sources.list +# Debian ${LB_DISTRIBUTION}-proposed-updates +deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian ${LB_DISTRIBUTION}-updates main contrib non-free non-free-firmware +deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian ${LB_DISTRIBUTION}-updates main contrib non-free non-free-firmware +EOF -#sed -i 's/^dummy/deb-src/g' /etc/apt/sources.list -#sed -i '/kanotix/s/^deb-src/deb-src [signed-by=\/usr\/share\/keyrings\/kanotix25.asc]/g' /etc/apt/sources.list -#sed -i '/debian.org/s/^deb-src/deb-src [signed-by=\/usr\/share\/keyrings\/debian-archive-keyring.gpg]/g' /etc/apt/sources.list -#sed -i '/dl.winehq/s/^deb-src/deb-src [signed-by=\/etc\/apt\/keyrings\/wine-staging.key.asc]/g' /etc/apt/sources.list - -#if [ -e /etc/apt/trusted.gpg.d/wine-staging.key.asc ]; then -# cp -f /etc/apt/trusted.gpg.d/wine-staging.key.asc /etc/apt/keyrings/wine-staging.key.asc -#fi +# TODO dep822 # key.asc is kanotix spec -# debian keys needed by live-build ? +# debian keys needed by live-build ? no rm -f /etc/apt/trusted.gpg.d/*.key.asc -# test if we need debian-keys rm -f /etc/apt/trusted.gpg.d/* diff --git a/config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout b/config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout index 1e132c2..53034b8 100755 --- a/config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout +++ b/config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout @@ -4,14 +4,19 @@ PlasmaKeyboardLayout () { KXKBRC=/home/${LIVE_USERNAME}/.config/kxkbrc # KXKBRC=/home/kanotix/kxkbrc/kxkbrc - + KWRITECONFIG="" # Checking if package is already configured if [ -e /var/lib/live/config/plasmakeyboardlayout ] || \ - [ ! -e ${KXKBRC} ] || [ ! -x /usr/bin/kwriteconfig5 ] + [ ! -e ${KXKBRC} ] then return fi + [ -x /usr/bin/kwriteconfig5 ] && KWRITECONFIG="/usr/bin/kwriteconfig5" + [ -x /usr/bin/kwriteconfig6 ] && KWRITECONFIG="/usr/bin/kwriteconfig6" + + [ -z ${KWRITECONFIG} ] && return + echo -n " plasmakeyboardlayout" for _PARAMETER in ${_CMDLINE} ${LIVE_CONFIG_CMDLINE} @@ -54,16 +59,16 @@ case "$LIVE_KEYBOARD_LAYOUTS" in : # use preconfig ;; us) - kwriteconfig5 --file "$KXKBRC" --group Layout --key LayoutList --type string "us,fr,cz,de" - kwriteconfig5 --file "$KXKBRC" --group Layout --key VariantList --type string ",,,nodeadkeys" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key LayoutList --type string "us,fr,cz,de" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key VariantList --type string ",,,nodeadkeys" ;; fr) - kwriteconfig5 --file "$KXKBRC" --group Layout --key LayoutList --type string "fr,cz,de,us" - kwriteconfig5 --file "$KXKBRC" --group Layout --key VariantList --type string ",,nodeadkeys," + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key LayoutList --type string "fr,cz,de,us" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key VariantList --type string ",,nodeadkeys," ;; cz) - kwriteconfig5 --file "$KXKBRC" --group Layout --key LayoutList --type string "cz,de,us,fr" - kwriteconfig5 --file "$KXKBRC" --group Layout --key VariantList --type string ",nodeadkeys,," + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key LayoutList --type string "cz,de,us,fr" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key VariantList --type string ",nodeadkeys,," ;; *) : # use preconfig @@ -71,8 +76,8 @@ case "$LIVE_KEYBOARD_LAYOUTS" in esac [ -r /etc/default/keyboard ] && . /etc/default/keyboard - [ "$XKBMODEL" ] && kwriteconfig5 --file "$KXKBRC" --group Layout --key Model --type string "$XKBMODEL" - kwriteconfig5 --file "$KXKBRC" --group Layout --key DisplayNames --type string ",,," + [ "$XKBMODEL" ] && ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key Model --type string "$XKBMODEL" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key DisplayNames --type string ",,," # Creating state file touch /var/lib/live/config/plasmakeyboardlayout diff --git a/config/chroot_local-includes/lib/live/config/9022-kplasmamobile b/config/chroot_local-includes/lib/live/config/9022-kplasmamobile new file mode 100755 index 0000000..f41b0ac --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/9022-kplasmamobile @@ -0,0 +1,36 @@ +#!/bin/sh + +Kplasmamobile () +{ + # Checking if configured + if [ -e /var/lib/live/config/kplasmamobile ] + then + return + fi + echo -n " kplasmamobile" + Configure_kplasmamobile +} +Configure_kplasmamobile () +{ + # Boot parameters can be acted up either this way... + if grep -qs "kplasmamobile" /proc/cmdline + then + if [ -x /usr/bin/startplasmamobile ]; then + if [ -x /usr/sbin/lightdm ]; then + echo "[Desktop]" >/home/${LIVE_USERNAME}/.dmrc + echo "Session=plasma-mobile" >>/home/${LIVE_USERNAME}/.dmrc + chown 1000:1000 /home/${LIVE_USERNAME}/.dmrc + echo "[Seat:*]" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf + echo "user-session=plasma-mobile" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf + fi + if [ -x /usr/bin/sddm ]; then + sed -i 's/Session=plasmax11/Session=plasma-mobile/' /etc/sddm.conf.d/kde_settings.conf + fi + fi + fi + + # Creating state file + touch /var/lib/live/config/kplasmamobile +} + +Kplasmamobile diff --git a/config/lists/base b/config/lists/base index 0be58b5..fb39876 100644 --- a/config/lists/base +++ b/config/lists/base @@ -5,6 +5,11 @@ #include <base.kanotix> sudo +# provide android-tools +#if ARCHITECTURE amd64 +#include <android> +#endif + # handle polkit since bookworm #nif DISTRIBUTION wheezy jessie stretch buster bullseye polkitd @@ -62,6 +67,7 @@ bc clinfo #nif DISTRIBUTION bullseye bookworm fastfetch +fastfetch-kanotix-skel hstr #endif mc diff --git a/config/lists/compiz-gtk b/config/lists/compiz-gtk index 97e4e84..9ffba50 100644 --- a/config/lists/compiz-gtk +++ b/config/lists/compiz-gtk @@ -24,13 +24,15 @@ compizconfig-settings-manager #nif DISTRIBUTION wheezy jessie stretch #fusion-icon etcskel-kanotix-compiz -compiz +compiz-core +libcompizconfig0 compiz-gnome compiz-plugins compiz-plugins-main compiz-plugins-extra compiz-plugins-experimental compizconfig-settings-manager +compiz-bcop #endif #nif DISTRIBUTION wheezy jessie stretch buster bullseye diff --git a/config/lists/extra-cs b/config/lists/extra-cs index 14719e6..5862561 100644 --- a/config/lists/extra-cs +++ b/config/lists/extra-cs @@ -7,7 +7,7 @@ kde-l10n-cs # libre office packages #if ARCHITECTURE amd64 -libobasis25.2-cs -libobasis25.2-cs-help -libreoffice25.2-cs +libobasis25.8-cs +libobasis25.8-cs-help +libreoffice25.8-cs #endif diff --git a/config/lists/extra-es b/config/lists/extra-es index 8c50bdb..da634f4 100644 --- a/config/lists/extra-es +++ b/config/lists/extra-es @@ -7,7 +7,7 @@ kde-l10n-es # libre office packages #if ARCHITECTURE amd64 -libobasis25.2-es -libobasis25.2-es-help -libreoffice25.2-es +libobasis25.8-es +libobasis25.8-es-help +libreoffice25.8-es #endif diff --git a/config/lists/extra-it b/config/lists/extra-it index dedc469..2843b0c 100644 --- a/config/lists/extra-it +++ b/config/lists/extra-it @@ -7,8 +7,8 @@ kde-l10n-it # libre office packages #if ARCHITECTURE amd64 -libobasis25.2-it -libobasis25.2-it-help -libreoffice25.2-dict-it -libreoffice25.2-it +libobasis25.8-it +libobasis25.8-it-help +libreoffice25.8-dict-it +libreoffice25.8-it #endif diff --git a/config/lists/kanotix-eeepc4G b/config/lists/kanotix-eeepc4G index 10433d5..8646475 100644 --- a/config/lists/kanotix-eeepc4G +++ b/config/lists/kanotix-eeepc4G @@ -337,8 +337,10 @@ xfce4-notifyd lxpolkit #endif clearlooks-phenix-theme -#nif DISTRIBUTION wheezy jessie + gtk3-nocsd +#if ARCHITECTURE amd64 +libgtk3-nocsd0:i386 #endif # tools @@ -406,7 +408,7 @@ xchat #endif # other -gnome-screenshot +xfce4-screenshooter seahorse #if DISTRIBUTION bullseye bookworm keepassxc diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base index 252a60a..e0e6285 100644 --- a/config/lists/kanotix-lxde-base +++ b/config/lists/kanotix-lxde-base @@ -23,8 +23,10 @@ lxpolkit lxappearance-obconf console-data clearlooks-phenix-theme -#nif DISTRIBUTION wheezy jessie + gtk3-nocsd +#if ARCHITECTURE amd64 +libgtk3-nocsd0:i386 #endif gvfs-backends diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full index 585f947..3dcc2fb 100644 --- a/config/lists/kanotix-lxde-full +++ b/config/lists/kanotix-lxde-full @@ -25,6 +25,8 @@ libsane-extras #endif sane-utils sane +#gpicview pcmanfm heif support +heif-gdk-pixbuf # network diff --git a/config/lists/kde5 b/config/lists/kde5 index de7976f..43309f7 100644 --- a/config/lists/kde5 +++ b/config/lists/kde5 @@ -17,6 +17,8 @@ okularplugin #endif # plugins +qt5-image-formats-plugins +qt5-image-formats-plugin-pdf # multimedia libsdl1.2debian diff --git a/config/lists/kde6 b/config/lists/kde6 index d947c51..2da1e68 100644 --- a/config/lists/kde6 +++ b/config/lists/kde6 @@ -21,6 +21,8 @@ okularplugin #endif # plugins +qt6-image-formats-plugins +qt6-image-formats-plugin-pdf # multimedia libsdl1.2debian diff --git a/config/lists/kde6-more b/config/lists/kde6-more index a914401..2b1a873 100644 --- a/config/lists/kde6-more +++ b/config/lists/kde6-more @@ -12,3 +12,5 @@ quilt plasma-workspace-wayland #endif neochat +plasma-mobile +plasma-mobile-tweaks diff --git a/config/lists/office b/config/lists/office index 5983842..b3c9fa6 100644 --- a/config/lists/office +++ b/config/lists/office @@ -1,49 +1,49 @@ -libobasis25.2-base -libobasis25.2-calc -libobasis25.2-core -libobasis25.2-de -libobasis25.2-de-help -libobasis25.2-draw -libobasis25.2-en-us -libobasis25.2-en-us-help -libobasis25.2-extension-beanshell-script-provider -libobasis25.2-extension-javascript-script-provider -libobasis25.2-extension-mediawiki-publisher -libobasis25.2-extension-nlpsolver -libobasis25.2-extension-pdf-import -libobasis25.2-extension-report-builder -libobasis25.2-firebird -libobasis25.2-gnome-integration -libobasis25.2-graphicfilter -libobasis25.2-images -libobasis25.2-impress +libobasis25.8-base +libobasis25.8-calc +libobasis25.8-core +libobasis25.8-de +libobasis25.8-de-help +libobasis25.8-draw +libobasis25.8-en-us +libobasis25.8-en-us-help +libobasis25.8-extension-beanshell-script-provider +libobasis25.8-extension-javascript-script-provider +libobasis25.8-extension-mediawiki-publisher +libobasis25.8-extension-nlpsolver +libobasis25.8-extension-pdf-import +libobasis25.8-extension-report-builder +libobasis25.8-firebird +libobasis25.8-gnome-integration +libobasis25.8-graphicfilter +libobasis25.8-images +libobasis25.8-impress #nif DISTRIBUTION stretch buster -libobasis25.2-kde-integration +libobasis25.8-kde-integration #endif -libobasis25.2-librelogo -libobasis25.2-libreofficekit-data -libobasis25.2-math -libobasis25.2-ogltrans -libobasis25.2-onlineupdate -libobasis25.2-ooofonts -libobasis25.2-ooolinguistic -libobasis25.2-postgresql-sdbc -libobasis25.2-python-script-provider -libobasis25.2-pyuno -libobasis25.2-writer -libobasis25.2-xsltfilter -libreoffice25.2 -libreoffice25.2-base -libreoffice25.2-calc -libreoffice25.2-de -libreoffice25.2-debian-menus -libreoffice25.2-dict-de -libreoffice25.2-dict-en -libreoffice25.2-dict-es -libreoffice25.2-dict-fr -libreoffice25.2-draw -libreoffice25.2-en-us -libreoffice25.2-impress -libreoffice25.2-math -libreoffice25.2-ure -libreoffice25.2-writer +libobasis25.8-librelogo +libobasis25.8-libreofficekit-data +libobasis25.8-math +libobasis25.8-ogltrans +libobasis25.8-onlineupdate +libobasis25.8-ooofonts +libobasis25.8-ooolinguistic +libobasis25.8-postgresql-sdbc +libobasis25.8-python-script-provider +libobasis25.8-pyuno +libobasis25.8-writer +libobasis25.8-xsltfilter +libreoffice25.8 +libreoffice25.8-base +libreoffice25.8-calc +libreoffice25.8-de +libreoffice25.8-debian-menus +libreoffice25.8-dict-de +libreoffice25.8-dict-en +libreoffice25.8-dict-es +libreoffice25.8-dict-fr +libreoffice25.8-draw +libreoffice25.8-en-us +libreoffice25.8-impress +libreoffice25.8-math +libreoffice25.8-ure +libreoffice25.8-writer diff --git a/nightly_build.bash b/nightly_build.bash index 599ad79..8083574 100755 --- a/nightly_build.bash +++ b/nightly_build.bash @@ -89,14 +89,16 @@ sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config cat <<"EOF" >$target/readme-$KDISTRO.txt -Towelfire Isos are pre releases. -====================================== -based on debian trixie (testing for now) -bugs are expected -broken updates may happen - -i386 ships with bookworm kernel -and may break completely +Towelfire Isos are current release. +=================================== +Based on Debian13 trixie (stable). +Isos are nightly builds. +acritox installer(recommended) +and calamares installer are provided. + +i386 eeepc4G.iso ships with bookworm kernel +and reduced firmware +and may need nomodeset to boot. EOF ln -s $target/readme-$KDISTRO.txt $next/readme-$KDISTRO.txt @@ -104,7 +106,7 @@ ln -s $target/readme-$KDISTRO.txt $next/readme-$KDISTRO.txt if $BUILD_TRIXIE_EEE_AMD64; then # eeepc4G amd64 with LXDE lb clean -lb config -d $DISTRO -p "kanotix-eeepc4G firefox systemd-extra" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd --initramfs live-boot +lb config -d $DISTRO -p "kanotix-eeepc4G firefox systemd-extra" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd --initramfs live-boot echo Kanotix towelfire-nightly Towelfire64 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso check_iso @@ -131,7 +133,7 @@ fi # end amd64 EEE if $BUILD_TRIXIE_AMD64; then # kde 64 lb clean -lb config -d $DISTRO -p "debpool kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd --initramfs live-boot +lb config -d $DISTRO -p "debpool kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd --initramfs live-boot echo Kanotix towelfire-nightly Towelfire64 $d$v KDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso check_iso @@ -157,7 +159,7 @@ fi # # lxde 64 lb clean -lb config -d $DISTRO -p "debpool kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd --initramfs live-boot +lb config -d $DISTRO -p "debpool kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd --initramfs live-boot echo Kanotix towelfire-nightly Towelfire64 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso check_iso @@ -184,7 +186,7 @@ fi #end of amd64 if $BUILD_TRIXIE_I386; then # kde 32 lb clean -lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix towelfire-nightly Towelfire32 $d$v KDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso check_iso @@ -209,7 +211,7 @@ fi # lxde 32 lb clean -lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix towelfire-nightly Towelfire32 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso check_iso @@ -236,7 +238,7 @@ fi #end of trixie i386 kde lxde if $BUILD_TRIXIE_EEE_I386; then # eeepc4G with LXDE lb clean -lb config -d $DISTRO -p "kanotix-eeepc4G netsurf-gtk" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-eeepc4G netsurf-gtk" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix towelfire-nightly Towelfire32 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso check_iso @@ -283,7 +285,7 @@ ln -s $target/readme-$KDISTRO.txt $next/readme-$KDISTRO.txt # kde 64 lb clean -lb config -d $DISTRO -p "debpool kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd +lb config -d $DISTRO -p "debpool kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd echo Kanotix slowfire-nightly Slowfire64 $d$v KDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso check_iso @@ -309,7 +311,7 @@ fi # # lxde 64 lb clean -lb config -d $DISTRO -p "debpool kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd +lb config -d $DISTRO -p "debpool kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd echo Kanotix slowfire-nightly Slowfire64 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso check_iso @@ -335,7 +337,7 @@ fi # kde 32 lb clean -lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix slowfire-nightly Slowfire32 $d$v KDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso check_iso @@ -360,7 +362,7 @@ fi # lxde 32 lb clean -lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix slowfire-nightly Slowfire32 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso check_iso @@ -395,7 +397,7 @@ rm -rf cache tmpfs/cache sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config lb clean -lb config -d $DISTRO -p "kanotix-eeepc4G netsurf-gtk" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-eeepc4G netsurf-gtk" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix slowfire-nightly Slowfire32 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso check_iso @@ -430,7 +432,7 @@ sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config # eeepc4G with LXDE lb clean -lb config -d $DISTRO -p "kanotix-eeepc4G netsurf-gtk" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-eeepc4G netsurf-gtk" --bootloader grub2 --tmpfs true --tmpfs-options size=18G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix speedfire-nightly Speedfire32 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso check_iso |