Merge ~enr0n/ubuntu/+source/systemd:ubuntu-kinetic into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-kinetic

[Nick Rosbrook]

[Jeremy Bícha (jbicha)]

libnss-myhostname is also in Universe and is recommended by systemd-resolved. Should that recommendation be dropped?

[Nick Rosbrook (enr0n)]

Good point, yeah it probably should be.

[Steve Langasek (vorlon)]

LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 28bfe73..4740d17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+systemd (251.4-1ubuntu6) kinetic; urgency=medium
+
+  * test: deny-list TEST-36-NUMAPOLICY on ppc64el (LP: #1989969)
+    File: debian/patches/lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0f61b31fbeb57cf7e47a5f0922fd2ff47b81caa7
+  * debian/control: drop systemd-resolved Recommends: (LP: #1990187)
+    libnss-resolve was previously explicitly excluded from ubuntu-minimal,
+    and this Recommends: reverses that change. While here, drop
+    libnss-myhostname too, because it is in universe and there is no real
+    need for systemd-resolved to Recommends: it.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=88c134fac13b738efdcc657e160350c061d0a018
+  * debian/control: set Priority: important on systemd-resolved (LP: #1990278)
+    Since this package used to be a part of the systemd binary package,
+    systemd-resolved would be installed by debootstrap by default. Retain
+    this previous behavior by setting Priority: important on
+    systemd-resolved.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1d9ca06dfe8351ed4d03073fbafa5e2212fe4fcb
+
+ -- Nick Rosbrook <[e-mail]>  Tue, 20 Sep 2022 11:19:06 -0400
+
+systemd (251.4-1ubuntu5) kinetic; urgency=medium
+
+  * enable building systemd-boot for riscv64 (LP: #1989457) 
+
+ -- Heinrich Schuchardt <[e-mail]>  Tue, 13 Sep 2022 13:43:01 +0200
+
 systemd (251.4-1ubuntu4) kinetic; urgency=medium
 
   * debian/systemd-resolved.postinst: copy existing /etc/resolv.conf on new installs (LP: #1988772)
diff --git a/debian/control b/debian/control
index 406d686..43ded98 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper-compat (= 13),
                meson (>= 0.53.2),
                gettext,
                gperf,
-               gnu-efi [amd64 i386 arm64 armhf],
+               gnu-efi [amd64 i386 arm64 armhf riscv64],
                libcap-dev,
                libpam0g-dev,
                libapparmor-dev (>= 2.13) <!stage1>,
@@ -477,7 +477,7 @@ Description: home area manager
  directories on user login, tools and documentation.
 
 Package: systemd-boot
-Architecture: amd64 i386 arm64 armhf
+Architecture: amd64 i386 arm64 armhf riscv64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          systemd-boot-efi (= ${binary:Version}),
@@ -495,7 +495,7 @@ Description: simple UEFI boot manager - tools and services
  systemd-boot.
 
 Package: systemd-boot-efi
-Architecture: amd64 i386 arm64 armhf
+Architecture: amd64 i386 arm64 armhf riscv64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
@@ -510,6 +510,7 @@ Description: simple UEFI boot manager - EFI binaries
 
 Package: systemd-resolved
 Multi-Arch: foreign
+Priority: important
 Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
@@ -517,8 +518,6 @@ Depends: ${shlibs:Depends},
          adduser,
          systemd (= ${binary:Version}),
          default-dbus-system-bus | dbus-system-bus
-Recommends: libnss-myhostname,
-            libnss-resolve,
 Suggests: policykit-1,
 Provides: resolvconf
 Conflicts: resolvconf
diff --git a/debian/patches/lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch b/debian/patches/lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch
new file mode 100644
index 0000000..592e798
--- /dev/null
+++ b/debian/patches/lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch
@@ -0,0 +1,18 @@
+From: Nick Rosbrook <[e-mail]>
+Date: Fri, 16 Sep 2022 10:05:38 -0400
+Subject: test: deny-list TEST-36-NUMAPOLICY on ppc64el
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1989969
+
+---
+ test/TEST-36-NUMAPOLICY/deny-list-upstream-ci-ppc64el | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test/TEST-36-NUMAPOLICY/deny-list-upstream-ci-ppc64el
+
+diff --git a/test/TEST-36-NUMAPOLICY/deny-list-upstream-ci-ppc64el b/test/TEST-36-NUMAPOLICY/deny-list-upstream-ci-ppc64el
+new file mode 100644
+index 0000000..0febce5
+--- /dev/null
++++ b/test/TEST-36-NUMAPOLICY/deny-list-upstream-ci-ppc64el
+@@ -0,0 +1 @@
++# https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1989969
diff --git a/debian/patches/series b/debian/patches/series
index 7c6674d..f85c48e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,4 @@ test-increase-QEMU_MEM-for-some-tests.patch
 test-copy-libgcc_s.so.1-to-TPM2-test-image-on-Debian-like.patch
 lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
 test-denylist-TEST-29-PORTABLE-again.patch
+lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch