diff options
| -rwxr-xr-x | config/chroot_local-hooks/03-distro | 2 | ||||
| -rwxr-xr-x | config/chroot_local-includes/lib/live/config/9023-kwayland | 31 | ||||
| -rw-r--r-- | config/lists/kde5-more | 1 | ||||
| -rw-r--r-- | config/prepare_debpool/packages | 1 | ||||
| -rwxr-xr-x | nightly_build.bash | 63 |
5 files changed, 46 insertions, 52 deletions
diff --git a/config/chroot_local-hooks/03-distro b/config/chroot_local-hooks/03-distro index 6fb7118..a26ee4f 100755 --- a/config/chroot_local-hooks/03-distro +++ b/config/chroot_local-hooks/03-distro @@ -13,6 +13,8 @@ perl -pi -e 's/^(GRUB_DISTRIBUTOR)=.*/\1=`[ "\$\(uname -m\)" = "x86_64" ] && ech perl -pi -e 's/.*(GRUB_DISABLE_LINUX_RECOVERY)=.*/\1="true"/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_RECOVERY)=.*/\1="true"/' /etc/default/grub perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash"/' /etc/default/grub +perl -pi -e 's/#GRUB_DISABLE_OS_PROBER=false/GRUB_DISABLE_OS_PROBER=false/g' /etc/default/grub + rm -f /etc/skel/Desktop/kanotix-irc.desktop.tmp if [ -f /etc/skel/Desktop/kanotix-irc.desktop ]; then diff --git a/config/chroot_local-includes/lib/live/config/9023-kwayland b/config/chroot_local-includes/lib/live/config/9023-kwayland new file mode 100755 index 0000000..152f32f --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/9023-kwayland @@ -0,0 +1,31 @@ +#!/bin/sh + +Kwayland () +{ + # Checking if configured + if [ -e /var/lib/live/config/kwayland ] + then + return + fi + echo -n " kwayland" + Configure_kwayland +} +Configure_kwayland () +{ + # Boot parameters can be acted up either this way... + if grep -qs "kwayland" /proc/cmdline + then + if [ -x /usr/bin/startplasma-wayland ]; 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 + fi + + # Creating state file + touch /var/lib/live/config/kwayland +} + +Kwayland diff --git a/config/lists/kde5-more b/config/lists/kde5-more index 9c4bb6f..0479bb9 100644 --- a/config/lists/kde5-more +++ b/config/lists/kde5-more @@ -7,4 +7,5 @@ calamares-settings-kanotix git dolphin-plugins quilt +plasma-workspace-wayland #endif diff --git a/config/prepare_debpool/packages b/config/prepare_debpool/packages index fbbdd4d..a8b9f9c 100644 --- a/config/prepare_debpool/packages +++ b/config/prepare_debpool/packages @@ -4,4 +4,3 @@ refind grub-efi-amd64 cryptsetup keyutils -grub-pc diff --git a/nightly_build.bash b/nightly_build.bash index 01ff2de..5ec6b00 100755 --- a/nightly_build.bash +++ b/nightly_build.bash @@ -62,7 +62,7 @@ mkdir -p $target $next ## remove gfxdetect entries from grub.cfg (for non-gfxdetect-builds) #sed -i '/gfxdetect/,/^}/{d}' config/binary_grub/grub.cfg -BUILD_BOOKWORM=false +BUILD_BOOKWORM=true BUILD_BULLSEYE=true BUILD_BUSTER=false BUILD_BUSTER_EXTRA_KDE=true @@ -81,6 +81,17 @@ KDISTRO=slowfire rm -rf cache tmpfs/cache sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config + +cat <<"EOF" >$target/readme-$KDISTRO.txt +Slowfire Isos are widely untested. +================================== +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 +EOF + +ln -s $target/readme-$KDISTRO.txt $next/readme-$KDISTRO.txt + # kde 64 lb clean lb config -d $DISTRO -p "debpool kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=16G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd @@ -218,56 +229,6 @@ DISTRO=bullseye rm -rf cache tmpfs/cache sed -i 's/\(export LB_DISTRIBUTION=\).*/\1"'$DISTRO'"/' auto/config -# kde 64 -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 speedfire-nightly Speedfire64 $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-speedfire-nightly-${d}${v}-KDE.iso; cd .. -cp tmpfs/binary.packages $target/kanotix64-speedfire-nightly-${d}${v}-KDE.packages -cp tmpfs/binary.log $target/kanotix64-speedfire-nightly-${d}${v}-KDE.log -cd $target -if [ ! -f kanotix64-speedfire-nightly-${d}${v}-KDE.iso ]; then - cd - - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-KDE.log $next/kanotix64-speedfire-nightly-KDE.log -else - md5sum -b kanotix64-speedfire-nightly-${d}${v}-KDE.iso > kanotix64-speedfire-nightly-${d}${v}-KDE.iso.md5 - zsyncmake kanotix64-speedfire-nightly-${d}${v}-KDE.iso - cd - - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-KDE.packages $next/kanotix64-speedfire-nightly-KDE.packages - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-KDE.log $next/kanotix64-speedfire-nightly-KDE.log - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-KDE.iso $next/kanotix64-speedfire-nightly-KDE.iso - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-KDE.iso.zsync $next/kanotix64-speedfire-nightly-KDE.iso.zsync - sed "s/${d}${v}-//" $target/kanotix64-speedfire-nightly-${d}${v}-KDE.iso.md5 > $next/kanotix64-speedfire-nightly-KDE.iso.md5 -fi -# -# lxde 64 -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 speedfire-nightly Speedfire64 $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-speedfire-nightly-${d}${v}-LXDE.iso; cd .. -cp tmpfs/binary.packages $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.packages -cp tmpfs/binary.log $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.log -cd $target -if [ ! -f kanotix64-speedfire-nightly-${d}${v}-LXDE.iso ]; then - cd - - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.log $next/kanotix64-speedfire-nightly-LXDE.log -else - md5sum -b kanotix64-speedfire-nightly-${d}${v}-LXDE.iso > kanotix64-speedfire-nightly-${d}${v}-LXDE.iso.md5 - zsyncmake kanotix64-speedfire-nightly-${d}${v}-LXDE.iso - cd - - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.packages $next/kanotix64-speedfire-nightly-LXDE.packages - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.log $next/kanotix64-speedfire-nightly-LXDE.log - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.iso $next/kanotix64-speedfire-nightly-LXDE.iso - ln -s $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.iso.zsync $next/kanotix64-speedfire-nightly-LXDE.iso.zsync - sed "s/${d}${v}-//" $target/kanotix64-speedfire-nightly-${d}${v}-LXDE.iso.md5 > $next/kanotix64-speedfire-nightly-LXDE.iso.md5 -fi - # 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 |