From 91145f2d354a55405e81dfe3f0049f8bf6eede456b3d3a69391049b2d7869621 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 25 Jan 2023 12:04:36 +0000 Subject: [PATCH 1/2] Accepting request 1060870 from home:dimstar:Factory - Exclude these binaries from the -systemd build, as they exist in the core package already: + /usr/bin/lslocks + /usr/bin/setterm + /usr/bin/wall + /usr/bin/write + /usr/sbin/cfdisk + /usr/sbin/fdformat + /usr/sbin/fdisk + /usr/sbin/hwclock + /usr/sbin/sfdisk + /usr/sbin/tunelp OBS-URL: https://build.opensuse.org/request/show/1060870 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=490 --- util-linux.changes | 16 ++++++++++++++++ util-linux.spec | 20 ++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index ce00a21..52e68fa 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Jan 25 11:30:57 UTC 2023 - Dominique Leuenberger + +- Exclude these binaries from the -systemd build, as they exist in + the core package already: + + /usr/bin/lslocks + + /usr/bin/setterm + + /usr/bin/wall + + /usr/bin/write + + /usr/sbin/cfdisk + + /usr/sbin/fdformat + + /usr/sbin/fdisk + + /usr/sbin/hwclock + + /usr/sbin/sfdisk + + /usr/sbin/tunelp + ------------------------------------------------------------------- Wed Jan 11 07:58:00 UTC 2023 - Dominique Leuenberger diff --git a/util-linux.spec b/util-linux.spec index 0d74d2b..6923a7b 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1024,7 +1024,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %exclude %{_bindir}/lsfd %exclude %{_bindir}/lsipc %exclude %{_bindir}/lsirq -%{_bindir}/lslocks +%exclude %{_bindir}/lslocks %{_bindir}/lslogins %exclude %{_bindir}/lsmem %exclude %{_bindir}/lsns @@ -1093,9 +1093,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %exclude %{_sbindir}/swapon %exclude %{_sbindir}/switch_root %exclude %{_sbindir}/wipefs -%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall +%exclude %{_bindir}/wall %exclude %{_bindir}/whereis -%verify(not mode) %attr(0755,root,tty) %{_bindir}/write +%exclude %{_bindir}/write %exclude %{_sbindir}/zramctl %exclude %{_sbindir}/flushb %exclude %{_sbindir}/readprofile @@ -1249,17 +1249,17 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : /sbin/cfdisk /sbin/sfdisk %endif -%{_sbindir}/cfdisk -%{_sbindir}/sfdisk +%exclude %{_sbindir}/cfdisk +%exclude %{_sbindir}/sfdisk %endif %ifnarch s390 s390x -%{_sbindir}/fdformat +%exclude %{_sbindir}/fdformat %if %{ul_extra_bin_sbin} -/sbin/hwclock +%exclude /sbin/hwclock %endif -%{_sbindir}/hwclock -%{_bindir}/setterm -%{_sbindir}/tunelp +%exclude %{_sbindir}/hwclock +%exclude %{_bindir}/setterm +%exclude %{_sbindir}/tunelp %{_mandir}/man8/fdformat.8.gz %{_mandir}/man8/hwclock.8.gz %{_mandir}/man8/tunelp.8.gz From 33ebcb5fab40b6e81a3fb851bca46b8f60c626de90bb58f250002b6e214ab272 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 26 Jan 2023 10:11:48 +0000 Subject: [PATCH 2/2] Accepting request 1061130 from home:dimstar:Factory - Fix previous commit: setterm, cfdisk, fdformat, hwclock, sfdisk, and tunelp unintentionally fell out of both variants. + /usr/bin/lslocks + /usr/bin/setterm + /usr/bin/wall + /usr/bin/write + /usr/sbin/cfdisk + /usr/sbin/fdformat + /usr/sbin/fdisk + /usr/sbin/hwclock + /usr/sbin/sfdisk + /usr/sbin/tunelp OBS-URL: https://build.opensuse.org/request/show/1061130 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=491 --- util-linux.changes | 26 ++++++++++++++++---------- util-linux.spec | 36 +++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index 52e68fa..ad4e8ba 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,18 +1,24 @@ +------------------------------------------------------------------- +Thu Jan 26 08:07:21 UTC 2023 - Dominique Leuenberger + +- Fix previous commit: setterm, cfdisk, fdformat, hwclock, sfdisk, + and tunelp unintentionally fell out of both variants. + ------------------------------------------------------------------- Wed Jan 25 11:30:57 UTC 2023 - Dominique Leuenberger - Exclude these binaries from the -systemd build, as they exist in the core package already: - + /usr/bin/lslocks - + /usr/bin/setterm - + /usr/bin/wall - + /usr/bin/write - + /usr/sbin/cfdisk - + /usr/sbin/fdformat - + /usr/sbin/fdisk - + /usr/sbin/hwclock - + /usr/sbin/sfdisk - + /usr/sbin/tunelp + + /usr/bin/lslocks + + /usr/bin/setterm + + /usr/bin/wall + + /usr/bin/write + + /usr/sbin/cfdisk + + /usr/sbin/fdformat + + /usr/sbin/fdisk + + /usr/sbin/hwclock + + /usr/sbin/sfdisk + + /usr/sbin/tunelp ------------------------------------------------------------------- Wed Jan 11 07:58:00 UTC 2023 - Dominique Leuenberger diff --git a/util-linux.spec b/util-linux.spec index 6923a7b..cbc55d8 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -27,11 +27,13 @@ %define psuffix -core %define ulbuild base %define ulsubset core +%define core %nil %endif %if "%{flavor}" == "systemd" %define ulbuild base %define ulsubset systemd +%define core %exclude %endif # All python flavors are build separately. No module can be built together with base. @@ -1237,32 +1239,32 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : # Files not common for all architectures %ifnarch ia64 m68k %if %{ul_extra_bin_sbin} -/sbin/fdisk +%core /sbin/fdisk %endif -%{_sbindir}/fdisk -%{_mandir}/man8/fdisk.8.gz +%core %{_sbindir}/fdisk +%core %{_mandir}/man8/fdisk.8.gz %endif %ifnarch %sparc ia64 m68k -%{_mandir}/man8/cfdisk.8.gz -%{_mandir}/man8/sfdisk.8.gz +%core %{_mandir}/man8/cfdisk.8.gz +%core %{_mandir}/man8/sfdisk.8.gz %if %{ul_extra_bin_sbin} -/sbin/cfdisk -/sbin/sfdisk +%core /sbin/cfdisk +%core /sbin/sfdisk %endif -%exclude %{_sbindir}/cfdisk -%exclude %{_sbindir}/sfdisk +%core %{_sbindir}/cfdisk +%core %{_sbindir}/sfdisk %endif %ifnarch s390 s390x -%exclude %{_sbindir}/fdformat +%core %{_sbindir}/fdformat %if %{ul_extra_bin_sbin} -%exclude /sbin/hwclock +%core /sbin/hwclock %endif -%exclude %{_sbindir}/hwclock -%exclude %{_bindir}/setterm -%exclude %{_sbindir}/tunelp -%{_mandir}/man8/fdformat.8.gz -%{_mandir}/man8/hwclock.8.gz -%{_mandir}/man8/tunelp.8.gz +%core %{_sbindir}/hwclock +%core %{_bindir}/setterm +%core %{_sbindir}/tunelp +%core %{_mandir}/man8/fdformat.8.gz +%core %{_mandir}/man8/hwclock.8.gz +%core %{_mandir}/man8/tunelp.8.gz %endif %if "%ulsubset" == "core"