testing/util-linux
SHA256
3
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 1061130 from home:dimstar:Factory

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2023-01-26 10:11:48 +00:00 committed by Git OBS Bridge
parent 91145f2d35
commit 33ebcb5fab
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
util-linux.changes
View File

@ -1,18 +1,24 @@
-------------------------------------------------------------------
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> Wed Jan 25 11:30:57 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Exclude these binaries from the -systemd build, as they exist in - Exclude these binaries from the -systemd build, as they exist in
the core package already: the core package already:
+ /usr/bin/lslocks + /usr/bin/lslocks
+ /usr/bin/setterm + /usr/bin/setterm
+ /usr/bin/wall + /usr/bin/wall
+ /usr/bin/write + /usr/bin/write
+ /usr/sbin/cfdisk + /usr/sbin/cfdisk
+ /usr/sbin/fdformat + /usr/sbin/fdformat
+ /usr/sbin/fdisk + /usr/sbin/fdisk
+ /usr/sbin/hwclock + /usr/sbin/hwclock
+ /usr/sbin/sfdisk + /usr/sbin/sfdisk
+ /usr/sbin/tunelp + /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>

36
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.
@ -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
%exclude %{_sbindir}/cfdisk %core %{_sbindir}/cfdisk
%exclude %{_sbindir}/sfdisk %core %{_sbindir}/sfdisk
%endif %endif
%ifnarch s390 s390x %ifnarch s390 s390x
%exclude %{_sbindir}/fdformat %core %{_sbindir}/fdformat
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
%exclude /sbin/hwclock %core /sbin/hwclock
%endif %endif
%exclude %{_sbindir}/hwclock %core %{_sbindir}/hwclock
%exclude %{_bindir}/setterm %core %{_bindir}/setterm
%exclude %{_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"