Create util-linux-libs RPM package with libraries (#2953)

Change systemd.spec to depend on util-linux-libs
Update toolchain and pkgcore manifests

SPECS/systemd/systemd.spec

@@ -1,7 +1,7 @@
 Summary:        Systemd-250
 Name:           systemd
 Version:        250.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPLv2+ AND GPLv2+ AND MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -42,7 +42,7 @@ Requires:       pam
 Requires:       xz
 Requires(post): audit-libs
 Requires(post): pam
-Requires(post): util-linux-devel
+Requires(post): util-linux-libs
 Obsoletes:      systemd-bootstrap
 Provides:       systemd-units = %{version}-%{release}
 Provides:       systemd-sysv = %{version}-%{release}
@@ -258,6 +258,9 @@ systemctl preset-all
 %files lang -f %{name}.lang
 
 %changelog
+* Mon May 02 2022 Sriram Nambakam <snambakam@microsoft.com> - 250.3-5
+- Change Requires(post) to depend on util-linux-libs
+
 * Wed Apr 13 2022 Cameron Baird <cameronbaird@microsoft.com> - 250.3-4
 - Bring in an upstream change as patch fix-journald-audit-logging.patch
 - to prevent many-fielded audit messages from crashing systemd-journal

SPECS/util-linux/util-linux.spec

@@ -1,7 +1,7 @@
 Summary:        Utilities for file systems, consoles, partitions, and messages
 Name:           util-linux
 Version:        2.37.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -14,7 +14,7 @@ BuildRequires:  audit-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  pam-devel
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       audit-libs
 Conflicts:      toybox
 Provides:       %{name}-ng = %{version}-%{release}
@@ -40,6 +40,7 @@ These are the additional language files of util-linux.
 Summary:        Header and library files for util-linux
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Provides:       libmount-devel = %{version}-%{release}
 Provides:       libblkid = %{version}-%{release}
 Provides:       libblkid-devel = %{version}-%{release}
@@ -51,6 +52,13 @@ Provides:       libsmartcols-devel = %{version}-%{release}
 %description devel
 These are the header and library files of util-linux.
 
+%package libs
+Summary:        library files for util-linux
+Group:          Development/Libraries
+
+%description libs
+These are library files of util-linux.
+
 %prep
 %setup -q
 sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' $(grep -rl '%{_sysconfdir}/adjtime' .)
@@ -116,21 +124,27 @@ rm -rf %{buildroot}/lib/systemd/system
 %files lang -f %{name}.lang
 %defattr(-,root,root)
 
-%files devel
+%files libs
 %defattr(-,root,root)
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libsmartcols/COPYING
-%license libblkid/COPYING
-%{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 /lib/libblkid.so.*
 /lib/libmount.so.*
 /lib/libuuid.so.*
 /lib/libsmartcols.so.*
 /lib/libfdisk.so.*
+
+%files devel
+%defattr(-,root,root)
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later libsmartcols/COPYING
+%license libblkid/COPYING
+%{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue May 03 2022 Sriram Nambakam <snambakam@microsoft.com> - 2.36.2-5
+- Split libraries into the util-linux-libs package
+
 * Mon Mar 14 2022 Daniel McIlvaney <damcilva@microsoft.com> - 2.36.2-4
 - Add Debian's PAM configs for runuser tool
 - Add build require on pam-devel so we have the pam headers

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -65,8 +65,8 @@ gzip-1.11-1.cm2.aarch64.rpm
 make-4.3-2.cm2.aarch64.rpm
 mariner-release-2.0-11.cm2.noarch.rpm
 patch-2.7.6-7.cm2.aarch64.rpm
-util-linux-2.37.2-4.cm2.aarch64.rpm
-util-linux-devel-2.37.2-4.cm2.aarch64.rpm
+util-linux-2.37.2-5.cm2.aarch64.rpm
+util-linux-libs-2.37.2-5.cm2.aarch64.rpm
 tar-1.34-1.cm2.aarch64.rpm
 xz-5.2.5-1.cm2.aarch64.rpm
 xz-devel-5.2.5-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -65,8 +65,8 @@ gzip-1.11-1.cm2.x86_64.rpm
 make-4.3-2.cm2.x86_64.rpm
 mariner-release-2.0-11.cm2.noarch.rpm
 patch-2.7.6-7.cm2.x86_64.rpm
-util-linux-2.37.2-4.cm2.x86_64.rpm
-util-linux-devel-2.37.2-4.cm2.x86_64.rpm
+util-linux-2.37.2-5.cm2.x86_64.rpm
+util-linux-libs-2.37.2-5.cm2.x86_64.rpm
 tar-1.34-1.cm2.x86_64.rpm
 xz-5.2.5-1.cm2.x86_64.rpm
 xz-devel-5.2.5-1.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -560,10 +560,11 @@ texinfo-6.8-1.cm2.aarch64.rpm
 texinfo-debuginfo-6.8-1.cm2.aarch64.rpm
 unzip-6.0-19.cm2.aarch64.rpm
 unzip-debuginfo-6.0-19.cm2.aarch64.rpm
-util-linux-2.37.2-4.cm2.aarch64.rpm
-util-linux-debuginfo-2.37.2-4.cm2.aarch64.rpm
-util-linux-devel-2.37.2-4.cm2.aarch64.rpm
-util-linux-lang-2.37.2-4.cm2.aarch64.rpm
+util-linux-2.37.2-5.cm2.aarch64.rpm
+util-linux-libs-2.37.2-5.cm2.aarch64.rpm
+util-linux-debuginfo-2.37.2-5.cm2.aarch64.rpm
+util-linux-devel-2.37.2-5.cm2.aarch64.rpm
+util-linux-lang-2.37.2-5.cm2.aarch64.rpm
 wget-1.21.2-1.cm2.aarch64.rpm
 wget-debuginfo-1.21.2-1.cm2.aarch64.rpm
 which-2.21-8.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -560,10 +560,11 @@ texinfo-6.8-1.cm2.x86_64.rpm
 texinfo-debuginfo-6.8-1.cm2.x86_64.rpm
 unzip-6.0-19.cm2.x86_64.rpm
 unzip-debuginfo-6.0-19.cm2.x86_64.rpm
-util-linux-2.37.2-4.cm2.x86_64.rpm
-util-linux-debuginfo-2.37.2-4.cm2.x86_64.rpm
-util-linux-devel-2.37.2-4.cm2.x86_64.rpm
-util-linux-lang-2.37.2-4.cm2.x86_64.rpm
+util-linux-2.37.2-5.cm2.x86_64.rpm
+util-linux-libs-2.37.2-5.cm2.x86_64.rpm
+util-linux-debuginfo-2.37.2-5.cm2.x86_64.rpm
+util-linux-devel-2.37.2-5.cm2.x86_64.rpm
+util-linux-lang-2.37.2-5.cm2.x86_64.rpm
 wget-1.21.2-1.cm2.x86_64.rpm
 wget-debuginfo-1.21.2-1.cm2.x86_64.rpm
 which-2.21-8.cm2.x86_64.rpm