Update pika-build-config/amd64-v3.sh

sbctl has released

Reviewed-on: #2
Reviewed-by: ferreo <ferreo@noreply.pika>
Co-authored-by: Renaud Lepage <root@cybikbase.com>
Co-committed-by: Renaud Lepage <root@cybikbase.com>

.github/build-nest-v3

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

.gitignore

@@ -0,0 +1,6 @@
+booster/
+output/
+
+sbctl-booster-extra_*
+pika-build-arch
+pika-build-config.sh

Makefile

@@ -2,7 +2,6 @@ all:
 	true
 
 install:
-	find .
 	install -Dp -m755 ./packaging/pikaos/regenerate_uki "$(DESTDIR)/usr/sbin/regenerate_uki"
 	install -Dp -m755 ./packaging/pikaos/regenerate_uki-prerm "$(DESTDIR)/etc/kernel/prerm.d/regenerate_uki"
 	install -Dp -m755 ./packaging/pikaos/regenerate_uki-postinst "$(DESTDIR)/etc/kernel/postinst.d/zzz-regenerate_uki"

debian/changelog

@@ -1,4 +1,10 @@
-sbctl-booster-extra (0.0.1-101pika1) pika; urgency=low
+sbctl-booster-extra (0.16.0-101pika5) pika; urgency=low
+
+  * Match new upstream release
+
+ -- cybik <root@cybik.moe>  Wed, 13 Nov 2024 10:45:00 -0800
+
+sbctl-booster-extra (0.15.4-101pika2) pika; urgency=low
 
   * Initial release.
 

debian/control

@@ -12,19 +12,16 @@ Architecture: linux-any
 Depends:
  ${misc:Depends}, ${shlibs:Depends}, util-linux, binutils, sbctl, booster, pciutils, systemd-boot-efi, jq, systemd-ukify
 Provides: sbctl-extra
-Homepage: https://sauce.cybik.moe/pikaos/sbctl-booster-extra
-Vcs-Browser: https://sauce.cybik.moe/pikaos/sbctl-booster-extra
-Vcs-Git: https://sauce.cybik.moe/pikaos/sbctl-booster-extra.git
+Homepage: https://git.pika-os.com/boot-packages/sbctl-booster-extra/
+Vcs-Browser: https://git.pika-os.com/boot-packages/sbctl-booster-extra/
+Vcs-Git: https://git.pika-os.com/boot-packages/sbctl-booster-extra/
 Description: SecureBoot + Booster - Integration files
  The sbctl tool allows one to create keys for secure boot,
  securely enroll them, and keep track of files to sign
  and/or that have been signed.
-
  The booster package is a fast initramfs builder used by
  PikaOS.
- 
  This package contains extra files for sbctl and booster
  integration into PikaOS systems, namely for:
-
  * Automatic SecureBoot signing and cleanup when installing
    or updating kernels

debian/rules

@@ -51,8 +51,8 @@ export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
 #override_dh_clean:
 #	echo "disabled"
 
-#override_dh_auto_install:
-#	dh_auto_install
+override_dh_auto_install:
+	dh_auto_install
 
 override_dh_usrlocal:
 	echo "disabled"

main.sh

@@ -6,7 +6,7 @@ set -e
 
 echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
-VERSION="0.15.4"
+VERSION="0.16"
 
 # Who are we
 PACKAGE_NAME="sbctl-booster-extra"
@@ -17,6 +17,7 @@ UPSTREAM_NAME="booster"
 # Checkout and munch
 git clone https://github.com/ferrreo/booster.git "${UPSTREAM_NAME}"
 cp -rvf ./debian ./${UPSTREAM_NAME}/
+cp -vf ./Makefile ./booster/
 
 # easier than figuring out the right way to override the prefix in the makefile
 #sed -i "s/usr\/local/usr/" "${UPSTREAM_NAME}/Makefile"
@@ -30,7 +31,7 @@ LOGNAME=root dh_make --createorig -y -l -p ${PACKAGE_NAME}_"$VERSION" || echo "d
 apt-get build-dep ./ -y
 
 # Build package
-dpkg-buildpackage --no-sign
+dpkg-buildpackage --no-sign -b
 
 popd || exit 2
 

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_CFLAGS_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 -fuse-linker-plugin -falign-functions=32"
-export DEB_CXXFLAGS_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 -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=auto"
+export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+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