Merge ~bluca/ubuntu/+source/systemd:jammy_repart into ubuntu/+source/systemd:ubuntu/jammy-devel

[Luca Boccassi]

Enable systemd-repart and ship it in a new systemd-repart package.

https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1897932

[Lukas Märdian (slyon)]

We got some response from the SRU team (@racb):

https://lists.ubuntu.com/archives/ubuntu-devel/2022-August/042250.html

Basically he suggests doing this change in a PPA/jammy-backports, or as a entirely new package:

* "what if you were to put systemd-repart as a new package into a PPA, or into jammy-backports?"
* "In general, adding new entirely new packages is considered OK from a regression risk perspective."

Would this work for you @bluca?

[Luca Boccassi (bluca)]

I've replied on list - I can work on updating this PR to add the new package

[Luca Boccassi (bluca)]

Updated to add a new systemd-repart package.

[Lukas Märdian (slyon)]

Thank you Luca, for splitting out the new files into its own systemd-repart binary.

I've staged the changes to provide an upgrade path in Kinetic++:
https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?h=ubuntu-kinetic&id=2281670aa8007179170d5cc485bb94e3bbc3b63c

Furthermore, I've re-wrote d/changelog, using "gbp dch", as we usually do in Ubuntu.
And modified d/t/control to add the new binary as a test dependency to the "upstream-2" test case, this avoids skipping TEST-58-REPART.

I've rolled the change into the currently pending Jammy SRU at:
https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd

For reference, the new "libssl-dev" build dependency is required to allow for a hmac calculation in sd-repart. Alternatively, this commit could be backported to avoid the dependency: https://github.com/systemd/systemd/commit/ade99252e2cdd9eeff78566789008996d27e4dc0

review: Approve

Unmerged commits

862c15a... by Luca Boccassi on 2021-12-24

Enable systemd-repart and ship it in a new systemd-repart package

Add fdisk as test dependency, needed by test-repart which calls sfdisk.
Add libfdisk-dev/libssl-dev as dependencies, needed for systemd-repart.

diff --git a/debian/changelog b/debian/changelog
index 95b5b03..7e3d8d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+systemd (249.11-0ubuntu3.5) jammy; urgency=medium
+
+  * Enable systemd-repart and ship it in the main systemd package.
+    (LP: #1897932)
+
+ -- Luca Boccassi <[e-mail]>  Thu, 28 Jul 2022 15:35:24 +0100
+
 systemd (249.11-0ubuntu3.4) jammy; urgency=medium
 
   [ Mustafa Kemal Gilor ]
diff --git a/debian/control b/debian/control
index 103384a..b568352 100644
--- a/debian/control
+++ b/debian/control
@@ -45,12 +45,14 @@ Build-Depends: debhelper-compat (= 13),
                libkmod-dev (>= 15),
                libblkid-dev (>= 2.24),
                libmount-dev (>= 2.30),
+               libfdisk-dev (>= 2.33),
                libseccomp-dev (>= 2.3.1) [amd64 arm64 armel armhf i386 mips mipsel mips64 mips64el x32 powerpc ppc64 ppc64el riscv64 s390x],
                libdw-dev (>= 0.158) <!stage1>,
                libpolkit-gobject-1-dev <!stage1>,
                libzstd-dev (>= 1.4.0),
                libtss2-dev [!i386] <!stage1>,
                libfido2-dev <!stage1>,
+               libssl-dev <!stage1>,
                linux-base <!nocheck>,
                acl <!nocheck>,
                python3:native,
@@ -63,6 +65,7 @@ Build-Depends: debhelper-compat (= 13),
                iproute2 <!nocheck>,
                zstd <!nocheck>,
                gawk <!nocheck>,
+               fdisk <!nocheck>,
 
 Package: systemd
 Architecture: linux-any
@@ -448,3 +451,15 @@ Description: Userspace out-of-memory (OOM) killer
  systemd-oomd is a system service that uses cgroups-v2 and
  pressure stall information (PSI) to monitor and take action on
  processes before an OOM occurs in kernel space.
+
+Package: systemd-repart
+Section: admin
+Architecture: linux-any
+Priority: optional
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         systemd (= ${binary:Version}),
+Description: Provides the systemd-repart utility
+ systemd-repart is a configuration-driven system partitioning tool. It follows
+ the Discoverable Partitions Specification and provides support for encryption
+ and dm-verity among other things.
diff --git a/debian/rules b/debian/rules
index 201ba05..41945f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,15 +77,15 @@ CONFFLAGS = \
 	-Dfirstboot=false \
 	-Dxkbcommon=false \
 	-Dwheel-group=false \
-	-Drepart=false \
 	-Duserdb=false \
 	-Dhomed=false \
 	-Dlibfido2=true \
-	-Dfdisk=false \
 	-Dpwquality=false \
 	-Dp11kit=false \
 	-Dtpm2=$(if $(filter i386,$(DEB_HOST_ARCH)),false,true) \
 	-Doomd=true \
+	-Drepart=true \
+	-Dfdisk=true \
 	-Dsysext=true \
 	-Dnscd=true \
 	-Dntp-servers="$(DEFAULT_NTP_SERVERS)" \
diff --git a/debian/systemd-repart.install b/debian/systemd-repart.install
 new file mode 100644
index 0000000..4cf6bae
--- /dev/null
+++ b/debian/systemd-repart.install
@@ -0,0 +1,6 @@
+bin/systemd-repart
+lib/systemd/system/initrd-root-fs.target.wants/systemd-repart.service
+lib/systemd/system/sysinit.target.wants/systemd-repart.service
+lib/systemd/system/systemd-repart.service
+usr/share/man/man5/repart*
+usr/share/man/man8/systemd-repart*