Merge ~enr0n/ubuntu/+source/systemd:ubuntu-lunar-next into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-lunar
Status: | Merged |
---|---|
Merge reported by: | Lukas Märdian |
Merged at revision: | 1bec01746ec5b0e1613f23b3da1dfe1866af4b52 |
Proposed branch: | ~enr0n/ubuntu/+source/systemd:ubuntu-lunar-next |
Merge into: | ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-lunar |
Diff against target: |
120 lines (+92/-0) 4 files modified
debian/changelog (+13/-0) debian/patches/lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch (+55/-0) debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch (+22/-0) debian/patches/series (+2/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lukas Märdian | Approve | ||
Review via email: mp+438554@code.staging.launchpad.net |
Description of the change
PPA: https:/
autopkgtest results:
systemd 252.5-2ubuntu2~ppa5 (amd64) -- Pass: https:/
systemd 252.5-2ubuntu2~ppa5 (armhf) -- Pass: https:/
systemd 252.5-2ubuntu2~ppa5 (ppc64el) -- Pass: https:/
systemd 252.5-2ubuntu2~ppa5 (arm64) -- Pass: https:/
systemd 252.5-2ubuntu2~ppa5 (s390x) -- Pass: https:/
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Okay, so this is a post feature freeze upload. It only contains a targeted fix for bug #2004478 and also a drive-by fix for the test system, which is part of a bigger PR upstream, which can be dropped after v253 lands in Ubuntu: https:/ /github. com/systemd/ systemd/ pull/25986
LGTM overall.
But I had some trouble connecting the dots on d/p/sd- netlink- skip-test_ rtnl_set_ link_name- when-altnames- are.patch (it seemed a bit out of context). So I added some additional DEP3 headers to that patch, to make clear where it comes from and when it can be dropped exactly.
```diff lunar-next .bc515ad1742 100644 patches/ sd-netlink- skip-test_ rtnl_set_ link_name- when-altnames- are.patch /git.launchpad. net/~ubuntu- core-dev/ ubuntu/ +source/ systemd/ commit/ ?id=d047ef91f35 6f3998ac46cab67 7e0ec4abc197da /git.launchpad. net/~ubuntu- core-dev/ ubuntu/ +source/ systemd/ commit/ ?id=195985ee5aa 2cfdbbac178a07e 5b43b83f0550d0
$ git diff enr0n/ubuntu-
diff --git a/debian/changelog b/debian/changelog
index 3aaba0e14d3.
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ systemd (252.5-2ubuntu2) lunar; urgency=medium
This has already been fixed upstream by a larger commit, so this patch
can be dropped when we have a new enough upstream version.
File: debian/
- https:/
+ https:/
-- Nick Rosbrook <email address hidden> Wed, 08 Mar 2023 12:51:51 -0500
diff --git a/debian/ patches/ sd-netlink- skip-test_ rtnl_set_ link_name- when-altnames- are.patch b/debian/ patches/ sd-netlink- skip-test_ rtnl_set_ link_name- when-altnames- are.patch .9ce7b03b85f 100644 patches/ sd-netlink- skip-test_ rtnl_set_ link_name- when-altnames- are.patch patches/ sd-netlink- skip-test_ rtnl_set_ link_name- when-altnames- are.patch set_link_ name when altnames are not set_link_ name when altnames are not supported /github. com/systemd/ systemd/ pull/25986 (v253) dep.debian. net/deps/ dep3/ d/sd-netlink/ test-netlink. c | 2 ++
index b0e852b94db.
--- a/debian/
+++ b/debian/
@@ -1,8 +1,13 @@
From: Nick Rosbrook <email address hidden>
Date: Thu, 2 Mar 2023 10:07:00 -0500
-Subject: sd-netlink: skip test_rtnl_
- supported
-
+Subject: sd-netlink: skip test_rtnl_
+Origin: vendor, Ubuntu
+Applied-Upstream: https:/
+Acked-by: Lukas Märdian <email address hidden>
+Forwarded: not-needed
+Last-Update: 2023-03-09
+---
+This patch header follows DEP-3: http://
---
src/libsystem
1 file changed, 2 insertions(+)
```