Merge ~slyon/ubuntu/+source/systemd:lunar/no-i386-binaries into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-lunar

[Lukas Märdian]

RFC: reduction of i386 build to a lib-only version

systemd has grown support in its buildsystem (meson) to filter non-executable targets, this should allow us to reduce the footprint of our i386 build. Ubuntu's i386 port is a partial architecture only, and we don't need systemd's executables on this arch, but rather just the (public) libraries, which might be needed by certain consumers.

Context and initial work by @bluca can be found here: https://salsa.debian.org/systemd-team/systemd/-/merge_requests/158

This is a RFC to discuss the next steps on this approach within Ubuntu.

Notes:
* My final commit on the branch ("d/rules: Fix missing files on i386 dh_install") still seems a bit hacky and we should try to avoid this.
* We should analyze the build-depends and filter the ones we don't need for this build, using "[!i386]"

[Lukas Märdian (slyon)]

There's a Bileto PPA, which I want to use to run some autopkgtests for all architectures & reverse-depends:
https://bileto.ubuntu.com/#/ticket/4635
https://bileto.ubuntu.com/excuses/4635/lunar.html
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4635/+packages

[Luca Boccassi (bluca)]

yeah the last change could use some cleanups, for example just do "rm -f" when deleting stuff, rather than || true

[Lukas Märdian (slyon)]

I pushed the "rm -f" cleanup where possible.

[Lukas Märdian (slyon)]

I've uploaded a new build to the ppa:ci-train-ppa-service/4635 for Mantic.

The ppc64el build fails in the same way the current version in Lunar fails on Mantic (so this seems unrelated):
https://launchpad.net/~slyon/+archive/ubuntu/testing/+sourcepub/14739488/+listing-archive-extra

Some autopkgtests can be found here:
https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-ci-train-ppa-service-4635/?format=plain

i386 reverse depends spot checks are looking good:
(libsystemd0) dbus-broker PASS
(libudev1) bluez PASS

Normal systemd autopkgtests fail the "tests-in-lxd" case, the same way they fail in Mantic, currently (due to missing LXC Mantic images).

The "networkd-test.py" case is known flaky, but it might be worth doing some extra investigation before merging this, as it seems to fail in the PPA but not Mantic, currently (seems unrelated, though):

```
======================================================================
FAIL: test_transient_hostname (__main__.DnsmasqClientTest.test_transient_hostname)
networkd sets transient hostname from DHCP
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/autopkgtest.2wtzSH/build.l2N/src/test/networkd-test.py", line 795, in test_transient_hostname
    self.fail('Transient hostname not found in hostnamectl:\n{}'.format(out.decode()))
AssertionError: Transient hostname not found in hostnamectl:
   Static hostname: (unset)
Transient hostname: autopkgtest
         Icon name: computer-vm
           Chassis: vm 🖴
        Machine ID: f09e8df852cd4964a73ee33c74bb3374
           Boot ID: d4d6db2e77834ef5bb15f4b52ce200b1
    Virtualization: kvm
  Operating System: Ubuntu Mantic Minotaur (development branch)
            Kernel: Linux 6.2.0-21-generic
      Architecture: x86-64
   Hardware Vendor: OpenStack Foundation
    Hardware Model: OpenStack Nova
  Firmware Version: 1.13.0-1ubuntu1.1

======================================================================
FAIL: test_dhcp_timezone (__main__.NetworkdClientTest.test_dhcp_timezone)
networkd sets time zone from DHCP
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/autopkgtest.2wtzSH/build.l2N/src/test/networkd-test.py", line 1015, in test_dhcp_timezone
    self.assertEqual(get_tz(), 'Pacific/Honolulu')
AssertionError: 'Etc/UTC' != 'Pacific/Honolulu'
- Etc/UTC
+ Pacific/Honolulu

----------------------------------------------------------------------
Ran 35 tests in 161.043s

FAILED (failures=2, skipped=3)
autopkgtest [07:16:54]: test networkd-test.py: -----------------------]
autopkgtest [07:16:54]: test networkd-test.py: - - - - - - - - - - results - - - - - - - - - -
networkd-test.py FAIL non-zero exit status 1
```

[Luca Boccassi (bluca)]

Looks good to me. After Bookworm has shipped, I'm happy to have the d/rules changes merged in Salsa, if you update the MR. Bonus points if you also add a gitlab CI job that exercises this build type, so that we don't accidentally regress.

review: Approve

[Nick Rosbrook (enr0n)]

FWIW I believe the networkd-test.py failure is caused by building with a newer policykit-1 (like 122-3build1 in -proposed), but running autopkgtest with the older version in -release (0.105-33).

Unmerged commits

d3e31a3... by Lukas Märdian on 2023-04-18

d/rules: Fix missing files on i386 dh_install

91fa910... by Lukas Märdian on 2022-08-15

d/control: avoid building i386 binaries

79fadd0... by Lukas Märdian on 2022-08-16

d/rules: unify ifeq syntax

a11bc13... by Luca Boccassi on 2022-06-23

d/rules: on Ubuntu/i386 only build and install libraries and EFI binaries

Allow Ubuntu to drop most i386 packages, and only build and install the
public libraries (multiarch builds/installs) and the EFI binaries (for
machines running amd64 CPUs on i386 UEFI).

diff --git a/debian/control b/debian/control
index c84c218..f6d06cb 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Build-Depends: debhelper-compat (= 13),
                fdisk <!nocheck>,
 
 Package: systemd
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: foreign
 Priority: important
 Recommends: default-dbus-system-bus | dbus-system-bus,
@@ -122,7 +122,7 @@ Description: system and service manager
  boot with init=/lib/systemd/systemd or install systemd-sysv in addition.
 
 Package: systemd-sysv
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: foreign
 Priority: important
 Conflicts: sysvinit-core,
@@ -142,7 +142,7 @@ Description: system and service manager - SysV compatibility symlinks
 
 Package: systemd-container
 Build-Profiles: <!stage1>
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -158,7 +158,7 @@ Description: systemd container/nspawn tools
 
 Package: systemd-journal-remote
 Build-Profiles: <!stage1>
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -171,7 +171,7 @@ Description: tools for sending and receiving remote journal logs
 
 Package: systemd-coredump
 Build-Profiles: <!stage1>
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -186,7 +186,7 @@ Description: tools for storing and retrieving coredumps
   * coredumpctl
 
 Package: systemd-timesyncd
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: foreign
 Priority: standard
 Depends: ${shlibs:Depends},
@@ -202,7 +202,7 @@ Description: minimalistic service to synchronize local time with NTP servers
  synchronize the local system clock with a remote Network Time Protocol server.
 
 Package: systemd-tests
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          systemd (= ${binary:Version}),
@@ -213,7 +213,7 @@ Description: tests for systemd
  for autopkgtest and not meant to be installed on regular user systems.
 
 Package: libpam-systemd
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: same
 Priority: standard
 Pre-Depends: ${misc:Pre-Depends}
@@ -234,7 +234,7 @@ Description: system and service manager - PAM module
  Packages that depend on logind functionality need to depend on libpam-systemd.
 
 Package: libnss-myhostname
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
@@ -253,7 +253,7 @@ Description: nss module providing fallback resolution for the current hostname
  Installing this package automatically adds myhostname to /etc/nsswitch.conf.
 
 Package: libnss-mymachines
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
@@ -268,7 +268,7 @@ Description: nss module to resolve hostnames for local container instances
  Installing this package automatically adds mymachines to /etc/nsswitch.conf.
 
 Package: libnss-resolve
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
@@ -282,7 +282,7 @@ Description: nss module to resolve names via systemd-resolved
  Installing this package automatically adds resolve to /etc/nsswitch.conf.
 
 Package: libnss-systemd
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: same
 Priority: standard
 Pre-Depends: ${misc:Pre-Depends}
@@ -322,7 +322,7 @@ Description: systemd utility library - development files
  use libsystemd.
 
 Package: libsystemd-shared
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
@@ -335,7 +335,7 @@ Description: systemd shared private library
 
 Package: udev
 Priority: important
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
@@ -378,7 +378,7 @@ Package: udev-udeb
 Build-Profiles: <!noudeb>
 Package-Type: udeb
 Section: debian-installer
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          util-linux-udeb
@@ -401,7 +401,7 @@ Description: libudev shared library
  This is a minimal version, only for use in the installation system.
 
 Package: systemd-standalone-sysusers
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Conflicts: systemd-sysusers,
            systemd (<< 249.3-3)
 Replaces: systemd-sysusers,
@@ -415,7 +415,7 @@ Description: standalone sysusers binary for use in non-systemd systems
  non-systemd systems.
 
 Package: systemd-standalone-tmpfiles
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Conflicts: systemd-tmpfiles,
            systemd (<< 249.3-3)
 Replaces: systemd-tmpfiles,
@@ -429,7 +429,7 @@ Description: standalone tmpfiles binary for use in non-systemd systems
  non-systemd systems.
 
 Package: systemd-oomd
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Breaks: systemd (<< 250.2-2~)
@@ -441,7 +441,7 @@ Description: userspace out-of-memory (OOM) killer
 
 Package: systemd-userdbd
 Build-Profiles: <!stage1>
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          systemd (= ${binary:Version}),
@@ -454,7 +454,7 @@ Description: dynamic user/group manager
 
 Package: systemd-homed
 Build-Profiles: <!stage1>
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Pre-Depends: ${misc:Pre-Depends},
              init-system-helpers (>= 1.64~),
 Depends: ${shlibs:Depends},
@@ -468,7 +468,7 @@ Description: home area manager
  directories on user login, tools and documentation.
 
 Package: systemd-boot
-Architecture: amd64 i386 arm64 armhf riscv64
+Architecture: amd64 arm64 armhf riscv64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          systemd-boot-efi (= ${binary:Version}),
@@ -502,7 +502,7 @@ Description: simple UEFI boot manager - EFI binaries
 Package: systemd-resolved
 Multi-Arch: foreign
 Priority: important
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index ce2c49f..a3dd3fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,19 @@ ifeq ($(DEB_VENDOR),Ubuntu)
     DEFAULT_NTP_SERVERS = ntp.ubuntu.com
     SUPPORT_URL = http://www.ubuntu.com/support
     CONFFLAGS_DISTRO =
+
+# On Ubuntu build and install only the libraries and EFI binaries for i386
+ifeq ($(DEB_HOST_ARCH),i386)
+# to stop dh_installdoc/dh_manpages/dh_auto_test from running
+export DEB_BUILD_PROFILES += nodoc nocheck
+override_dh_auto_build:
+	dh_auto_build -- systemd-stub systemd-boot libsystemd libudev devel
+
+# TODO: in compat 14 we can use dh_auto_install -- --no-rebuild --tags systemd-stub,systemd-boot,libsystemd,libudev,devel
+override_dh_auto_install:
+	cd obj-$(DEB_HOST_GNU_TYPE); meson install --no-rebuild --tags systemd-stub,systemd-boot,libsystemd,libudev,devel --destdir ../debian/tmp/
+endif
+
 else
     DEFAULT_NTP_SERVERS = 0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org
     SUPPORT_URL = https://www.debian.org/support
@@ -193,7 +206,9 @@ execute_before_dh_install:
 	rm -f debian/tmp/usr/lib/*.d/README
 	rm -f debian/tmp/usr/lib/sysctl.d/50-default.conf
 	rm -f debian/tmp/etc/X11/xinit/xinitrc.d/50-systemd-user.sh
-	rmdir -p --ignore-fail-on-non-empty debian/tmp/etc/X11/xinit/xinitrc.d/
+	if [ -d debian/tmp/etc/X11/xinit/xinitrc.d/ ]; then \
+		rmdir -p --ignore-fail-on-non-empty debian/tmp/etc/X11/xinit/xinitrc.d/; \
+	fi
 	# those files should probably be shipped in a -dev package, remove for now
 	rm -rf debian/tmp/usr/share/dbus-1/interfaces/
 	# remove files related to factory-reset feature
@@ -204,21 +219,26 @@ execute_before_dh_install:
 		-name etc.conf \) -print -delete
 	rm -rf debian/tmp/usr/share/factory/
 	# replace upstream sysusers.d/basic.conf with proper users for Debian
-	debian/extra/make-sysusers-basic > debian/tmp/usr/lib/sysusers.d/basic.conf
+	if [ -d debian/tmp/usr/lib/sysusers.d/ ]; then \
+		debian/extra/make-sysusers-basic > debian/tmp/usr/lib/sysusers.d/basic.conf; \
+	fi
 	# remove obsolete compat symlink
 	rm -f debian/tmp/usr/bin/systemd-resolve
 
 execute_after_dh_install:
 	# install standalone binaries
 	for pkg in sysusers tmpfiles; do \
+		test -f debian/systemd/bin/systemd-$$pkg.standalone || continue; \
 		mkdir -p debian/systemd-standalone-$$pkg/bin; \
 		mv debian/systemd/bin/systemd-$$pkg.standalone debian/systemd-standalone-$$pkg/bin/systemd-$$pkg; \
 	done
 
 	# we don't want /tmp to be a tmpfs by default
-	mv debian/systemd/lib/systemd/system/tmp.mount debian/systemd/usr/share/systemd/
-	printf '\n[Install]\nWantedBy=local-fs.target\n' >> debian/systemd/usr/share/systemd/tmp.mount
-	rm debian/systemd/lib/systemd/system/local-fs.target.wants/tmp.mount
+	if [ -d debian/systemd/usr/share/systemd/ ]; then \
+		mv debian/systemd/lib/systemd/system/tmp.mount debian/systemd/usr/share/systemd/; \
+		printf '\n[Install]\nWantedBy=local-fs.target\n' >> debian/systemd/usr/share/systemd/tmp.mount; \
+	fi
+	rm -f debian/systemd/lib/systemd/system/local-fs.target.wants/tmp.mount
 
 	# files shipped by cryptsetup
 ifeq (, $(filter stage1, $(DEB_BUILD_PROFILES)))
@@ -226,17 +246,21 @@ ifeq (, $(filter stage1, $(DEB_BUILD_PROFILES)))
 endif
 
 	# files shipped by systemd
-	rm debian/udev/lib/udev/rules.d/70-uaccess.rules
-	rm debian/udev/lib/udev/rules.d/73-seat-late.rules
-	rm debian/udev/lib/udev/rules.d/71-seat.rules
-	rm debian/udev/lib/udev/rules.d/99-systemd.rules
+	rm -f debian/udev/lib/udev/rules.d/70-uaccess.rules
+	rm -f debian/udev/lib/udev/rules.d/73-seat-late.rules
+	rm -f debian/udev/lib/udev/rules.d/71-seat.rules
+	rm -f debian/udev/lib/udev/rules.d/99-systemd.rules
 
 	# Ubuntu specific files
 ifeq ($(DEB_VENDOR),Ubuntu)
-	install -D --mode=644 debian/extra/udev.py debian/udev/usr/share/apport/package-hooks/udev.py
-	install -D --mode=644 debian/extra/systemd.py debian/systemd/usr/share/apport/package-hooks/systemd.py
-	install --mode=644 debian/extra/rules-ubuntu/*.rules debian/udev/lib/udev/rules.d/
-	cp -a debian/extra/units-ubuntu/* debian/systemd/lib/systemd/system/
+	if [ -d debian/udev/ ]; then \
+		install -D --mode=644 debian/extra/udev.py debian/udev/usr/share/apport/package-hooks/udev.py; \
+		install --mode=644 debian/extra/rules-ubuntu/*.rules debian/udev/lib/udev/rules.d/; \
+	fi
+	if [ -d debian/systemd/ ]; then \
+		install -D --mode=644 debian/extra/systemd.py debian/systemd/usr/share/apport/package-hooks/systemd.py; \
+		cp -a debian/extra/units-ubuntu/* debian/systemd/lib/systemd/system/; \
+	fi
 endif
 
 	# Remove unneeded file that produces errors in debugedit (LP: #1950445)
@@ -250,6 +274,7 @@ execute_after_dh_installman:
 	# run after dh_installman, which runs after dh_install, to include manpages
 	echo "Removing duplicate files in systemd package:"
 	set -e; for pkg in $(shell dh_listpackages -Nudev-udeb -Nlibudev1-udeb -Nsystemd -Nsystemd-standalone-sysusers -Nsystemd-standalone-tmpfiles); do \
+		(test -d debian/$$pkg/ && test -d debian/systemd/) || continue; \
 		echo "... from $$pkg..."; \
 		(cd debian/$$pkg; find -type f -o -type l) | (cd debian/systemd; xargs rm -f --verbose); \
 		(cd debian/$$pkg; find -mindepth 1 -type d | sort -r) | (cd debian/systemd; xargs rmdir --ignore-fail-on-non-empty --verbose || true); \