Merge pull request #8 from sorenisanerd/main

mangos-packages -> mangos.packages

Author: sorenisanerd

.github/workflows/build.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Copy cosign into place
         run: cp $HOME/.cosign/cosign .
       - name: Run mkosi
-        run: mkosi --debug
+        run: mkosi --debug --profile=build-systemd
       - name: Remove symlinks
         run: find out/ -type l -delete
       - name: Sign artifacts
@@ -58,7 +58,7 @@ jobs:
         id: upload-pkgs
         uses: actions/upload-artifact@v4
         with:
-          path: out/mangos-packages*
+          path: out/mangos.packages*
           compression-level: 0
           name: mangos.packages
       - name: Release

.gitignore

@@ -1,6 +1,7 @@
 /.cache
 /out
 /mkosi.tools
+/mkosi.packages
 /cosign
 /syft
 /syft*.tar.gz

Makefile

@@ -24,4 +24,7 @@ mkosi.tools:
 	rm -rf mkosi.tools
 	version="$$(mkosi summary --json | jq .Images[0].ImageVersion -r)"; mkdir mkosi.tools ; tar -xf out/mangos.tools_$${version}.tar.zst --zstd -C mkosi.tools 
 
-.PHONY: mkosi.tools
+mkosi.packages:
+	version="$$(mkosi summary --json | jq .Images[0].ImageVersion -r)"; mkdir mkosi.packages ; tar -xf out/mangos.packages_$${version}.tar.zst --zstd -C mkosi.packages
+
+.PHONY: mkosi.tools mkosi.packages

mkosi.conf

@@ -1,5 +1,5 @@
 [Config]
-Profiles=debug,misc,package-manager,runtime,cosign,syft,build-systemd
+Profiles=debug,misc,package-manager,runtime,cosign,syft
 
 [Include]
 Include=mkosi-tools

mkosi.profiles/build-systemd/systemd.build.chroot

@@ -3,12 +3,12 @@
 set -e
 
 cd ${BUILDDIR}
-dpkg-source -x ${SRCDIR}/pkg/systemd/systemd_258.1-1.dsc
+dpkg-source -x ${SRCDIR}/pkg/systemd/systemd_258.1-2.dsc
 cd systemd-258.1
 patch -p1 < ${SRCDIR}/mkosi.profiles/build-systemd/sysupdated.patch
 dpkg-buildpackage -us -uc -b
 cd ..
-tarball=mangos-packages_${IMAGE_VERSION}.tar
+tarball=mangos.packages_${IMAGE_VERSION}.tar
 tar cf ${tarball} *.{deb,ddeb}
 zstd --rm ${tarball}
 mv ${tarball}.zst ${ARTIFACTDIR}/

mkosi.profiles/build-systemd/systemd.postinst

@@ -1,3 +1,3 @@
 #!/bin/bash
-tarball=mangos-packages_${IMAGE_VERSION}.tar.zst
+tarball=mangos.packages_${IMAGE_VERSION}.tar.zst
 mv ${ARTIFACTDIR}/${tarball} ${OUTPUTDIR}/

mkosi.profiles/build-systemd/systemd.sync

@@ -2,6 +2,6 @@
 pkg=${SRCDIR}/pkg/systemd
 mkdir -p "$pkg"
 cd "$pkg"
-for url in http://deb.debian.org/debian/pool/main/s/systemd/systemd_258.1{-1.dsc,.orig.tar.gz,-1.debian.tar.xz}; do
+for url in http://ftp.debian.org/debian/pool/main/s/systemd/systemd_258.1{-2{.dsc,.debian.tar.xz},.orig.tar.gz}; do
     test -f "$(basename "$url")" || wget -O "$(basename "$url")" "$url"
 done

mkosi.profiles/build-systemd/sysupdated.patch

@@ -1,19 +1,19 @@
-diff -ur systemd-258.1.orig/debian/changelog systemd-258.1/debian/changelog
---- systemd-258.1.orig/debian/changelog	2025-10-23 11:20:37.535291463 -0700
-+++ systemd-258.1/debian/changelog	2025-10-23 11:24:31.060180155 -0700
+diff -urNw systemd-258.1.orig/debian/changelog systemd-258.1/debian/changelog
+--- systemd-258.1.orig/debian/changelog	2025-10-27 06:06:14.000000000 -0700
++++ systemd-258.1/debian/changelog	2025-11-05 14:59:50.450027607 -0800
 @@ -1,3 +1,9 @@
-+systemd (258.1-1mangos1) unstable; urgency=medium
++systemd (258.1-2mangos1) unstable; urgency=medium
 +
 +  * Enable sysupdated.
 +
 + -- Soren Hansen <[email protected]>  Thu, 23 Oct 2025 11:23:25 -0700
 +
- systemd (258.1-1) unstable; urgency=medium
+ systemd (258.1-2) unstable; urgency=medium
 
-   * Override Lintian warning for groff-message. These manpages are
-diff -ur systemd-258.1.orig/debian/rules systemd-258.1/debian/rules
---- systemd-258.1.orig/debian/rules	2025-10-23 11:20:37.536878900 -0700
-+++ systemd-258.1/debian/rules	2025-10-23 11:21:25.473318469 -0700
+   [ Luca Boccassi ]
+diff -urNw systemd-258.1.orig/debian/rules systemd-258.1/debian/rules
+--- systemd-258.1.orig/debian/rules	2025-10-22 09:35:40.000000000 -0700
++++ systemd-258.1/debian/rules	2025-11-05 15:00:48.476676601 -0800
 @@ -149,7 +149,8 @@
  	-Dpcre2=enabled \
  	-Dukify=enabled \
@@ -34,9 +34,9 @@ diff -ur systemd-258.1.orig/debian/rules systemd-258.1/debian/rules
  endif
 
  # BPF/BTF are only enabled and usable on a few architectures
-diff -ur systemd-258.1.orig/debian/systemd-container.install systemd-258.1/debian/systemd-container.install
---- systemd-258.1.orig/debian/systemd-container.install	2025-10-23 11:20:37.537158893 -0700
-+++ systemd-258.1/debian/systemd-container.install	2025-10-23 11:55:01.302259102 -0700
+diff -urNw systemd-258.1.orig/debian/systemd-container.install systemd-258.1/debian/systemd-container.install
+--- systemd-258.1.orig/debian/systemd-container.install	2025-10-22 09:35:41.000000000 -0700
++++ systemd-258.1/debian/systemd-container.install	2025-11-05 15:00:48.476812175 -0800
 @@ -1,6 +1,6 @@
  #!/usr/bin/dh-exec
  usr/bin/importctl
@@ -53,8 +53,8 @@ diff -ur systemd-258.1.orig/debian/systemd-container.install systemd-258.1/debia
 +usr/lib/systemd/system/dbus-org.freedesktop.sysupdate1.service
  usr/lib/systemd/user/machine.slice
  usr/lib/systemd/user/machines.target
- <pkg.systemd.upstream> usr/lib/systemd/user/dbus-org.freedesktop.machine1.service
-@@ -52,17 +52,17 @@
+ <pkg.systemd.upstream> usr/lib/systemd/user/dbus-org.freedesktop.import1.service
+@@ -57,17 +57,17 @@
  usr/share/dbus-1/system.d/org.freedesktop.import1.conf
  usr/share/dbus-1/system.d/org.freedesktop.machine1.conf
  usr/share/dbus-1/system.d/org.freedesktop.portable1.conf
@@ -75,9 +75,91 @@ diff -ur systemd-258.1.orig/debian/systemd-container.install systemd-258.1/debia
  usr/share/zsh/vendor-completions/_systemd-nspawn
  usr/share/zsh/vendor-completions/_sd_machines
  usr/share/zsh/vendor-completions/_machinectl
-diff -ur systemd-258.1.orig/debian/systemd-container.manpages systemd-258.1/debian/systemd-container.manpages
---- systemd-258.1.orig/debian/systemd-container.manpages	2025-10-23 11:20:37.537177719 -0700
-+++ systemd-258.1/debian/systemd-container.manpages	2025-10-23 11:54:36.741335543 -0700
+diff -urNw systemd-258.1.orig/debian/systemd-container.install.orig systemd-258.1/debian/systemd-container.install.orig
+--- systemd-258.1.orig/debian/systemd-container.install.orig	1969-12-31 16:00:00.000000000 -0800
++++ systemd-258.1/debian/systemd-container.install.orig	2025-10-22 09:35:41.000000000 -0700
+@@ -0,0 +1,78 @@
++#!/usr/bin/dh-exec
++usr/bin/importctl
++<pkg.systemd.upstream> usr/bin/updatectl
++usr/bin/systemd-vmspawn
++usr/lib/systemd/system/[email protected]
++usr/bin/machinectl
++usr/bin/portablectl
++usr/lib/systemd/import-pubring.*
++usr/lib/systemd/network/80-namespace-ns*
++usr/lib/systemd/portable
++usr/lib/systemd/systemd-machined
++usr/lib/systemd/systemd-export
++usr/lib/systemd/systemd-import*
++usr/lib/systemd/systemd-mountfsd
++usr/lib/systemd/systemd-mountwork
++usr/lib/systemd/systemd-nsresourced
++usr/lib/systemd/systemd-nsresourcework
++usr/lib/systemd/systemd-portabled
++usr/lib/systemd/systemd-pull
++usr/lib/systemd/systemd-sysupdate*
++usr/lib/systemd/system-generators/systemd-import-generator
++usr/lib/systemd/system/sockets.target.wants/systemd-import*
++usr/lib/systemd/system/[email protected]
++usr/lib/systemd/system/systemd-import*
++usr/lib/systemd/system/systemd-machined*
++usr/lib/systemd/system/systemd-mountfsd*
++usr/lib/systemd/system/systemd-nsresourced*
++usr/lib/systemd/system/systemd-portabled.service
++usr/lib/systemd/system/systemd-sysupdate*
++usr/lib/systemd/system/var-lib-machines.mount
++usr/lib/systemd/system/machines.target
++usr/lib/systemd/system/*.target.wants/systemd-machined*
++usr/lib/systemd/system/*.target.wants/var-lib-machines.mount
++usr/lib/systemd/system/dbus-org.freedesktop.import1.service
++usr/lib/systemd/system/dbus-org.freedesktop.machine1.service
++usr/lib/systemd/system/dbus-org.freedesktop.portable1.service
++<pkg.systemd.upstream> usr/lib/systemd/system/dbus-org.freedesktop.sysupdate1.service
++usr/lib/systemd/user/machine.slice
++usr/lib/systemd/user/machines.target
++<pkg.systemd.upstream> usr/lib/systemd/user/dbus-org.freedesktop.import1.service
++<pkg.systemd.upstream> usr/lib/systemd/user/dbus-org.freedesktop.machine1.service
++<pkg.systemd.upstream> usr/lib/systemd/user/sockets.target.wants/systemd-importd.socket
++<pkg.systemd.upstream> usr/lib/systemd/user/sockets.target.wants/systemd-machined.socket
++<pkg.systemd.upstream> usr/lib/systemd/user/systemd-importd.service
++<pkg.systemd.upstream> usr/lib/systemd/user/systemd-importd.socket
++<pkg.systemd.upstream> usr/lib/systemd/user/systemd-machined.service
++<pkg.systemd.upstream> usr/lib/systemd/user/systemd-machined.socket
++usr/lib/systemd/user/[email protected]
++usr/lib/systemd/user/[email protected]
++usr/bin/systemd-dissect
++usr/bin/systemd-nspawn
++usr/lib/tmpfiles.d/portables.conf
++usr/lib/tmpfiles.d/systemd-nspawn.conf
++usr/sbin/mount.ddi
++<pkg.systemd.upstream> usr/share/dbus-1/services/org.freedesktop.import1.service
++<pkg.systemd.upstream> usr/share/dbus-1/services/org.freedesktop.machine1.service
++usr/share/dbus-1/system.d/org.freedesktop.import1.conf
++usr/share/dbus-1/system.d/org.freedesktop.machine1.conf
++usr/share/dbus-1/system.d/org.freedesktop.portable1.conf
++<pkg.systemd.upstream> usr/share/dbus-1/system.d/org.freedesktop.sysupdate1.conf
++usr/share/dbus-1/system-services/org.freedesktop.import1.service
++usr/share/dbus-1/system-services/org.freedesktop.machine1.service
++usr/share/dbus-1/system-services/org.freedesktop.portable1.service
++<pkg.systemd.upstream> usr/share/dbus-1/system-services/org.freedesktop.sysupdate1.service
++usr/share/polkit-1/actions/io.systemd.mount-file-system.policy
++usr/share/polkit-1/actions/io.systemd.namespace-resource.policy
++usr/share/polkit-1/actions/org.freedesktop.import1.policy
++usr/share/polkit-1/actions/org.freedesktop.machine1.policy
++usr/share/polkit-1/actions/org.freedesktop.portable1.policy
++<pkg.systemd.upstream> usr/share/polkit-1/actions/org.freedesktop.sysupdate1.policy
++usr/share/zsh/vendor-completions/_systemd-nspawn
++usr/share/zsh/vendor-completions/_sd_machines
++usr/share/zsh/vendor-completions/_machinectl
++usr/share/bash-completion/completions/machinectl
++usr/share/bash-completion/completions/portablectl
++usr/share/bash-completion/completions/systemd-nspawn
++usr/share/bash-completion/completions/systemd-vmspawn
++usr/share/bash-completion/completions/importctl
+diff -urNw systemd-258.1.orig/debian/systemd-container.manpages systemd-258.1/debian/systemd-container.manpages
+--- systemd-258.1.orig/debian/systemd-container.manpages	2025-10-22 09:35:41.000000000 -0700
++++ systemd-258.1/debian/systemd-container.manpages	2025-11-05 15:00:48.476900591 -0800
 @@ -1,11 +1,11 @@
  #!/usr/bin/dh-exec
  debian/tmp/usr/share/man/man1/importctl.1