pool/util-linux
SHA256
2
0
Fork 4
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1061167 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1061167
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=263
This commit is contained in:
Dominique Leuenberger 2023-01-27 09:15:09 +00:00 committed by Git OBS Bridge
commit c3e6e68a5e
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util-linux.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Jan 26 08:07:21 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- 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 <dimstar@opensuse.org>
- 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 <dimstar@opensuse.org> Wed Jan 11 07:58:00 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

42
util-linux.spec
View File

@ -27,11 +27,13 @@
%define psuffix -core %define psuffix -core
%define ulbuild base %define ulbuild base
%define ulsubset core %define ulsubset core
%define core %nil
%endif %endif
%if "%{flavor}" == "systemd" %if "%{flavor}" == "systemd"
%define ulbuild base %define ulbuild base
%define ulsubset systemd %define ulsubset systemd
%define core %exclude
%endif %endif
# All python flavors are build separately. No module can be built together with base. # All python flavors are build separately. No module can be built together with base.
@ -1024,7 +1026,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%exclude %{_bindir}/lsfd %exclude %{_bindir}/lsfd
%exclude %{_bindir}/lsipc %exclude %{_bindir}/lsipc
%exclude %{_bindir}/lsirq %exclude %{_bindir}/lsirq
%{_bindir}/lslocks %exclude %{_bindir}/lslocks
%{_bindir}/lslogins %{_bindir}/lslogins
%exclude %{_bindir}/lsmem %exclude %{_bindir}/lsmem
%exclude %{_bindir}/lsns %exclude %{_bindir}/lsns
@ -1093,9 +1095,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%exclude %{_sbindir}/swapon %exclude %{_sbindir}/swapon
%exclude %{_sbindir}/switch_root %exclude %{_sbindir}/switch_root
%exclude %{_sbindir}/wipefs %exclude %{_sbindir}/wipefs
%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall %exclude %{_bindir}/wall
%exclude %{_bindir}/whereis %exclude %{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write %exclude %{_bindir}/write
%exclude %{_sbindir}/zramctl %exclude %{_sbindir}/zramctl
%exclude %{_sbindir}/flushb %exclude %{_sbindir}/flushb
%exclude %{_sbindir}/readprofile %exclude %{_sbindir}/readprofile
@ -1237,32 +1239,32 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
# Files not common for all architectures # Files not common for all architectures
%ifnarch ia64 m68k %ifnarch ia64 m68k
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
/sbin/fdisk %core /sbin/fdisk
%endif %endif
%{_sbindir}/fdisk %core %{_sbindir}/fdisk
%{_mandir}/man8/fdisk.8.gz %core %{_mandir}/man8/fdisk.8.gz
%endif %endif
%ifnarch %sparc ia64 m68k %ifnarch %sparc ia64 m68k
%{_mandir}/man8/cfdisk.8.gz %core %{_mandir}/man8/cfdisk.8.gz
%{_mandir}/man8/sfdisk.8.gz %core %{_mandir}/man8/sfdisk.8.gz
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
/sbin/cfdisk %core /sbin/cfdisk
/sbin/sfdisk %core /sbin/sfdisk
%endif %endif
%{_sbindir}/cfdisk %core %{_sbindir}/cfdisk
%{_sbindir}/sfdisk %core %{_sbindir}/sfdisk
%endif %endif
%ifnarch s390 s390x %ifnarch s390 s390x
%{_sbindir}/fdformat %core %{_sbindir}/fdformat
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
/sbin/hwclock %core /sbin/hwclock
%endif %endif
%{_sbindir}/hwclock %core %{_sbindir}/hwclock
%{_bindir}/setterm %core %{_bindir}/setterm
%{_sbindir}/tunelp %core %{_sbindir}/tunelp
%{_mandir}/man8/fdformat.8.gz %core %{_mandir}/man8/fdformat.8.gz
%{_mandir}/man8/hwclock.8.gz %core %{_mandir}/man8/hwclock.8.gz
%{_mandir}/man8/tunelp.8.gz %core %{_mandir}/man8/tunelp.8.gz
%endif %endif
%if "%ulsubset" == "core" %if "%ulsubset" == "core"