From 469675043026e092ce603f7d5ea5878d96a66028 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Mon, 22 Jul 2024 14:09:33 +0200
Subject: [PATCH] Bump systemd-boot/stub to 256 (#978)

---
 packages/system/systemd/255.patch       | 30 -------------------------
 packages/system/systemd/build.yaml      |  3 ---
 packages/system/systemd/collection.yaml |  2 +-
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 packages/system/systemd/255.patch

diff --git a/packages/system/systemd/255.patch b/packages/system/systemd/255.patch
deleted file mode 100644
index 7c6d3fe5b..000000000
--- a/packages/system/systemd/255.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf
-index e8c5357f91..1cd66b5a5f 100644
---- a/src/basic/filesystems-gperf.gperf
-+++ b/src/basic/filesystems-gperf.gperf
-@@ -91,6 +91,7 @@ ocfs2,           {OCFS2_SUPER_MAGIC}
- openpromfs,      {OPENPROM_SUPER_MAGIC}
- orangefs,        {ORANGEFS_DEVREQ_MAGIC}
- overlay,         {OVERLAYFS_SUPER_MAGIC}
-+pidfs,           {PID_FS_MAGIC}
- pipefs,          {PIPEFS_MAGIC}
- ppc-cmm,         {PPC_CMM_MAGIC}
- proc,            {PROC_SUPER_MAGIC}
-diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h
-index 27a33adecb..82d71c8ad1 100644
---- a/src/basic/missing_magic.h
-+++ b/src/basic/missing_magic.h
-@@ -128,6 +128,11 @@
- #define DEVMEM_MAGIC 0x454d444d
- #endif
-
-+/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */
-+#ifndef PID_FS_MAGIC
-+#define PID_FS_MAGIC 0x50494446
-+#endif
-+
- /* Not in mainline but included in Ubuntu */
- #ifndef SHIFTFS_MAGIC
- #define SHIFTFS_MAGIC 0x6a656a62
---
-2.39.2
\ No newline at end of file
diff --git a/packages/system/systemd/build.yaml b/packages/system/systemd/build.yaml
index 376e38ffd..396a6a0ee 100644
--- a/packages/system/systemd/build.yaml
+++ b/packages/system/systemd/build.yaml
@@ -7,9 +7,6 @@ prelude:
   - PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && git clone --branch v${PACKAGE_VERSION} https://github.com/systemd/systemd.git
 
 steps:
-  # upstream patch for system+ kernel 6.9.x headers: https://lore.kernel.org/all/20240515144432.3152351-1-bruce.ashfield@gmail.com/T/
-  # drop when moving to 256
-  - cd systemd && patch -p1 < ../255.patch
   # Minimal systemd build, remove almost everything, we only interested in the efi boot files
   - cd systemd && meson setup build -Dmode=release -Dbootloader=enabled -Defi=true -Dukify=disabled -Dblkid=disabled -Dopenssl=disabled -Dsbat-distro="Kairos" -Dsbat-distro-url="kairos.io" -Dsbat-distro-summary="Kairos" -Dsbat-distro-version="kairos-${PACKAGE_VERSION}" -Ddns-servers='' -Dsysvinit-path= -Dsysvrcnd-path= -Dtpm=true -Dinstall-tests=false -Dnss-resolve=disabled -Dlogind=false -Dcoredump=false -Dhomed=disabled -Dfirstboot=false -Dhostnamed=false -Dhibernate=false -Dinitrd=false -Dimportd=disabled -Dkernel-install=false -Dlocaled=false -Dmachined=false -Dnetworkd=false -Dnss-myhostname=false -Dnss-mymachines=disabled -Dnss-systemd=false -Doomd=false -Dportabled=false -Dhwdb=false -Dpstore=false -Dquotacheck=false -Drandomseed=false -Drepart=disabled -Dresolve=false -Drfkill=false -Dsysext=false -Danalyze=false -Dsysupdate=disabled -Dsysusers=false -Dstoragetm=false -Dtimedated=false -Dtimesyncd=false -Dtmpfiles=false -Duserdb=false -Dvconsole=false -Dxdg-autostart=false -Didn=false -Dpolkit=disabled -Dnscd=false -Dkmod=disabled -Ddbus=disabled -Dglib=disabled -Dbacklight=false -Dldconfig=false -Dgshadow=false -Dwheel-group=false -Dadm-group=false -Dxkbcommon=disabled -Dzstd=disabled -Dlz4=disabled -Dutmp=false -Dlink-udev-shared=false -Dlink-systemctl-shared=false -Dlink-networkd-shared=false -Dlink-timesyncd-shared=false -Dlink-journalctl-shared=false -Dlink-boot-shared=false -Dlink-portabled-shared=false -Denvironment-d=false -Dqrencode=disabled -Dpwquality=disabled -Dlibcurl=disabled -Dfdisk=disabled -Dlibidn2=disabled -Dlibiptc=disabled -Ddns-over-tls=false -Didn=false -Dgnutls=disabled -Dp11kit=disabled -Dlibidn=disabled -Dlibidn2=disabled -Dgcrypt=disabled -Dxz=disabled -Dzlib=disabled -Dbzip2=disabled
   - cd systemd && ninja -C build
diff --git a/packages/system/systemd/collection.yaml b/packages/system/systemd/collection.yaml
index 111e2510a..e0adfa4ea 100644
--- a/packages/system/systemd/collection.yaml
+++ b/packages/system/systemd/collection.yaml
@@ -1,7 +1,7 @@
 packages:
   - name: "systemd-boot"
     category: "system"
-    version: "255-8"
+    version: "256"
     labels:
       github.repo: "systemd"
       autobump.revdeps: "true"