Add systemd-bootstrap-libs subpackage. (#8370)

SPECS/systemd-bootstrap/systemd-bootstrap.spec

@@ -1,7 +1,7 @@
 Summary:        Bootstrap version of systemd. Workaround for systemd circular dependency.
 Name:           systemd-bootstrap
 Version:        250.3
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        LGPLv2+ AND GPLv2+ AND MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -67,6 +67,7 @@ BuildRequires:  python3-jinja2
 BuildRequires:  util-linux-devel
 BuildRequires:  xz-devel
 Requires:       %{name}-rpm-macros = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       glib
 Requires:       kmod
 Requires:       libcap
@@ -79,6 +80,12 @@ AutoReq:        no
 %description
 Systemd is an init replacement with better process control and security
 
+%package libs
+Summary:        systemd libraries
+
+%description libs
+Systemd libraries
+
 %package rpm-macros
 Summary:        Macros that define paths and scriptlets related to systemd
 BuildArch:      noarch
@@ -245,7 +252,6 @@ fi
 /lib/security
 %{_libdir}/sysctl.d
 %{_libdir}/tmpfiles.d
-/lib/*.so*
 %{_libdir}/modprobe.d/systemd.conf
 %{_libdir}/sysusers.d/*
 %{_bindir}/*
@@ -261,6 +267,9 @@ fi
 %{_datadir}/zsh/*
 %dir %{_localstatedir}/log/journal
 
+%files libs
+/lib/*.so*
+
 %files rpm-macros
 %{_libdir}/rpm
 
@@ -276,6 +285,9 @@ fi
 %{_datadir}/pkgconfig/udev.pc
 
 %changelog
+* Mon Mar 11 2024 Daniel McIlvaney <damcilva@microsoft.com> - 250.3-17
+- Split libs into their own subpackage to align with full systemd.
+
 * Tue Feb 27 2024 Daniel McIlvaney <damcilva@microsoft.com> - 250.3-16
 - Take rpm-macros from the new systemd-255 package so they are interchangeable
 
@@ -298,7 +310,7 @@ fi
 * Wed Dec 14 2022 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 250.3-10
 - Add patch for CVE-2022-45873
 
-* Wed Nov 29 2022 Daniel McIlvaney <damcilva@microsoft.com> - 250.3-9
+* Wed Nov 30 2022 Daniel McIlvaney <damcilva@microsoft.com> - 250.3-9
 - Conditionally run systemctl preset-all only when first installing systemd, not on upgrades
 
 * Fri Nov 18 2022 Sam Meluch <sammeluch@microsoft.com> - 250.3-8

SPECS/systemd/systemd.spec

@@ -50,7 +50,7 @@ Version:        255
 # determine the build information from local checkout
 Version:        %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
 %endif
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 # FIXME - hardcode to 'stable' for now as that's what we have in our blobstore
 %global stable 1
@@ -344,6 +344,7 @@ Obsoletes:      systemd-compat-libs < 230
 Obsoletes:      nss-myhostname < 0.4
 Provides:       nss-myhostname = 0.4
 Provides:       nss-myhostname%{_isa} = 0.4
+Obsoletes:      systemd-bootstrap-libs <= %{version}-%{release}
 
 %description libs
 Libraries for systemd and udev.
@@ -1186,6 +1187,9 @@ rm -f %{name}.lang
 # %autochangelog. So we need to continue manually maintaining the
 # changelog here.
 %changelog
+* Mon Mar 11 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-8
+- Obsolete the new systemd-bootstrap-libs subpacakge.
+
 * Thu Feb 22 2024 Dan Streetman <ddstreet@microsoft.com> - 255-7
 - remove use of %%azure (or %%azl) macro
 

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -571,10 +571,11 @@ sqlite-devel-3.44.0-1.azl3.aarch64.rpm
 sqlite-libs-3.44.0-1.azl3.aarch64.rpm
 swig-4.1.1-1.azl3.aarch64.rpm
 swig-debuginfo-4.1.1-1.azl3.aarch64.rpm
-systemd-bootstrap-250.3-16.azl3.aarch64.rpm
+systemd-bootstrap-250.3-17.azl3.aarch64.rpm
-systemd-bootstrap-debuginfo-250.3-16.azl3.aarch64.rpm
+systemd-bootstrap-debuginfo-250.3-17.azl3.aarch64.rpm
-systemd-bootstrap-devel-250.3-16.azl3.aarch64.rpm
+systemd-bootstrap-devel-250.3-17.azl3.aarch64.rpm
-systemd-bootstrap-rpm-macros-250.3-16.azl3.noarch.rpm
+systemd-bootstrap-libs-250.3-17.azl3.aarch64.rpm
+systemd-bootstrap-rpm-macros-250.3-17.azl3.noarch.rpm
 tar-1.35-1.azl3.aarch64.rpm
 tar-debuginfo-1.35-1.azl3.aarch64.rpm
 tdnf-3.5.6-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -577,10 +577,11 @@ sqlite-devel-3.44.0-1.azl3.x86_64.rpm
 sqlite-libs-3.44.0-1.azl3.x86_64.rpm
 swig-4.1.1-1.azl3.x86_64.rpm
 swig-debuginfo-4.1.1-1.azl3.x86_64.rpm
-systemd-bootstrap-250.3-16.azl3.x86_64.rpm
+systemd-bootstrap-250.3-17.azl3.x86_64.rpm
-systemd-bootstrap-debuginfo-250.3-16.azl3.x86_64.rpm
+systemd-bootstrap-debuginfo-250.3-17.azl3.x86_64.rpm
-systemd-bootstrap-devel-250.3-16.azl3.x86_64.rpm
+systemd-bootstrap-devel-250.3-17.azl3.x86_64.rpm
-systemd-bootstrap-rpm-macros-250.3-16.azl3.noarch.rpm
+systemd-bootstrap-libs-250.3-17.azl3.x86_64.rpm
+systemd-bootstrap-rpm-macros-250.3-17.azl3.noarch.rpm
 tar-1.35-1.azl3.x86_64.rpm
 tar-debuginfo-1.35-1.azl3.x86_64.rpm
 tdnf-3.5.6-1.azl3.x86_64.rpm