From d2b6fc72624f6a21e2fb05feac0d9cd1288ec0b9 Mon Sep 17 00:00:00 2001
From: Renaud Lepage <root@cybikbase.com>
Date: Wed, 13 Nov 2024 08:40:02 -0800
Subject: [PATCH] Functional package

---
 .gitignore       | 6 ++++++
 Makefile         | 1 -
 debian/changelog | 2 +-
 debian/control   | 9 +++------
 debian/rules     | 4 ++--
 main.sh          | 3 ++-
 6 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..763a8fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+booster/
+output/
+
+sbctl-booster-extra_*
+pika-build-arch
+pika-build-config.sh
diff --git a/Makefile b/Makefile
index 9a16186..7cff655 100644
--- a/Makefile
+++ b/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"
diff --git a/debian/changelog b/debian/changelog
index d13739a..3124b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sbctl-booster-extra (0.0.1-101pika1) pika; urgency=low
+sbctl-booster-extra (0.15.4-101pika1) pika; urgency=low
 
   * Initial release.
 
diff --git a/debian/control b/debian/control
index cafb88f..0338d1f 100644
--- a/debian/control
+++ b/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://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/
 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
diff --git a/debian/rules b/debian/rules
index cfe82af..6a9c873 100755
--- a/debian/rules
+++ b/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"
diff --git a/main.sh b/main.sh
index c35cc1a..cf2df16 100755
--- a/main.sh
+++ b/main.sh
@@ -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