-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix 255 build with an upstream patch
Signed-off-by: Itxaka <[email protected]>
- Loading branch information
Showing
2 changed files
with
34 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,10 +3,13 @@ package_dir: /package | |
image: fedora:40 | ||
|
||
prelude: | ||
- dnf install -y gcc git ninja-build meson diffutils gperf libcap-devel libmount-devel python3-jinja2 rsync libarchive-devel python3-pyelftools | ||
- dnf install -y gcc git ninja-build meson diffutils gperf libcap-devel libmount-devel python3-jinja2 rsync libarchive-devel python3-pyelftools patch | ||
- 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/[email protected]/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=false -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 | ||
|