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

Proposed by Nick Rosbrook
Status: Work in progress
Proposed branch: ~enr0n/ubuntu/+source/systemd:ubuntu-lunar
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-lunar
Diff against target: 40 lines (+13/-0)
3 files modified
debian/changelog (+11/-0)
debian/libsystemd-dev.install (+1/-0)
debian/rules (+1/-0)
Reviewer Review Type Date Requested Status
Canonical Foundations Team slyon Pending
Review via email: mp+439397@code.launchpad.net

Description of the change

Change our build so that the static libsystemd.a is shipped in libsystemd-dev.

I also sent this to Debian: https://salsa.debian.org/systemd-team/systemd/-/merge_requests/194.

This built in my PPA (https://launchpad.net/~enr0n/+archive/ubuntu/systemd) and I tested an install of libsystemd-dev to confirm the change. I did not feel it necessary to trigger PPA autopkgtests for this change.

To post a comment you must log in.
Revision history for this message
Nick Rosbrook (enr0n) wrote :

I set this to "Work in progress" because Debian maintainers had some additional requests on my Debian PR. Since this is not urgent I would rather make sure Debian is OK with the changes before we bring this into Ubuntu.

Unmerged commits

5a0e632... by Nick Rosbrook

Release systemd 252.5-2ubuntu4

8ef4e82... by Nick Rosbrook

Update changelog

a6e4396... by Nick Rosbrook

debian: ship libsystemd.a in libsystemd-dev (LP: #2012437)

Thanks: Serge Hallyn

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index cb44d04..0513164 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+systemd (252.5-2ubuntu4) lunar; urgency=medium
7+
8+ * debian: ship libsystemd.a in libsystemd-dev (LP: #2012437)
9+ Thanks to Serge Hallyn
10+ Files:
11+ - debian/libsystemd-dev.install
12+ - debian/rules
13+ https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a6e4396db702b5470c80c8f88597c0ce76ceeb8b
14+
15+ -- Nick Rosbrook <nick.rosbrook@canonical.com> Wed, 22 Mar 2023 11:01:12 -0400
16+
17 systemd (252.5-2ubuntu3) lunar; urgency=medium
18
19 * udev: gracefully handle rename failures (LP: #2002445)
20diff --git a/debian/libsystemd-dev.install b/debian/libsystemd-dev.install
21index 5a73373..9c256f7 100644
22--- a/debian/libsystemd-dev.install
23+++ b/debian/libsystemd-dev.install
24@@ -1,3 +1,4 @@
25 usr/include/systemd/
26 usr/lib/*/libsystemd.so
27+usr/lib/*/libsystemd.a
28 usr/lib/*/pkgconfig/libsystemd.pc
29diff --git a/debian/rules b/debian/rules
30index ce2c49f..c8b9208 100755
31--- a/debian/rules
32+++ b/debian/rules
33@@ -33,6 +33,7 @@ endif
34 CONFFLAGS = \
35 -Db_lto=true \
36 -Db_pie=true \
37+ -Dstatic-libsystemd=true \
38 -Dmode=release \
39 -Drootlibdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
40 -Dsplit-usr=true \

Subscribers

People subscribed via source and target branches