summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xauto/config13
-rwxr-xr-xconfig/chroot_local-hooks/03-towelfire-fixes107
-rwxr-xr-xconfig/chroot_local-hooks/03-trixie-su-fix9
-rwxr-xr-xconfig/chroot_local-hooks/hotfixes.sh2
-rwxr-xr-xconfig/chroot_local-hooks/xx-sources.list31
-rw-r--r--config/chroot_local-includes/etc/apt/sources.list8
-rw-r--r--config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf15
-rwxr-xr-xconfig/chroot_local-includes/lib/live/config/0086-sddm38
-rwxr-xr-xconfig/chroot_local-includes/lib/live/config/9023-kwayland5
-rw-r--r--config/lists/base41
-rw-r--r--config/lists/base.kanotix5
-rw-r--r--config/lists/broadcom-firm5
-rw-r--r--config/lists/cupsi38610
-rw-r--r--config/lists/firmware6
-rw-r--r--config/lists/kanotix-eeepc4G49
-rw-r--r--config/lists/kanotix-kde-base7
-rw-r--r--config/lists/kanotix-kde-master11
-rw-r--r--config/lists/kanotix-lxde-base4
-rw-r--r--config/lists/kanotix-lxde-full2
-rw-r--r--config/lists/kanotix-lxde-master15
-rw-r--r--config/lists/kanotix-lxde-min7
-rw-r--r--config/lists/kde6159
-rw-r--r--config/lists/kde6-more14
-rw-r--r--config/lists/printer_driver_all2
-rw-r--r--config/repositories/acritoxinstaller-qt44
-rw-r--r--config/repositories/acritoxinstaller-qt4.gpg76
-rw-r--r--config/repositories/kanotix25.asc52
-rw-r--r--config/repositories/kernel-pae2
-rw-r--r--config/repositories/lo2
-rw-r--r--config/repositories/slowfire4
-rw-r--r--config/repositories/slowfire.gpg76
-rw-r--r--config/repositories/towelfire3
-rw-r--r--config/repositories/towelfire.gpg52
-rw-r--r--config/repositories/wine-staging2
-rwxr-xr-xnightly_build.bash789
35 files changed, 965 insertions, 662 deletions
diff --git a/auto/config b/auto/config
index e0fb4cd..ecb7f73 100755
--- a/auto/config
+++ b/auto/config
@@ -48,7 +48,7 @@ bullseye)
KSECURITY="true"
;;
*)
- KDEBOOTSTRAPOPTIONS="--include=apt-transport-https,ca-certificates,gpg,gpg-agent,mime-support --exclude=nano"
+ KDEBOOTSTRAPOPTIONS="--include=apt-transport-https,ca-certificates,gpg,gpg-agent,mailcap,media-types --exclude=nano"
;;
esac
@@ -124,12 +124,21 @@ bullseye)
esac
;;
bookworm)
- LB_REPOSITORIES+="slowfire acritoxinstaller-qt4"
+ LB_REPOSITORIES+="acritoxinstaller-qt4 slowfire"
case $LB_ARCHITECTURE in
amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
i386) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
esac
;;
+trixie)
+ LB_REPOSITORIES+="acritoxinstaller-qt4 towelfire"
+ case $LB_ARCHITECTURE in
+ amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
+ i386) LB_REPOSITORIES+=" kernel-pae"
+ LB_LINUX_PACKAGES="linux-image"; LB_LINUX_FLAVOURS="686-pae";;
+ esac
+ ;;
+
*)
LB_REPOSITORIES+="spitfire steelfire silverfire speedfire"
case $LB_ARCHITECTURE in
diff --git a/config/chroot_local-hooks/03-towelfire-fixes b/config/chroot_local-hooks/03-towelfire-fixes
new file mode 100755
index 0000000..29c4123
--- /dev/null
+++ b/config/chroot_local-hooks/03-towelfire-fixes
@@ -0,0 +1,107 @@
+#!/bin/sh
+for file in /root/config/*; do [ -r $file ] && . $file; done
+
+if [ "$LB_DISTRIBUTION" = "trixie" ]; then
+
+# Remove 4 plasma icons added by taskmanager
+
+if [ -f /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml ]; then
+ 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
+
+# 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
+fi
+
+# enable tapping
+
+mkdir -p /etc/X11/xorg.conf.d
+
+cat <<"EOF" >/etc/X11/xorg.conf.d/40-libinput.conf
+Section "InputClass"
+ Identifier "libinput touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+ Option "Tapping" "on"
+ #Option "DisableWhileTyping" "1"
+EndSection
+EOF
+
+# set gtk3 theme
+mkdir -p /etc/skel/.config/gtk-3.0
+cat <<"EOF" >/etc/skel/.config/gtk-3.0/settings.ini
+[Settings]
+gtk-theme-name = Clearlooks-Phenix
+EOF
+
+# set gtk2 theme
+mkdir -p /etc/skel
+cat <<"EOF" >/etc/skel/.gtkrc-2.0
+gtk-theme-name = "Clearlooks-Phenix"
+EOF
+
+# disable apt pager
+echo 'Binary::apt::Pager "false";' > /etc/apt/apt.conf.d/98-nopager
+
+# pin bookworm security pin
+ if [ -x /var/lib/dpkg/info/linux-image-686-pae.preinst ]; then
+cat <<"EOF" >/etc/apt/preferences.d/pae
+Package: *
+Pin: release n=bookworm-security
+Pin-Priority: 100
+EOF
+ fi
+# add scale factor for qt defaults to 100%
+echo "QT_SCALE_FACTOR=1.0" >>/etc/environment
+
+# fix for sddm layout
+if [ -f /usr/share/sddm/scripts/Xsetup ]; then
+ echo "setxkbmap" >> /usr/share/sddm/scripts/Xsetup
+fi
+
+# powermanager fix new values since buster
+
+mkdir -p /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
+cat <<"EOF" >/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-power-manager" version="1.0">
+ <property name="xfce4-power-manager" type="empty">
+ <property name="power-button-action" type="uint" value="3"/>
+ <property name="show-tray-icon" type="bool" value="true"/>
+ <property name="lid-action-on-battery" type="uint" value="1"/>
+ <property name="critical-power-action" type="uint" value="1"/>
+ <property name="spin-down-on-battery" type="bool" value="false"/>
+ <property name="lock-screen-suspend-hibernate" type="bool" value="false"/>
+ <property name="brightness-switch-restore-on-exit" type="int" value="1"/>
+ <property name="brightness-switch" type="int" value="0"/>
+ </property>
+</channel>
+EOF
+
+# set compiz splash
+ if [ -e /etc/skel/.config/compiz/compizconfig/Default.ini ]; then
+ sed -i 's/splash_background_spitfire.png/splash_background_towelfire.png/' /etc/skel/.config/compiz/compizconfig/Default.ini
+ fi
+
+# hotfix lxde dead flag
+ if [ -e /usr/share/lxpanel/images/xkb-flags/de.png ]; then
+ cd /usr/share/lxpanel/images/xkb-flags
+ ln -s de.png "de(nodeadkeys).png"
+ cd -
+ fi
+
+# annoying workaround for hpaio (disable prompt for root password in installed system)
+ if [ -e /etc/sane.d/dll.d/hplip ]; then
+ sed -i 's/^hpaio/#hpaio/' /etc/sane.d/dll.d/hplip
+ fi
+
+# replacement for hddtemp, load kernelmodul
+mkdir -p /etc/modules-load.d
+cat <<"EOF" >/etc/modules-load.d/drivetemp.conf
+drivetemp
+EOF
+
+fi
diff --git a/config/chroot_local-hooks/03-trixie-su-fix b/config/chroot_local-hooks/03-trixie-su-fix
new file mode 100755
index 0000000..925fe94
--- /dev/null
+++ b/config/chroot_local-hooks/03-trixie-su-fix
@@ -0,0 +1,9 @@
+#!/bin/sh
+for file in /root/config/*; do [ -r $file ] && . $file; done
+
+if [ "$LB_DISTRIBUTION" = "trixie" ]; then
+
+# force old su behaviour
+echo "ALWAYS_SET_PATH yes" >>/etc/default/su
+
+fi
diff --git a/config/chroot_local-hooks/hotfixes.sh b/config/chroot_local-hooks/hotfixes.sh
index 0943dbd..e437794 100755
--- a/config/chroot_local-hooks/hotfixes.sh
+++ b/config/chroot_local-hooks/hotfixes.sh
@@ -26,7 +26,7 @@ sed -i s/id:.:initdefault:/id:5:initdefault:/ /etc/inittab
sed -i 's/\([1-6]:23\):/\145:/' /etc/inittab
# workarounds to fix old kanotix installs
-rm -f /etc/profile /etc/environment
+rm -f /etc/profile
cp /usr/share/base-files/profile /etc
rm -rf /etc/sysconfig
diff --git a/config/chroot_local-hooks/xx-sources.list b/config/chroot_local-hooks/xx-sources.list
index 337385d..caf7cd6 100755
--- a/config/chroot_local-hooks/xx-sources.list
+++ b/config/chroot_local-hooks/xx-sources.list
@@ -12,8 +12,39 @@ esac
sed -i -e "s#${LB_MIRROR_CHROOT}#http://deb.debian.org/debian#"g /etc/apt/sources.list
# update apt index debpool
+# live is already signed-by
cp -f /etc/apt/sources.list /etc/apt/sources.list.bak
sed -i '/live/!d' /etc/apt/sources.list
apt-get update -y
cp -f /etc/apt/sources.list.bak /etc/apt/sources.list
rm -f /etc/apt/sources.list.bak
+
+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
+
+#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
+
+#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
+
+# key.asc is kanotix spec
+# debian keys needed by live-build ?
+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/etc/apt/sources.list b/config/chroot_local-includes/etc/apt/sources.list
index 436a391..f9432c9 100644
--- a/config/chroot_local-includes/etc/apt/sources.list
+++ b/config/chroot_local-includes/etc/apt/sources.list
@@ -3,10 +3,10 @@
# CDROMs are managed through the apt-cdrom tool.
# Debian @DISTRIBUTION@
-deb @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware
-deb-src @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware
+deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware
+deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware
# Debian @DISTRIBUTION@ Updates
-deb http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free
-deb-src http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free
+deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free
+deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free
diff --git a/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf b/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf
new file mode 100644
index 0000000..1ee5714
--- /dev/null
+++ b/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf
@@ -0,0 +1,15 @@
+[Autologin]
+Relogin=false
+Session=plasmax11
+User=kanotix
+
+[General]
+HaltCommand=
+RebootCommand=
+
+[Theme]
+Current=maldives
+
+[Users]
+MaximumUid=60000
+MinimumUid=1000
diff --git a/config/chroot_local-includes/lib/live/config/0086-sddm b/config/chroot_local-includes/lib/live/config/0086-sddm
new file mode 100755
index 0000000..98da070
--- /dev/null
+++ b/config/chroot_local-includes/lib/live/config/0086-sddm
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+. /usr/lib/live/config.sh
+
+## live-config(7) - System Configuration Components
+## Copyright (C) 2016-2020 The Debian Live team
+## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+#set -e
+
+Init ()
+{
+ # Checking if package is installed or already configured
+ if ! pkg_is_installed "sddm" || \
+ component_was_executed "sddm_kanotix"
+ then
+ exit 0
+ fi
+
+ echo -n " sddm_kanotix"
+}
+
+Config ()
+{
+ # remove file created by 0085-sddm
+ rm -f /etc/sddm.conf
+
+ # Creating state file
+ touch /var/lib/live/config/sddm_kanotix
+}
+
+Init
+Config
diff --git a/config/chroot_local-includes/lib/live/config/9023-kwayland b/config/chroot_local-includes/lib/live/config/9023-kwayland
index 152f32f..7950e60 100755
--- a/config/chroot_local-includes/lib/live/config/9023-kwayland
+++ b/config/chroot_local-includes/lib/live/config/9023-kwayland
@@ -16,11 +16,16 @@ Configure_kwayland ()
if grep -qs "kwayland" /proc/cmdline
then
if [ -x /usr/bin/startplasma-wayland ]; then
+ if [ -x /usr/sbin/lightdm ]; then
echo "[Desktop]" >/home/${LIVE_USERNAME}/.dmrc
echo "Session=plasmawayland" >>/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=plasmawayland" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf
+ fi
+ if [ -x /usr/bin/sddm ]; then
+ sed -i 's/Session=plasmax11/Session=plasma/' /etc/sddm.conf.d/kde_settings.conf
+ fi
fi
fi
diff --git a/config/lists/base b/config/lists/base
index d60c620..f8c57ab 100644
--- a/config/lists/base
+++ b/config/lists/base
@@ -9,6 +9,8 @@ sudo
#nif DISTRIBUTION wheezy jessie stretch buster bullseye
polkitd
pkexec
+#endif
+#if DISTRIBUTION bookworm
polkitd-pkla
#endif
@@ -58,6 +60,10 @@ zstd
# tools
bc
clinfo
+#nif DISTRIBUTION bullseye bookworm
+fastfetch
+hstr
+#endif
mc
most
less
@@ -127,7 +133,7 @@ net-tools
#if DISTRIBUTION wheezy jessie stretch buster bullseye
#include <printer_driver_old>
#endif
-#nif DISTRIBUTION wheezy jessie stretch buster bullseye
+#if DISTRIBUTION bookworm
cups-bsd
cups-client
foomatic-db-engine
@@ -136,15 +142,28 @@ printer-driver-gutenprint
#include <printer_driver_all>
libcups2
#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+cups-bsd
+cups-client
+foomatic-db-engine
+foomatic-db
+#include <printer_driver_all>
+libcups2t64
+#endif
#if ARCHITECTURE amd64
-libcups2:i386
+#include <cupsi386>
#endif
# build
module-assistant
build-essential
fakeroot
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
libstdc++5
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+libstdc++6
+#endif
bzip2
cdbs
dkms
@@ -152,7 +171,13 @@ devscripts
pbuilder
# system
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
cpufrequtils
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+linux-cpupower
+#endif
+
#if DISTRIBUTION wheezy jessie stretch buster
hddtemp
#endif
@@ -198,9 +223,13 @@ xinit
#if DISTRIBUTION wheezy jessie stretch
freerdp-x11
#endif
-#nif DISTRIBUTION wheezy jessie stretch
+#if DISTRIBUTION buster bullseye bookworm
freerdp2-x11
#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+freerdp3-x11
+#endif
+
# disktools
gddrescue
testdisk
@@ -227,7 +256,13 @@ exfatprogs
#nif DISTRIBUTION wheezy
zram
#endif
+#if DISTRIBUTION squeeze wheezy jessie stretch buster bullseye bookworm
httpfs2
+#endif
+# support for appimages
+#nif DISTRIBUTION squeeze wheezy jessie stretch buster bullseye bookworm
+libfuse2t64
+#endif
# filesystem tools
parted
diff --git a/config/lists/base.kanotix b/config/lists/base.kanotix
index 4c725b6..a276e8a 100644
--- a/config/lists/base.kanotix
+++ b/config/lists/base.kanotix
@@ -1,8 +1,13 @@
# kanotix base
etcskel-kanotix
user-profile-kanotix
+kanotix-archive-keyring
kanotix-starrise-base
+#nif DISTRIBUTION bullseye bookworm
+kanotix-spring-base
+#endif
+
plymouth-theme-kanotix-logo
acritoxinstaller-kanotix
diff --git a/config/lists/broadcom-firm b/config/lists/broadcom-firm
new file mode 100644
index 0000000..24c7b80
--- /dev/null
+++ b/config/lists/broadcom-firm
@@ -0,0 +1,5 @@
+# We do not use dkms on i386
+
+#if ARCHITECTURE amd64
+broadcom-sta-dkms
+#endif
diff --git a/config/lists/cupsi386 b/config/lists/cupsi386
new file mode 100644
index 0000000..2b00c3c
--- /dev/null
+++ b/config/lists/cupsi386
@@ -0,0 +1,10 @@
+# config list cups
+# eliminate build error
+
+#if DISTRIBUTION bookworm
+libcups2:i386
+#endif
+
+#nif DISTRIBUTION bookworm
+libcups2t64:i386
+#endif
diff --git a/config/lists/firmware b/config/lists/firmware
index 889f330..fa08af1 100644
--- a/config/lists/firmware
+++ b/config/lists/firmware
@@ -9,4 +9,10 @@ linux-firmware
linux-firmware-nonfree
# broadcom
+#if DISTRIBUTION bullseye bookwom
broadcom-sta-dkms
+#endif
+
+#nif DISTRIBUTION bullseye bookwom
+#include <broadcom-firm>
+#endif
diff --git a/config/lists/kanotix-eeepc4G b/config/lists/kanotix-eeepc4G
index 25b4f6d..f3109f5 100644
--- a/config/lists/kanotix-eeepc4G
+++ b/config/lists/kanotix-eeepc4G
@@ -3,8 +3,10 @@
# Kanotix base Packages List
# install only needed firmware
firmware-atheros
+#nif DISTRIBUTION bullseye
+eeepc-firmware-extra
+#endif
#if ARCHITECTURE amd64
-eeepc4g-firmware-extra
git
#endif
@@ -20,6 +22,8 @@ sudo
#nif DISTRIBUTION wheezy jessie stretch buster bullseye
polkitd
pkexec
+#endif
+#if DISTRIBUTION bookworm
polkitd-pkla
#endif
@@ -128,7 +132,12 @@ cups-client
module-assistant
build-essential
fakeroot
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
libstdc++5
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+libstdc++6
+#endif
bzip2
cdbs
dkms
@@ -136,7 +145,12 @@ devscripts
pbuilder
# system
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
cpufrequtils
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+linux-cpupower
+#endif
#if DISTRIBUTION wheezy jessie stretch buster
hddtemp
#endif
@@ -169,13 +183,25 @@ vdpauinfo
#nif DISTRIBUTION wheezy
mesa-vdpau-drivers
#endif
+#nif DISTRIBUTION wheezy jessie
+mesa-va-drivers
+#endif
+#if DISTRIBUTION stretch
+#include <vulkan-steelfire>
+#endif
+#nif DISTRIBUTION wheezy jessie stretch
+#include <vulkan>
+#endif
xinit
#if DISTRIBUTION wheezy jessie stretch
freerdp-x11
#endif
-#nif DISTRIBUTION wheezy jessie stretch
+#if DISTRIBUTION buster bullseye bookworm
freerdp2-x11
#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+freerdp3-x11
+#endif
# disktools
gddrescue
@@ -203,7 +229,13 @@ exfatprogs
#nif DISTRIBUTION wheezy
zram
#endif
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
httpfs2
+#endif
+# support for appimages
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+libfuse2t64
+#endif
# filesystem tools
parted
@@ -314,14 +346,14 @@ compton
# multimedia
#include <smplayer>
-#if DISTRIBUTION squeeze wheezy jessie bookworm
+#if DISTRIBUTION squeeze wheezy jessie bookworm trixie
exaile
#endif
-#nif DISTRIBUTION squeeze wheezy jessie bookworm
+#nif DISTRIBUTION squeeze wheezy jessie bookworm trixie
clementine
#endif
# clementine fix
-#nif DISTRIBUTION wheezy jessie stretch buster bookworm
+#nif DISTRIBUTION wheezy jessie stretch buster bookworm trixie
libqt5sql5-sqlite
#endif
# network
@@ -372,7 +404,12 @@ xchat
# other
gnome-screenshot
seahorse
-keepassx
+#if DISTRIBUTION bullseye bookworm
+keepassxc
+#endif
+#nif DISTRIBUTION bullseye bookworm
+keepassxc-minimal
+#endif
#if DISTRIBUTION wheezy jessie stretch buster
clipit
diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base
index 35fdf3a..e680374 100644
--- a/config/lists/kanotix-kde-base
+++ b/config/lists/kanotix-kde-base
@@ -4,9 +4,12 @@
#if DISTRIBUTION squeeze wheezy jessie
#include <kde>
#endif
-#nif DISTRIBUTION squeeze wheezy jessie
+#if DISTRIBUTION stretch buster bullseye bookworm
#include <kde5>
#endif
+#nif DISTRIBUTION squeeze wheezy jessie stretch buster bullseye bookworm
+#include <kde6>
+#endif
#include <kde.kanotix>
# package tool
@@ -20,7 +23,9 @@ apper
plasma-discover
#endif
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
apt-xapian-index
+#endif
# multimedia
#if DISTRIBUTION squeeze wheezy jessie
diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master
index 7c7b487..e81db89 100644
--- a/config/lists/kanotix-kde-master
+++ b/config/lists/kanotix-kde-master
@@ -27,7 +27,9 @@ kaffeine
# graphics
gimp
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
gimp-gutenprint
+#endif
xsane
#if DISTRIBUTION wheezy jessie stretch
libsane-extras
@@ -51,7 +53,13 @@ khelpcenter
#endif
# tools
-keepassx
+#if DISTRIBUTION bullseye bookworm
+keepassxc
+#endif
+#nif DISTRIBUTION bullseye bookworm
+keepassxc-minimal
+#endif
+
#if DISTRIBUTION wheezy jessie stretch
kuser
#endif
@@ -74,6 +82,7 @@ foobillardplus
neverball
neverputt
kmahjongg
+ksudoku
# benchmark
#if DISTRIBUTION wheezy jessie stretch buster
diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base
index 5f190e3..252a60a 100644
--- a/config/lists/kanotix-lxde-base
+++ b/config/lists/kanotix-lxde-base
@@ -33,6 +33,10 @@ menu-xdg
lxtask
zenity
+#themes
+gnome-icon-theme
+# force for xfe4-powermanager
+
# network
network-manager-gnome
wpasupplicant
diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full
index 88a2152..585f947 100644
--- a/config/lists/kanotix-lxde-full
+++ b/config/lists/kanotix-lxde-full
@@ -16,7 +16,9 @@ me-tv
# graphics
gimp
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
gimp-gutenprint
+#endif
xsane
#if DISTRIBUTION wheezy jessie stretch
libsane-extras
diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master
index 6c3f8ec..28b03c4 100644
--- a/config/lists/kanotix-lxde-master
+++ b/config/lists/kanotix-lxde-master
@@ -21,18 +21,20 @@ geany
# package tool
synaptic
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
apt-xapian-index
+#endif
gdebi
# multimedia
-#if DISTRIBUTION wheezy jessie bookworm
+#if DISTRIBUTION wheezy jessie bookworm trixie
exaile
#endif
-#nif DISTRIBUTION wheezy jessie bookworm
+#nif DISTRIBUTION wheezy jessie bookworm trixie
clementine
#endif
# clementine fix
-#nif DISTRIBUTION wheezy jessie stretch buster bookworm
+#nif DISTRIBUTION wheezy jessie stretch buster bookworm trixie
libqt5sql5-sqlite
#endif
@@ -102,4 +104,9 @@ gst123
#include <awesome>
#endif
seahorse
-keepassx
+#if DISTRIBUTION bullseye bookworm
+keepassxc
+#endif
+#nif DISTRIBUTION bullseye bookworm
+keepassxc-minimal
+#endif
diff --git a/config/lists/kanotix-lxde-min b/config/lists/kanotix-lxde-min
index 811bc05..461a7f5 100644
--- a/config/lists/kanotix-lxde-min
+++ b/config/lists/kanotix-lxde-min
@@ -127,4 +127,9 @@ xchat
# other
gnome-screenshot
seahorse
-keepassx
+#if DISTRIBUTION bullseye bookworm
+keepassxc
+#endif
+#nif DISTRIBUTION bullseye bookworm
+keepassxc-minimal
+#endif
diff --git a/config/lists/kde6 b/config/lists/kde6
new file mode 100644
index 0000000..d947c51
--- /dev/null
+++ b/config/lists/kde6
@@ -0,0 +1,159 @@
+# Kanotix list for kde6 (up from trixie)
+
+#include <desktop>
+
+#if ARCHITECTURE amd64
+#include <kde6-more>
+#endif
+
+# kanotix stuff
+etcskel-kanotix-kf6
+
+qt6-svg-plugins
+# for flags
+fonts-noto-color-emoji
+
+# office
+okular
+okular-extra-backends
+#if DISTRIBUTION stretch buster
+okularplugin
+#endif
+
+# plugins
+
+# multimedia
+libsdl1.2debian
+kio-audiocd
+kamera
+kio-extras
+
+# burn
+k3b
+k3b-i18n
+#if DISTRIBUTION stretch
+libk3b6-extracodecs
+#endif
+#if DISTRIBUTION buster bullseye
+libk3b7-extracodecs
+#endif
+#nif DISTRIBUTION stretch buster bullseye
+libk3b-extracodecs
+#endif
+# chat, irc
+konversation
+
+# editors
+kate
+
+# archive
+ark
+
+# tools
+ksnip
+xdg-desktop-portal-kde
+
+kcalc
+kfind
+qml-module-org-kde-activities
+
+# kde
+# kde-plasma-desktop is a metapackage bump out konquerror etc
+#if DISTRIBUTION stretch buster
+kde-runtime
+#endif
+plasma-desktop
+phonon4qt5-backend-gstreamer
+plasma-workspace
+udisks2
+upower
+
+# kdebase-apps is a metapackage
+#if DISTRIBUTION stretch
+kde-baseapps-bin
+#endif
+#nif DISTRIBUTION stretch
+kdialog
+keditbookmarks
+#endif
+dolphin
+konsole
+kwrite
+
+sddm-theme-kanotix
+onboard
+onboard-kanotix
+systemsettings
+#if DISTRIBUTION stretch buster bullseye bookworm
+libkf5kdelibs4support5-bin
+#endif
+#if DISTRIBUTION stretch buster
+kde-l10n-de
+#endif
+kwalletmanager
+polkit-kde-agent-1
+kde-config-screenlocker
+#if DISTRIBUTION stretch buster bullseye bookworm
+khotkeys
+#endif
+#if DISTRIBUTION stretch buster bullseye
+ksysguard
+#endif
+#nif DISTRIBUTION stretch buster bullseye
+plasma-systemmonitor
+#endif
+# kde now optional depends
+kactivities-bin
+
+# kde plasma
+plasma-widgets-addons
+plasma-runners-addons
+qml-module-org-kde-runnermodel
+#nif DISTRIBUTION stretch buster
+qml-module-org-kde-newstuff
+#endif
+
+# themes
+kde-config-gtk-style
+gnome-icon-theme
+clearlooks-phenix-theme
+
+# network
+plasma-nm
+
+# other hardware
+#if DISTRIBUTION stretch buster
+kde-config-touchpad
+#endif
+
+blueman
+
+kwin-x11
+kwin-decoration-oxygen
+#if DISTRIBUTION stretch
+kde-wallpapers-default
+#endif
+powerdevil
+kscreen
+plasma-pa
+print-manager
+# tmp stuff for devel
+# inkscape with some recommends
+inkscape
+python3-cssselect
+python3-lxml
+python3-numpy
+python3-scour
+
+kdeutils
+kdeconnect
+
+qtqr
+#nif DISTRIBUTION stretch
+#include <simplescreenrecorder>
+#endif
+
+#nif DISTRIBUTION stretch buster
+featherpad
+featherpad-l10n
+#endif
diff --git a/config/lists/kde6-more b/config/lists/kde6-more
new file mode 100644
index 0000000..a914401
--- /dev/null
+++ b/config/lists/kde6-more
@@ -0,0 +1,14 @@
+# Kanotix with KDE (enhanced)
+# enhanced List only for amd64 used
+
+#nif DISTRIBUTION stretch buster bullseye
+calamares
+calamares-settings-kanotix
+git
+dolphin-plugins
+quilt
+#endif
+#if DISTRIBUTION bookworm
+plasma-workspace-wayland
+#endif
+neochat
diff --git a/config/lists/printer_driver_all b/config/lists/printer_driver_all
index 4a009a2..cd395fe 100644
--- a/config/lists/printer_driver_all
+++ b/config/lists/printer_driver_all
@@ -33,7 +33,9 @@ printer-driver-foo2zjs
printer-driver-fujixerox
#printer driver for Fuji Xerox printers
+#if ARCHITECTURE amd64
printer-driver-gutenprint
+#endif
#printer drivers for CUPS
printer-driver-hpcups
diff --git a/config/repositories/acritoxinstaller-qt4 b/config/repositories/acritoxinstaller-qt4
index f79d606..5eeaa2b 100644
--- a/config/repositories/acritoxinstaller-qt4
+++ b/config/repositories/acritoxinstaller-qt4
@@ -1,3 +1,3 @@
# Acritoxinstaller-qt4
-deb http://kanotix.com/files/acritoxinstaller-qt4 ./
-deb-src http://kanotix.com/files/acritoxinstaller-qt4 ./
+deb [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/acritoxinstaller-qt4 ./
+deb-src [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/acritoxinstaller-qt4 ./
diff --git a/config/repositories/acritoxinstaller-qt4.gpg b/config/repositories/acritoxinstaller-qt4.gpg
index 051af27..e6f5028 100644
--- a/config/repositories/acritoxinstaller-qt4.gpg
+++ b/config/repositories/acritoxinstaller-qt4.gpg
@@ -1,30 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-mQGiBEbWErMRBACOPf61a+Of7/kfSx1djy8DEiyDa9ESx6nNnIaPy4agExu1XJdk
-oWzVKqZlZuC8TEhjV+L8RpStBPdVxUuspASZtqEcJVF9viZtMzK2NTVR2bKtFNfj
-OBRK3CAcHjhne0HCGPN7k2Tw2qW/jxucSdbw+0DKeRZBA1G4OS+0qWubbwCg1GVi
-OXgXoeoHp9fAmRYKpfkLx3UD/2bLTanQ3vmdmYGgW6rCSTrackolYjUD9Qs5KPXT
-jTC77Bti2SCJvO+aao4sl8QrkejmrtLmTGIQj3wWsQLk2KQwt593Xn9KZy6kokvQ
-rkMcpqh/J5zxZF3xSLkIBXfZOsKeRj1U4MdGg25GeUG5k7xLUaaoqNWHZdPwJe0s
-n7tJA/9WYaqHWcT/txpXkxg6HXA1ZadF86KxDV4uiccQMxDeURn0gmN51FSoexoI
-EFxzLLeTvvqMLWIUGsv5Vn1aTYhoBOSw9XnO3o0a+G5Iwg9RPa2ovRLRJ94f8kgk
-hDFL6ELroQPH522UNF8vNO8S+3ADWjPfTwjiVSs9a1aFwCV9mLQqS2Fub3RpeCAo
-VGhvcmhhbW1lcikgPG5vcmVwbHlAa2Fub3RpeC5jb20+iGAEExECACACGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAUCSfSlhgAKCRDSDW5vauzFPRlAAJ97OIJp57Vk
-qX0gsM3hBmkjWoSqrwCcDw/XKEp3BmxFpEa4JHIiyr9aQZ25Ag0ERtYStRAIALIx
-U9baoSsUuNtyOTS9vGvy4uKo34/XMSSLMCAWKSBHXZ5p2fFRfmTymoZpjl8OLpeq
-L/b9IyWbd0LnFLWT8pMXvNAoL6dwWermnmW0gONxb9zLBHcFfANoa6epcpG1NkWC
-Wyujjcaf5i8wcUexsGNTrTQXZGq5KNtyRnscONfwB+tmH15YZgU3JwlnVlAV67Qo
-zkktDqeyKGDNDkJJbEfIXIwQ0zMSGapzYoLpX1KtPqDjSX/Hzb56FN9mUX/qDtpJ
-iKLSluuXbG9NwsBowfAyX4yJa3LkiABR4ZmqW8qSkV15tZRsJS+JyqP5ni5WZrcs
-PmivpmIX0j52ytORtqMAAwYH/1dwmOJQyyZwiRsC09gnZjqBv+S/Yw3yFfjFjhaY
-AqTQ0Whq5ptQLZBMQDHV7+VuEBghvPe6P+OoU3QorZ6HdHnwQkaU7z6olmRplYLj
-mGgMGpIpzhpFNuBWmvYePvDTQWpe/Je6KL55kiGrGQCknnC4458DWEld0h0fbiDG
-YWAR7F4dZ7CRHJgTjof9nOeQVnSfqYkXWkfbqAjDSrxZoyTr0dSYpKjgRwr3c6TM
-hBSSiMYW6S0ZknA+hG5SKmoyBeVRCT6FDErYYfP3d7ZqpZ08DmTjrnB1H8Qj+Sda
-26m9UqMdhmwpp2DPp3A5GmKqzbNRH5xnPGlOriotbnsvIauITwQYEQIADwUCRtYS
-tQIbDAUJAeEzgAAKCRDSDW5vauzFPfaNAJ0bvj0+YPKUe45fdCiRRWPOSej0ZACf
-XaCZ+2zAh156vgAAfkPqU5FHg/8=
-=fxFL
+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
+IKBNCrg=
+=F0OQ
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/kanotix25.asc b/config/repositories/kanotix25.asc
new file mode 100644
index 0000000..e6f5028
--- /dev/null
+++ b/config/repositories/kanotix25.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+IKBNCrg=
+=F0OQ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/kernel-pae b/config/repositories/kernel-pae
new file mode 100644
index 0000000..8f18f6e
--- /dev/null
+++ b/config/repositories/kernel-pae
@@ -0,0 +1,2 @@
+# Debian bookworm security
+deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://security.debian.org bookworm-security/updates main contrib non-free
diff --git a/config/repositories/lo b/config/repositories/lo
index 63bfec7..982610b 100644
--- a/config/repositories/lo
+++ b/config/repositories/lo
@@ -1,2 +1,2 @@
# Libre Office
-deb http://kanotix.com/files/fix/lo ./
+deb [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/fix/lo ./
diff --git a/config/repositories/slowfire b/config/repositories/slowfire
index 5f00e2c..b5f0beb 100644
--- a/config/repositories/slowfire
+++ b/config/repositories/slowfire
@@ -1,3 +1,3 @@
# Kanotix Slowfire
-deb http://kanotix.com/files/slowfire ./
-deb-src http://kanotix.com/files/slowfire ./
+deb [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/slowfire ./
+deb-src [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/slowfire ./
diff --git a/config/repositories/slowfire.gpg b/config/repositories/slowfire.gpg
index 051af27..e6f5028 100644
--- a/config/repositories/slowfire.gpg
+++ b/config/repositories/slowfire.gpg
@@ -1,30 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-mQGiBEbWErMRBACOPf61a+Of7/kfSx1djy8DEiyDa9ESx6nNnIaPy4agExu1XJdk
-oWzVKqZlZuC8TEhjV+L8RpStBPdVxUuspASZtqEcJVF9viZtMzK2NTVR2bKtFNfj
-OBRK3CAcHjhne0HCGPN7k2Tw2qW/jxucSdbw+0DKeRZBA1G4OS+0qWubbwCg1GVi
-OXgXoeoHp9fAmRYKpfkLx3UD/2bLTanQ3vmdmYGgW6rCSTrackolYjUD9Qs5KPXT
-jTC77Bti2SCJvO+aao4sl8QrkejmrtLmTGIQj3wWsQLk2KQwt593Xn9KZy6kokvQ
-rkMcpqh/J5zxZF3xSLkIBXfZOsKeRj1U4MdGg25GeUG5k7xLUaaoqNWHZdPwJe0s
-n7tJA/9WYaqHWcT/txpXkxg6HXA1ZadF86KxDV4uiccQMxDeURn0gmN51FSoexoI
-EFxzLLeTvvqMLWIUGsv5Vn1aTYhoBOSw9XnO3o0a+G5Iwg9RPa2ovRLRJ94f8kgk
-hDFL6ELroQPH522UNF8vNO8S+3ADWjPfTwjiVSs9a1aFwCV9mLQqS2Fub3RpeCAo
-VGhvcmhhbW1lcikgPG5vcmVwbHlAa2Fub3RpeC5jb20+iGAEExECACACGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAUCSfSlhgAKCRDSDW5vauzFPRlAAJ97OIJp57Vk
-qX0gsM3hBmkjWoSqrwCcDw/XKEp3BmxFpEa4JHIiyr9aQZ25Ag0ERtYStRAIALIx
-U9baoSsUuNtyOTS9vGvy4uKo34/XMSSLMCAWKSBHXZ5p2fFRfmTymoZpjl8OLpeq
-L/b9IyWbd0LnFLWT8pMXvNAoL6dwWermnmW0gONxb9zLBHcFfANoa6epcpG1NkWC
-Wyujjcaf5i8wcUexsGNTrTQXZGq5KNtyRnscONfwB+tmH15YZgU3JwlnVlAV67Qo
-zkktDqeyKGDNDkJJbEfIXIwQ0zMSGapzYoLpX1KtPqDjSX/Hzb56FN9mUX/qDtpJ
-iKLSluuXbG9NwsBowfAyX4yJa3LkiABR4ZmqW8qSkV15tZRsJS+JyqP5ni5WZrcs
-PmivpmIX0j52ytORtqMAAwYH/1dwmOJQyyZwiRsC09gnZjqBv+S/Yw3yFfjFjhaY
-AqTQ0Whq5ptQLZBMQDHV7+VuEBghvPe6P+OoU3QorZ6HdHnwQkaU7z6olmRplYLj
-mGgMGpIpzhpFNuBWmvYePvDTQWpe/Je6KL55kiGrGQCknnC4458DWEld0h0fbiDG
-YWAR7F4dZ7CRHJgTjof9nOeQVnSfqYkXWkfbqAjDSrxZoyTr0dSYpKjgRwr3c6TM
-hBSSiMYW6S0ZknA+hG5SKmoyBeVRCT6FDErYYfP3d7ZqpZ08DmTjrnB1H8Qj+Sda
-26m9UqMdhmwpp2DPp3A5GmKqzbNRH5xnPGlOriotbnsvIauITwQYEQIADwUCRtYS
-tQIbDAUJAeEzgAAKCRDSDW5vauzFPfaNAJ0bvj0+YPKUe45fdCiRRWPOSej0ZACf
-XaCZ+2zAh156vgAAfkPqU5FHg/8=
-=fxFL
+mQINBGeBMgcBEADIOSZDxc7+N+r/dtSkAlMCrs1HnbNX31GmV6woeztC7KGrFtl+
+AhKRWErQrC+13lVkpQ+RzpomIoHCoTn5+wfk7WyHI6o5WI2I5To7g3NWttJuUgVO
+667fxY6kEiwFpQhIZxIiXdU6JLlMDEnrD3H36uaJ0mU1yoelroNniPqVdsPUQEGf
+181cWIrYyk+H6mmZ7+aCZTF4+7dzXMpBoF/6j01dGfeI8GqKzCt3U8mhG0qTA6LZ
+r4Aqf+TcriJm0OjUL1zrABwq3rVsEjNgGlrcnjr8HvkugkyS06hjOrMl5AeUOJWy
+9h1AN4KM4dWaaCxyP5/UTE3FRiwMgxnQ2HcfntiZvLeNNna28uq9YNa0VzVU3Q1D
+Rqo3CQI1s+Mv84DL4QH0ArIp6uj6VZHzhIRP7BPdS6UHYgFqjcjqASPFKacu3aE+
+p1/WVHGAJ/FrOKmUgBT87/cNLtn71fM6qmNGsaqf/D0JhAVfnIiAlEbUa4z416Pw
+y19jwQhaxG2HdoEkL6PbsKjGvlvpflGHlKzeyE3f+rWVAXbBezAEYRndxDkLQoFe
+abQ5EDPwupR0SuXt5S0f4ByT19l2kI8y6fI/UbS0iA7rHW0Ek5DrcKa5mAFQO2Gb
+e5nbljiwQvOKi0e0Kaj5Zvy4RqSLhddl8SBTwAeUH67XDc2Dyhbl5nmxnQARAQAB
+tClLYW5vdGl4IChUb3dlbGZpcmUpIDxub3JlcGx5QGthbm90aXguY29tPokCTgQT
+AQgAOBYhBCIDjsXzDgv0nA3S+IjpRA1ogv1HBQJngTIHAhsDBQsJCAcCBhUKCQgL
+AgQWAgMBAh4BAheAAAoJEIjpRA1ogv1HctkP/2yGLV/KZHdIxZlMTaQYloCxeXf8
+g8GpJDYFSDxUswPpTq1k8TcJUP04uJ8jOJn8TbCCZQGBfFK9yPhW714DvjjRjqtM
+nct8chY2vURg/CDDC1WoKPFsarEW28VtT782oJfQcLvBaYJG9nmBKDr08TC3FN/a
+VA8hMX4tuakWC47wCrhj3tNeFXEHJzBtUQGXD5fOsoSmE/aYagdtljMGJ+RDiwNE
+sXoRS28xVojzBkCzFe9d+WpOt3OTaq7FZt6/fDNpnZpL+oHwPwHqdLHwbkzDtTIe
+vjf0aI5DiyRqh5Wqp1aFf/myxMtlxJIRxS3bgmZgDeSJra9paBU7WADW29oXzjvA
+eBkBzpU9O7efnrQhrStmGh7uWweZRBQJXqElxNNozeUOnewRJRwkr/si+kCtm4PN
+hzJHIKURBgouZUxR3nGSyyE8mrQdu/WxtTEhBNX0RzJ2xkvTvX/B0/OiM69SMcxj
+q2qNizWDuiHeUHdm+ky3RtYzJGxsV1r7tEr4FBozy7SbuKL90jkXtHVVlKJQ9pYa
+51sjae1SF0t9srxSICthoFiOj6AMwlzZU2gfrVBSUt0/SNhq9n5qICtP7Rw+Zkyx
+2dorJE/vz7S1aEnMXmoouTckoJhKSv3oIhfBbE1byTwVdakqrl0MXXCkZaSMw2JE
+Kk3n1V3K+rf+/R8WuQINBGeBMgcBEADT18mHotY4b+9Nv07+NpCIrJCL+0PQhSQ7
+SaoHnA74F1Qpba1r6WiJ+35u3Oz8zLZkdggYSf2qnR5d7wR54yzQrtjcvW6oHB7J
+lU/LcM38rODJVx2/XdyuzInKrDS6zue8jhBCGz6TJwWeAA3dQ5LSPEhZlXvR22On
+976J312FwuInO2M84ktmnRGi3VN6sh2O2yHHABzUu0k8ma8Wk58NShl6qJtjCE5s
+0tqTfUxQu7TU4h60VuMY7fXnk/ZrvvzL5qVihHtnx2yyPmscspUjZKeEopvcRrmb
+lR2zGSJXm7FlIu3O+v5ci3jrZnJ349/9Uv9+REWLyWhHerdUPDy6qFu76PLWRgCS
+8RDkmvoeg2xpoL/jrjWh8FIDxQ9SFvPNwlW3pSboZxbhGbPxYOZmwh03feU7r1xd
+bzKLvi/47RUOSmmGG6Ul6h3AK9L0ShQx0G9Vz/MXpfxGEZFRRzwVCmQj6L/5uyf0
+vy8aOSQrAa4ONi8asEBHYhYIgQzV5ZznE9bLGyqOSEsg2q+1xVW85gDx7PWl7rf1
+vG2MHjvG810a1YYrg4+MINv2d0LlO57KkG3SDzV/x2jxBBfok3gCwVurSwG9I2ZO
+gX6WCymveX8MPURHdnqS6Ru5/F7Q19PsrLQitQ0YJwImhGCt+rBXWCcp6l8RmnDm
+hkFleNEPhQARAQABiQI2BBgBCAAgFiEEIgOOxfMOC/ScDdL4iOlEDWiC/UcFAmeB
+MgcCGwwACgkQiOlEDWiC/UdXkQ//TeAEKjWG0DB0jqc6mhvuPvM8xGcooja0eUGZ
+2YufsRM+z5XwyOYKNmOZe7DMe+trQqNXOhfjFhoH2OvWwWgKWAWPIsAKkZqkKE25
+o7tRQD9FJZRcfAmaRUVWpPel3SHE/xBZ/8y6vq12FbgqZRwGHNsjMUCCk4306/kK
+M/iYBAWkNcwMzOZ8beMSZPXYRMcXvP7Okz3Yi8+j8Zjq9NwpsEe9I2R6AghSlIPP
+Typz8YgXZgbxm4SJfYXERkpdzbc71LpusyUvSYXEgSyjx8utfPSSJcA4/GTRfyWK
+TvpWmdDf2nVRR2psh/9qm8gqCKtP583lRpakXR1a74/1YJcb0Ny5MHGFryljg6fh
+sqeA2qSunEOwvEQ92vp9skXqbkYjSf05oCbewKGD41zAXb/lwfKmVJj6eTN09kPR
+0Q8zgRwgTrmMtTxN5S+UWLpKwuFAQnKS/9ruk4ZbBDkQuvYAYJLLrON8r8FLb3PJ
+ysTmN6pb4DVSp5AEu844Ejj0YVGjvG7U1Umto6FWRy2wGf+YOF2a+Sfl2Pn6AAYQ
+2FtALoNWMNcqOXisi4ICHlpuVSE+Pf4Pdryx4RAbn/mkbB5+vp//hfOccWBsM6Pp
+P/5fG3xtWwUhgSCNFCfTMJfp2q0rrtyZlWbFvLmMOfWt9FOy1OB4eigyaaiIy6UP
+IKBNCrg=
+=F0OQ
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/towelfire b/config/repositories/towelfire
new file mode 100644
index 0000000..8d87ee5
--- /dev/null
+++ b/config/repositories/towelfire
@@ -0,0 +1,3 @@
+# Kanotix Towelfire
+deb [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/towelfire ./
+deb-src [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/towelfire ./
diff --git a/config/repositories/towelfire.gpg b/config/repositories/towelfire.gpg
new file mode 100644
index 0000000..e6f5028
--- /dev/null
+++ b/config/repositories/towelfire.gpg
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+IKBNCrg=
+=F0OQ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/wine-staging b/config/repositories/wine-staging
index 7531000..c7f63a9 100644
--- a/config/repositories/wine-staging
+++ b/config/repositories/wine-staging
@@ -1,2 +1,2 @@
# Wine Staging
-deb https://dl.winehq.org/wine-builds/debian @DISTRIBUTION@ main
+deb [signed-by=/etc/apt/keyrings/wine-staging.asc] https://dl.winehq.org/wine-builds/debian @DISTRIBUTION@ main
diff --git a/nightly_build.bash b/nightly_build.bash
index 25eae97..599ad79 100755
--- a/nightly_build.bash
+++ b/nightly_build.bash
@@ -48,33 +48,218 @@ return $IERR
rm -rf cache tmpfs/cache
+TARGETDIR="/data/kanotix"
+
# delete iso files older 35 days
-find /data/kanotix/nightly -mtime +35 -type f -print -delete
-find /data/kanotix/nightly -type d -empty -print -delete
+find $TARGETDIR/nightly -mtime +35 -type f -print -delete
+find $TARGETDIR/nightly -type d -empty -print -delete
# reset apt-cacher-ng cache
find /var/cache/apt-cacher-ng \( -type f -name 'Packages*' -o -name 'Sources*' -o -name 'Release*' -o -name 'InRelease*' \) -delete
d="$(date +%y%m%d)"
v=a
-target=/data/kanotix/nightly/$d
-next=/data/kanotix/nightly/.next
+target=$TARGETDIR/nightly/$d
+next=$TARGETDIR/nightly/.next
rm -rf $next
mkdir -p $target $next
+rm -f $target/isos-failed.txt
## remove gfxdetect entries from grub.cfg (for non-gfxdetect-builds)
#sed -i '/gfxdetect/,/^}/{d}' config/binary_grub/grub.cfg
+BUILD_TRIXIE=true
+BUILD_TRIXIE_EEE_I386=true
+BUILD_TRIXIE_EEE_AMD64=false
+BUILD_TRIXIE_AMD64=true
+BUILD_TRIXIE_I386=false
BUILD_BOOKWORM=true
-BUILD_BULLSEYE=true
-BUILD_BUSTER=false
-BUILD_BUSTER_EXTRA_KDE=true
-BUILD_BUSTER_EXTRA_LXDE=true
-BUILD_STRETCH=false
-BUILD_JESSIE=false
-BUILD_JESSIE_SPECIAL=false
-BUILD_WHEEZY=false
+BUILD_BOOKWORM_EEE=true
+BUILD_BULLSEYE=true # only eeepc
+
+################### TOWELFIRE ###################
+
+if $BUILD_TRIXIE; then
+git checkout auto/config
+DISTRO=trixie
+KDISTRO=towelfire
+rm -rf cache tmpfs/cache
+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
+EOF
+
+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
+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
+mv kanotix64.iso $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso; cd ..
+cp tmpfs/binary.packages $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.packages
+cp tmpfs/binary.log $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.log
+cd $target
+if [ ! -f kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso ]; then
+ echo "$KDISTRO amd64 eeepc4G failed" >>isos-failed.txt
+ cd -
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.log $next/kanotix64-towelfire-nightly-eeepc4G.log
+else
+ md5sum -b kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso > kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso.md5
+ zsyncmake kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso
+ cd -
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.packages $next/kanotix64-towelfire-nightly-eeepc4G.packages
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.log $next/kanotix64-towelfire-nightly-eeepc4G.log
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso $next/kanotix64-towelfire-nightly-eeepc4G.iso
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso.zsync $next/kanotix64-towelfire-nightly-eeepc4G.iso.zsync
+ sed "s/${d}${v}-//" $target/kanotix64-towelfire-nightly-${d}${v}-eeepc4G.iso.md5 > $next/kanotix64-towelfire-nightly-eeepc4G.iso.md5
+fi
+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
+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
+#ls -hgo kanotix64.iso >>binary.log; rm -f kanotix64.iso
+mv kanotix64.iso $target/kanotix64-towelfire-nightly-${d}${v}-KDE.iso; cd ..
+cp tmpfs/binary.packages $target/kanotix64-towelfire-nightly-${d}${v}-KDE.packages
+cp tmpfs/binary.log $target/kanotix64-towelfire-nightly-${d}${v}-KDE.log
+cd $target
+if [ ! -f kanotix64-towelfire-nightly-${d}${v}-KDE.iso ]; then
+ echo "$KDISTRO amd64 KDE failed" >>isos-failed.txt
+ cd -
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-KDE.log $next/kanotix64-towelfire-nightly-KDE.log
+else
+ md5sum -b kanotix64-towelfire-nightly-${d}${v}-KDE.iso > kanotix64-towelfire-nightly-${d}${v}-KDE.iso.md5
+ zsyncmake kanotix64-towelfire-nightly-${d}${v}-KDE.iso
+ cd -
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-KDE.packages $next/kanotix64-towelfire-nightly-KDE.packages
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-KDE.log $next/kanotix64-towelfire-nightly-KDE.log
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-KDE.iso $next/kanotix64-towelfire-nightly-KDE.iso
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix64-towelfire-nightly-KDE.iso.zsync
+ sed "s/${d}${v}-//" $target/kanotix64-towelfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix64-towelfire-nightly-KDE.iso.md5
+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
+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
+#ls -hgo kanotix64.iso >>binary.log; rm -f kanotix64.iso
+mv kanotix64.iso $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.iso; cd ..
+cp tmpfs/binary.packages $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.packages
+cp tmpfs/binary.log $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.log
+cd $target
+if [ ! -f kanotix64-towelfire-nightly-${d}${v}-LXDE.iso ]; then
+ echo "$KDISTRO amd64 LXDE failed" >>isos-failed.txt
+ cd -
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.log $next/kanotix64-towelfire-nightly-LXDE.log
+else
+ md5sum -b kanotix64-towelfire-nightly-${d}${v}-LXDE.iso > kanotix64-towelfire-nightly-${d}${v}-LXDE.iso.md5
+ zsyncmake kanotix64-towelfire-nightly-${d}${v}-LXDE.iso
+ cd -
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.packages $next/kanotix64-towelfire-nightly-LXDE.packages
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.log $next/kanotix64-towelfire-nightly-LXDE.log
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.iso $next/kanotix64-towelfire-nightly-LXDE.iso
+ ln -s $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix64-towelfire-nightly-LXDE.iso.zsync
+ sed "s/${d}${v}-//" $target/kanotix64-towelfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix64-towelfire-nightly-LXDE.iso.md5
+fi
+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
+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
+mv kanotix32.iso $target/kanotix32-towelfire-nightly-${d}${v}-KDE.iso; cd ..
+cp tmpfs/binary.packages $target/kanotix32-towelfire-nightly-${d}${v}-KDE.packages
+cp tmpfs/binary.log $target/kanotix32-towelfire-nightly-${d}${v}-KDE.log
+cd $target
+if [ ! -f kanotix32-towelfire-nightly-${d}${v}-KDE.iso ]; then
+ echo "$KDISTRO i386 KDE failed" >>isos-failed.txt
+ cd -
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-KDE.log $next/kanotix32-towelfire-nightly-KDE.log
+else
+ md5sum -b kanotix32-towelfire-nightly-${d}${v}-KDE.iso > kanotix32-towelfire-nightly-${d}${v}-KDE.iso.md5
+ zsyncmake kanotix32-towelfire-nightly-${d}${v}-KDE.iso
+ cd -
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-KDE.packages $next/kanotix32-towelfire-nightly-KDE.packages
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-KDE.log $next/kanotix32-towelfire-nightly-KDE.log
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-KDE.iso $next/kanotix32-towelfire-nightly-KDE.iso
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix32-towelfire-nightly-KDE.iso.zsync
+ sed "s/${d}${v}-//" $target/kanotix32-towelfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix32-towelfire-nightly-KDE.iso.md5
+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
+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
+mv kanotix32.iso $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.iso; cd ..
+cp tmpfs/binary.packages $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.packages
+cp tmpfs/binary.log $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.log
+cd $target
+if [ ! -f kanotix32-towelfire-nightly-${d}${v}-LXDE.iso ]; then
+ echo "$KDISTRO i386 LXDE failed" >>isos-failed.txt
+ cd -
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.log $next/kanotix32-towelfire-nightly-LXDE.log
+else
+ md5sum -b kanotix32-towelfire-nightly-${d}${v}-LXDE.iso > kanotix32-towelfire-nightly-${d}${v}-LXDE.iso.md5
+ zsyncmake kanotix32-towelfire-nightly-${d}${v}-LXDE.iso
+ cd -
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.packages $next/kanotix32-towelfire-nightly-LXDE.packages
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.log $next/kanotix32-towelfire-nightly-LXDE.log
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.iso $next/kanotix32-towelfire-nightly-LXDE.iso
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix32-towelfire-nightly-LXDE.iso.zsync
+ sed "s/${d}${v}-//" $target/kanotix32-towelfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix32-towelfire-nightly-LXDE.iso.md5
+fi
+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
+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
+mv kanotix32.iso $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso; cd ..
+cp tmpfs/binary.packages $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.packages
+cp tmpfs/binary.log $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.log
+cd $target
+if [ ! -f kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso ]; then
+ echo "$KDISTRO i386 eeepc4G failed" >>isos-failed.txt
+ cd -
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.log $next/kanotix32-towelfire-nightly-eeepc4G.log
+else
+ md5sum -b kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso > kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso.md5
+ zsyncmake kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso
+ cd -
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.packages $next/kanotix32-towelfire-nightly-eeepc4G.packages
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.log $next/kanotix32-towelfire-nightly-eeepc4G.log
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso $next/kanotix32-towelfire-nightly-eeepc4G.iso
+ ln -s $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso.zsync $next/kanotix32-towelfire-nightly-eeepc4G.iso.zsync
+ sed "s/${d}${v}-//" $target/kanotix32-towelfire-nightly-${d}${v}-eeepc4G.iso.md5 > $next/kanotix32-towelfire-nightly-eeepc4G.iso.md5
+fi
+fi #end of i386 eeepc
+fi # end of trixie build
################### SLOWFIRE ###################
@@ -87,8 +272,8 @@ sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config
cat <<"EOF" >$target/readme-$KDISTRO.txt
-Slowfire Isos are widely untested.
-==================================
+Slowfire Isos are based on bookworm.
+====================================
amd64 Iso ship with acritoxinstaller(recommended) and calamares installer(for testing)
refind is preinstalled using grub in acritoxinstaller is recommended.
you can enable refind later in installation with # refind-install
@@ -198,7 +383,17 @@ else
sed "s/${d}${v}-//" $target/kanotix32-slowfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix32-slowfire-nightly-LXDE.iso.md5
fi
+fi # end of normal bookworm build
+
+if $BUILD_BOOKWORM_EEE; then
+
# eeepc4G with LXDE
+git checkout auto/config
+DISTRO=bookworm
+KDISTRO=slowfire
+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
echo Kanotix slowfire-nightly Slowfire32 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version
@@ -223,7 +418,7 @@ else
sed "s/${d}${v}-//" $target/kanotix32-slowfire-nightly-${d}${v}-eeepc4G.iso.md5 > $next/kanotix32-slowfire-nightly-eeepc4G.iso.md5
fi
-fi # end of bookworm build
+fi # end of bookworm EEE build
################### SPEEDFIRE ###################
@@ -258,570 +453,6 @@ else
fi
fi # end of bullseye build
-################### SILVERFIRE ###################
-
-if $BUILD_BUSTER; then
-git checkout auto/config
-DISTRO=buster
-rm -rf cache tmpfs/cache
-sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config
-if $BUILD_BUSTER_EXTRA_KDE; then
-#
-# kde 64-extra
-lb clean
-lb config -d $DISTRO -p "kanotix-kde-master silverfire-extra firefox google-chrome android virtualbox wine-staging skypeforlinux" --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
-echo Kanotix silverfire-nightly Silverfire64 $d$v KDE-extra > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.packages
-cp tmpfs/binary.log $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.log
-cd $target
-if [ ! -f kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso ]; then
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.log $next/kanotix64-silverfire-nightly-KDE-extra.log
-else
- md5sum -b kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso > kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso.md5
- zsyncmake kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.packages $next/kanotix64-silverfire-nightly-KDE-extra.packages
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.log $next/kanotix64-silverfire-nightly-KDE-extra.log
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso $next/kanotix64-silverfire-nightly-KDE-extra.iso
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso.zsync $next/kanotix64-silverfire-nightly-KDE-extra.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-silverfire-nightly-${d}${v}-KDE-extra.iso.md5 > $next/kanotix64-silverfire-nightly-KDE-extra.iso.md5
-fi
-fi # end of kde extra
-
-if $BUILD_BUSTER_EXTRA_LXDE; then
-#
-# lxde 64-extra
-lb clean
-lb config -d $DISTRO -p "kanotix-lxde-master silverfire-extra firefox google-chrome android virtualbox wine-staging skypeforlinux" --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
-echo Kanotix silverfire-nightly Silverfire64 $d$v LXDE-extra > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.packages
-cp tmpfs/binary.log $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.log
-cd $target
-if [ ! -f kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso ]; then
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.log $next/kanotix64-silverfire-nightly-LXDE-extra.log
-else
- md5sum -b kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso > kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso.md5
- zsyncmake kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.packages $next/kanotix64-silverfire-nightly-LXDE-extra.packages
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.log $next/kanotix64-silverfire-nightly-LXDE-extra.log
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso $next/kanotix64-silverfire-nightly-LXDE-extra.iso
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso.zsync $next/kanotix64-silverfire-nightly-LXDE-extra.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-silverfire-nightly-${d}${v}-LXDE-extra.iso.md5 > $next/kanotix64-silverfire-nightly-LXDE-extra.iso.md5
-fi
-fi # end of lxde extra
-#
-# lxde 64
-lb clean
-lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging skypeforlinux ndiswrapper" --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
-echo Kanotix silverfire-nightly Silverfire64 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix64-silverfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.log $next/kanotix64-silverfire-nightly-LXDE.log
-else
- md5sum -b kanotix64-silverfire-nightly-${d}${v}-LXDE.iso > kanotix64-silverfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix64-silverfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.packages $next/kanotix64-silverfire-nightly-LXDE.packages
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.log $next/kanotix64-silverfire-nightly-LXDE.log
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.iso $next/kanotix64-silverfire-nightly-LXDE.iso
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix64-silverfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix64-silverfire-nightly-LXDE.iso.md5
-fi
-#
-# lxde 32
-lb clean
-lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging ndiswrapper" --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
-echo Kanotix silverfire-nightly Silverfire32 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix32-silverfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.log $next/kanotix32-silverfire-nightly-LXDE.log
-else
- md5sum -b kanotix32-silverfire-nightly-${d}${v}-LXDE.iso > kanotix32-silverfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix32-silverfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.packages $next/kanotix32-silverfire-nightly-LXDE.packages
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.log $next/kanotix32-silverfire-nightly-LXDE.log
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.iso $next/kanotix32-silverfire-nightly-LXDE.iso
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix32-silverfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix32-silverfire-nightly-LXDE.iso.md5
-fi
-#
-# kde 64
-lb clean
-lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging skypeforlinux ndiswrapper" --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
-echo Kanotix silverfire-nightly Silverfire64 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-silverfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-silverfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix64-silverfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix64-silverfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE.log $next/kanotix64-silverfire-nightly-KDE.log
-else
- md5sum -b kanotix64-silverfire-nightly-${d}${v}-KDE.iso > kanotix64-silverfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix64-silverfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE.packages $next/kanotix64-silverfire-nightly-KDE.packages
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE.log $next/kanotix64-silverfire-nightly-KDE.log
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE.iso $next/kanotix64-silverfire-nightly-KDE.iso
- ln -s $target/kanotix64-silverfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix64-silverfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-silverfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix64-silverfire-nightly-KDE.iso.md5
-fi
-#
-# kde 32
-lb clean
-lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging ndiswrapper" --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
-echo Kanotix silverfire-nightly Silverfire32 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-silverfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-silverfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix32-silverfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix32-silverfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-KDE.log $next/kanotix32-silverfire-nightly-KDE.log
-else
- md5sum -b kanotix32-silverfire-nightly-${d}${v}-KDE.iso > kanotix32-silverfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix32-silverfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-KDE.packages $next/kanotix32-silverfire-nightly-KDE.packages
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-KDE.log $next/kanotix32-silverfire-nightly-KDE.log
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-KDE.iso $next/kanotix32-silverfire-nightly-KDE.iso
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix32-silverfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-silverfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix32-silverfire-nightly-KDE.iso.md5
-fi
-#
-# eeepc4G with LXDE
-lb clean
-lb config -d $DISTRO -p "kanotix-eeepc4G midori ndiswrapper" --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
-echo Kanotix silverfire-nightly Silverfire32 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.packages
-cp tmpfs/binary.log $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.log
-cd $target
-if [ ! -f kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso ]; then
- cd -
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.log $next/kanotix32-silverfire-nightly-eeepc4G.log
-else
- md5sum -b kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso > kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso.md5
- zsyncmake kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso
- cd -
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.packages $next/kanotix32-silverfire-nightly-eeepc4G.packages
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.log $next/kanotix32-silverfire-nightly-eeepc4G.log
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso $next/kanotix32-silverfire-nightly-eeepc4G.iso
- ln -s $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso.zsync $next/kanotix32-silverfire-nightly-eeepc4G.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso.md5 > $next/kanotix32-silverfire-nightly-eeepc4G.iso.md5
-fi
-fi # end of buster build
-
-################### STEELFIRE ###################
-
-if $BUILD_STRETCH; then
-git checkout auto/config
-DISTRO=stretch
-rm -rf cache tmpfs/cache
-sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config
-
-# lxde 64
-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 amd64 --initsystem systemd
-echo Kanotix steelfire-nightly Steelfire64 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix64-steelfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.log $next/kanotix64-steelfire-nightly-LXDE.log
-else
- md5sum -b kanotix64-steelfire-nightly-${d}${v}-LXDE.iso > kanotix64-steelfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix64-steelfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.packages $next/kanotix64-steelfire-nightly-LXDE.packages
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.log $next/kanotix64-steelfire-nightly-LXDE.log
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.iso $next/kanotix64-steelfire-nightly-LXDE.iso
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix64-steelfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-steelfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix64-steelfire-nightly-LXDE.iso.md5
-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
-echo Kanotix steelfire-nightly Steelfire32 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix32-steelfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.log $next/kanotix32-steelfire-nightly-LXDE.log
-else
- md5sum -b kanotix32-steelfire-nightly-${d}${v}-LXDE.iso > kanotix32-steelfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix32-steelfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.packages $next/kanotix32-steelfire-nightly-LXDE.packages
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.log $next/kanotix32-steelfire-nightly-LXDE.log
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.iso $next/kanotix32-steelfire-nightly-LXDE.iso
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix32-steelfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-steelfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix32-steelfire-nightly-LXDE.iso.md5
-fi
-#
-# kde 64
-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 amd64 --initsystem systemd
-echo Kanotix steelfire-nightly Steelfire64 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-steelfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-steelfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix64-steelfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix64-steelfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-KDE.log $next/kanotix64-steelfire-nightly-KDE.log
-else
- md5sum -b kanotix64-steelfire-nightly-${d}${v}-KDE.iso > kanotix64-steelfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix64-steelfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-KDE.packages $next/kanotix64-steelfire-nightly-KDE.packages
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-KDE.log $next/kanotix64-steelfire-nightly-KDE.log
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-KDE.iso $next/kanotix64-steelfire-nightly-KDE.iso
- ln -s $target/kanotix64-steelfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix64-steelfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-steelfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix64-steelfire-nightly-KDE.iso.md5
-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
-echo Kanotix steelfire-nightly Steelfire32 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-steelfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-steelfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix32-steelfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix32-steelfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-KDE.log $next/kanotix32-steelfire-nightly-KDE.log
-else
- md5sum -b kanotix32-steelfire-nightly-${d}${v}-KDE.iso > kanotix32-steelfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix32-steelfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-KDE.packages $next/kanotix32-steelfire-nightly-KDE.packages
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-KDE.log $next/kanotix32-steelfire-nightly-KDE.log
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-KDE.iso $next/kanotix32-steelfire-nightly-KDE.iso
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix32-steelfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-steelfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix32-steelfire-nightly-KDE.iso.md5
-fi
-#
-# eeepc4G with LXDE
-lb clean
-lb config -d $DISTRO -p "kanotix-eeepc4G midori" --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
-echo Kanotix steelfire-nightly Steelfire32 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.packages
-cp tmpfs/binary.log $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.log
-cd $target
-if [ ! -f kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso ]; then
- cd -
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.log $next/kanotix32-steelfire-nightly-eeepc4G.log
-else
- md5sum -b kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso > kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso.md5
- zsyncmake kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso
- cd -
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.packages $next/kanotix32-steelfire-nightly-eeepc4G.packages
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.log $next/kanotix32-steelfire-nightly-eeepc4G.log
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso $next/kanotix32-steelfire-nightly-eeepc4G.iso
- ln -s $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso.zsync $next/kanotix32-steelfire-nightly-eeepc4G.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-steelfire-nightly-${d}${v}-eeepc4G.iso.md5 > $next/kanotix32-steelfire-nightly-eeepc4G.iso.md5
-fi
-fi # end of stretch build
-
-################### SPITFIRE ###################
-
-if $BUILD_JESSIE; then
-git checkout auto/config
-DISTRO=jessie
-rm -rf cache tmpfs/cache
-sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config
-
-lb clean
-lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging skypeforlinux" --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
-echo Kanotix spitfire-nightly Spitfire64 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-spitfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-spitfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix64-spitfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix64-spitfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE.log $next/kanotix64-spitfire-nightly-KDE.log
-else
- md5sum -b kanotix64-spitfire-nightly-${d}${v}-KDE.iso > kanotix64-spitfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix64-spitfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE.packages $next/kanotix64-spitfire-nightly-KDE.packages
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE.log $next/kanotix64-spitfire-nightly-KDE.log
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE.iso $next/kanotix64-spitfire-nightly-KDE.iso
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix64-spitfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-spitfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix64-spitfire-nightly-KDE.iso.md5
-fi
-
-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
-echo Kanotix spitfire-nightly Spitfire32 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-spitfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-spitfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix32-spitfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix32-spitfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE.log $next/kanotix32-spitfire-nightly-KDE.log
-else
- md5sum -b kanotix32-spitfire-nightly-${d}${v}-KDE.iso > kanotix32-spitfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix32-spitfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE.packages $next/kanotix32-spitfire-nightly-KDE.packages
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE.log $next/kanotix32-spitfire-nightly-KDE.log
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE.iso $next/kanotix32-spitfire-nightly-KDE.iso
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix32-spitfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-spitfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix32-spitfire-nightly-KDE.iso.md5
-fi
-
-lb clean
-lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging skypeforlinux" --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
-echo Kanotix spitfire-nightly Spitfire64 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix64-spitfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.log $next/kanotix64-spitfire-nightly-LXDE.log
-else
- md5sum -b kanotix64-spitfire-nightly-${d}${v}-LXDE.iso > kanotix64-spitfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix64-spitfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.packages $next/kanotix64-spitfire-nightly-LXDE.packages
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.log $next/kanotix64-spitfire-nightly-LXDE.log
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.iso $next/kanotix64-spitfire-nightly-LXDE.iso
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix64-spitfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-spitfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix64-spitfire-nightly-LXDE.iso.md5
-fi
-
-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
-echo Kanotix spitfire-nightly Spitfire32 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix32-spitfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.log $next/kanotix32-spitfire-nightly-LXDE.log
-else
- md5sum -b kanotix32-spitfire-nightly-${d}${v}-LXDE.iso > kanotix32-spitfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix32-spitfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.packages $next/kanotix32-spitfire-nightly-LXDE.packages
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.log $next/kanotix32-spitfire-nightly-LXDE.log
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.iso $next/kanotix32-spitfire-nightly-LXDE.iso
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix32-spitfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-spitfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix32-spitfire-nightly-LXDE.iso.md5
-fi
-
-## gfxdetect
-#git checkout config/binary_grub/grub.cfg
-
-if $BUILD_JESSIE_SPECIAL; then
-
-lb clean
-lb config -d $DISTRO -p "kanotix-master firefox wine-staging google-chrome skypeforlinux virtualbox android steam xbmc gfxdetect" --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
-echo Kanotix spitfire-nightly Spitfire64 $d$v KDE-special > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.packages
-cp tmpfs/binary.log $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.log
-cd $target
-if [ ! -f kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso ]; then
- cd -
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.log $next/kanotix64-spitfire-nightly-KDE-special.log
-else
- md5sum -b kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso > kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso.md5
- zsyncmake kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso
- cd -
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.packages $next/kanotix64-spitfire-nightly-KDE-special.packages
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.log $next/kanotix64-spitfire-nightly-KDE-special.log
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso $next/kanotix64-spitfire-nightly-KDE-special.iso
- ln -s $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso.zsync $next/kanotix64-spitfire-nightly-KDE-special.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-spitfire-nightly-${d}${v}-KDE-special.iso.md5 > $next/kanotix64-spitfire-nightly-KDE-special.iso.md5
-fi
-
-lb clean
-lb config -d $DISTRO -p "kanotix-master firefox wine-staging google-chrome virtualbox android steam xbmc gfxdetect" --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
-echo Kanotix spitfire-nightly Spitfire32 $d$v KDE-special > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.packages
-cp tmpfs/binary.log $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.log
-cd $target
-if [ ! -f kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso ]; then
- cd -
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.log $next/kanotix32-spitfire-nightly-KDE-special.log
-else
- md5sum -b kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso > kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso.md5
- zsyncmake kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso
- cd -
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.packages $next/kanotix32-spitfire-nightly-KDE-special.packages
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.log $next/kanotix32-spitfire-nightly-KDE-special.log
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso $next/kanotix32-spitfire-nightly-KDE-special.iso
- ln -s $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso.zsync $next/kanotix32-spitfire-nightly-KDE-special.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-spitfire-nightly-${d}${v}-KDE-special.iso.md5 > $next/kanotix32-spitfire-nightly-KDE-special.iso.md5
-fi
-fi # end of jessie special build
-fi # end of jessie build
-
-################### Dragonfire ###################
-
-if $BUILD_WHEEZY; then
-git checkout auto/config
-DISTRO=wheezy
-rm -rf cache tmpfs/cache
-sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config
-
-lb clean
-lb config -d wheezy -p "kanotix-kde-master firefox" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64
-echo Kanotix dragonfire-nightly Dragonfire64 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix64-dragonfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.log $next/kanotix64-dragonfire-nightly-KDE.log
-else
- md5sum -b kanotix64-dragonfire-nightly-${d}${v}-KDE.iso > kanotix64-dragonfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix64-dragonfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.packages $next/kanotix64-dragonfire-nightly-KDE.packages
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.log $next/kanotix64-dragonfire-nightly-KDE.log
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.iso $next/kanotix64-dragonfire-nightly-KDE.iso
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix64-dragonfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-dragonfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix64-dragonfire-nightly-KDE.iso.md5
-fi
-
-lb clean
-lb config -d wheezy -p "kanotix-kde-master firefox" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386
-echo Kanotix dragonfire-nightly Dragonfire32 $d$v KDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.packages
-cp tmpfs/binary.log $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.log
-cd $target
-if [ ! -f kanotix32-dragonfire-nightly-${d}${v}-KDE.iso ]; then
- cd -
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.log $next/kanotix32-dragonfire-nightly-KDE.log
-else
- md5sum -b kanotix32-dragonfire-nightly-${d}${v}-KDE.iso > kanotix32-dragonfire-nightly-${d}${v}-KDE.iso.md5
- zsyncmake kanotix32-dragonfire-nightly-${d}${v}-KDE.iso
- cd -
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.packages $next/kanotix32-dragonfire-nightly-KDE.packages
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.log $next/kanotix32-dragonfire-nightly-KDE.log
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.iso $next/kanotix32-dragonfire-nightly-KDE.iso
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix32-dragonfire-nightly-KDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-dragonfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix32-dragonfire-nightly-KDE.iso.md5
-fi
-
-lb clean
-lb config -d wheezy -p "kanotix-lxde-master firefox" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64
-echo Kanotix dragonfire-nightly Dragonfire64 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso
-check_iso
-mv kanotix64.iso $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.log $next/kanotix64-dragonfire-nightly-LXDE.log
-else
- md5sum -b kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso > kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.packages $next/kanotix64-dragonfire-nightly-LXDE.packages
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.log $next/kanotix64-dragonfire-nightly-LXDE.log
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso $next/kanotix64-dragonfire-nightly-LXDE.iso
- ln -s $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix64-dragonfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix64-dragonfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix64-dragonfire-nightly-LXDE.iso.md5
-fi
-
-lb clean
-lb config -d wheezy -p "kanotix-lxde-master firefox" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386
-echo Kanotix dragonfire-nightly Dragonfire32 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version
-lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso
-check_iso
-mv kanotix32.iso $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso; cd ..
-cp tmpfs/binary.packages $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.packages
-cp tmpfs/binary.log $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.log
-cd $target
-if [ ! -f kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso ]; then
- cd -
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.log $next/kanotix32-dragonfire-nightly-LXDE.log
-else
- md5sum -b kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso > kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso.md5
- zsyncmake kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso
- cd -
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.packages $next/kanotix32-dragonfire-nightly-LXDE.packages
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.log $next/kanotix32-dragonfire-nightly-LXDE.log
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso $next/kanotix32-dragonfire-nightly-LXDE.iso
- ln -s $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix32-dragonfire-nightly-LXDE.iso.zsync
- sed "s/${d}${v}-//" $target/kanotix32-dragonfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix32-dragonfire-nightly-LXDE.iso.md5
-fi
-fi # end of wheezy build
git checkout auto/config