Update .github/release-nest-v3

Reviewed-on: #4
Co-authored-by: Renaud Lepage <root@cybikbase.com>
Co-committed-by: Renaud Lepage <root@cybikbase.com>

.github/build-canary-v3

@@ -1 +1 @@
-2
+3

.github/release-nest-v3

@@ -1 +1 @@
-2
+3

Makefile

@@ -12,6 +12,4 @@ install:
 	install -Dp -m644 ./docs/manpage.1 "$(DESTDIR)/usr/share/man/man1/booster.1"
 	install -Dp -m755 ./init/init "$(DESTDIR)/usr/lib/booster/init"
 	install -Dp -m755 ./update-initramfs "$(DESTDIR)/usr/lib/booster/update-initramfs"
-	install -Dp -m755 ./packaging/pikaos/regenerate_uki "$(DESTDIR)/usr/sbin/regenerate_uki"
-	install -Dp -m755 ./packaging/pikaos/regenerate_uki-pkexec "$(DESTDIR)/usr/bin/regenerate_uki"
 	install -Dp -m755 ./booster.yml "$(DESTDIR)/etc/booster.yaml"

debian/booster.postinst

@@ -11,26 +11,6 @@ else
     echo "KEYMAP="us"" >> /etc/vconsole.conf
 fi
 
-# Check if there are entries in crypttab
-crypt_check=$(cat /etc/crypttab | grep -v '^#' || true)
-if [[ -n $crypt_check ]]
-then
-  # Use the first crypttab entry as luks for booster (valid for calamares and probably most installers)
-  if cat /etc/crypttab | grep -v '^#' | head -n1 | cut -f2 | grep -i "UUID="
-  then
-    # Check if luks is already configured in refind
-    if cat /boot/refind_linux.conf | grep -i 'rd.luks'
-    then
-	true
-    else
-      sed -i "s#root=#rd.luks.name="$(cat /etc/crypttab | grep -v '^#' | head -n1 | cut -f2 | sed "s#UUID=##")"="$(cat /etc/crypttab | grep -v '^#' | head -n1 | cut -f1)" root=#" /boot/refind_linux.conf
-    fi
-  else
-    echo -e "ERROR 1: /etc/crypttab is invalid!\nFirst crypttab entry (presumed to be root luks) is not defined via UUID\nPlease make sure to define luks for root as the first entry in /etc/crypttab via UUID (use blkid)"
-    exit 1
-  fi
-fi
-
 # Add nvidia support if an nvidia card is detected
 if lspci -k | grep -iEA3 '^[[:alnum:]]{2}:[[:alnum:]]{2}.*VGA|3D|DISPLAY' | grep -i nvidia && lspci -k | grep -iEA3 '^[[:alnum:]]{2}:[[:alnum:]]{2}.*VGA|3D|DISPLAY' | grep -i -E 'kernel modules|kernel driver' | grep -i nvidia
 then

debian/changelog

@@ -1,3 +1,10 @@
+booster (0.11.6.ferreogit4-101pika2) pika; urgency=medium
+
+  * Move UKI integration to extra package
+  * Refine UKI scripts
+
+ -- cybik <root@cybik.moe>  Wed, 13 Nov 2024 12:00:00 -0800
+
 booster (0.11.6.ferreogit3-101pika1) pika; urgency=medium
 
   * UKI

debian/control

@@ -10,6 +10,7 @@ Rules-Requires-Root: no
 Package: booster
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox, console-data, lvm2, pciutils
+Recommends: jq, systemd-ukify, systemd-boot-efi
 Replaces: booster-temp
 Conflicts: booster-temp
 Description: booster initramfs generation

main.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-VERSION="0.11.6.ferreogit3"
+VERSION="0.11.6.ferreogit4"
 
 source ./pika-build-config.sh
 

pika-build-config/amd64-v3.sh

@@ -1,10 +1,10 @@
 #! /bin/bash
 export PIKA_BUILD_ARCH="amd64-v3"
 export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto=auto"
-export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
-export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
-export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
-export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
 export DEB_BUILD_OPTIONS="nocheck notest terse"
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0