diff options
| -rwxr-xr-x | config/chroot_local-hooks/03-ntfs3-override | 10 | ||||
| -rwxr-xr-x | config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout | 25 | ||||
| -rw-r--r-- | config/lists/base | 9 | ||||
| -rw-r--r-- | config/lists/extra-cs | 6 | ||||
| -rw-r--r-- | config/lists/extra-es | 6 | ||||
| -rw-r--r-- | config/lists/extra-it | 8 | ||||
| -rw-r--r-- | config/lists/kanotix-eeepc4G | 4 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-full | 2 | ||||
| -rw-r--r-- | config/lists/office | 94 | ||||
| -rwxr-xr-x | nightly_build.bash | 18 |
10 files changed, 107 insertions, 75 deletions
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-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/lists/base b/config/lists/base index f8c57ab..962bb27 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 @@ -105,6 +110,10 @@ zsync debconf-utils rpm2cpio usbutils +util-linux +#nif DISTRIBUTION bullseye +util-linux-extra +#endif exif fsarchiver xterm 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 f3109f5..10433d5 100644 --- a/config/lists/kanotix-eeepc4G +++ b/config/lists/kanotix-eeepc4G @@ -101,6 +101,10 @@ zsync debconf-utils rpm2cpio usbutils +util-linux +#nif DISTRIBUTION bullseye +util-linux-extra +#endif exif fsarchiver xterm 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/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..e2b7da8 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 |