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

Accepting request 1092872 from home:kukuk:cleanup

Browse Source 
Sometimes util-linux failed for me, because the SYSTEMD_DEP grep matches auto*.cache* und similar files. I don't understand why sometimes and sometimes not, but the new expression is much more robust.

With util-linux 2.40 and systemd v254 the tty tools will depend on libsystemd, so build tty-tools as subpackage of systemd already now. Has no impact today, but allows already to test the current pre-versions.

OBS-URL: https://build.opensuse.org/request/show/1092872
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=514
This commit is contained in:
Jan Engelhardt 2023-06-14 00:59:17 +00:00 committed by Git OBS Bridge
parent c6a167f252
commit 682c2c092c
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util-linux.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 13 11:48:38 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
- UTIL_LINUX_FOUND_SYSTEMD_DEPS: make grep more robust
- util-linux-tty-tools: build together with systemd in preparation
of util-linux 2.40 together with systemd v254
-------------------------------------------------------------------
Fri Jun 9 13:35:33 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>

54
util-linux.spec
View File

@ -359,6 +359,14 @@ Requires: libuuid-devel = %{version}
Files to develop applications using the library to generate universally
unique IDs (UUIDs).
%lang_package
%endif
# ulsubset == core
####################
# Systemd packages #
####################
%if "%ulsubset" == "systemd"
%package -n util-linux-tty-tools
Summary: Tools for writing to TTYs
License: BSD-3-Clause
@ -372,14 +380,6 @@ Provides: util-linux:%{_bindir}/write
%description -n util-linux-tty-tools
Tools that write to TTYs that the current user does not own.
%lang_package
%endif
# ulsubset == core
####################
# Systemd packages #
####################
%if "%ulsubset" == "systemd"
%package -n uuidd
Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
License: GPL-2.0-or-later
@ -524,7 +524,7 @@ bash ./util-linux-login_defs-check.sh
#
# WARNING: Never edit following line without doing all suggested in the echo below!
UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/findmnt.c ./misc-utils/logger.c ./misc-utils/lsblk-properties.c ./misc-utils/uuidd.c '
UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIB\(SYSTEMD\|UDEV\)' . | grep -F '.c' | LC_ALL=C sort | tr '\n' ' ')
UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIB\(SYSTEMD\|UDEV\)' . | grep '\.c$' | LC_ALL=C sort | tr '\n' ' ')
if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ; then
echo "List of utilities depending on systemd have changed.
Please check the new util-linux-systemd file list, file removal and update of Conflicts for safe update!
@ -714,11 +714,14 @@ exit "$result"
%verifyscript
%verify_permissions -e %{_bindir}/mount -e %{_bindir}/umount
%verify_permissions -e %{_bindir}/su
%endif
%dnl # ulsubset == core, ulbuild == base
%if "%ulsubset" == "systemd"
%verifyscript -n util-linux-tty-tools
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write
%endif
%dnl # ulsubset == core, ulbuild == base
%dnl # ulsubset == systemd, ulbuild == base
%endif
%dnl # ulbuild == base
@ -793,9 +796,6 @@ done
%postun -n libfdisk1 -p /sbin/ldconfig
%post -n util-linux-tty-tools
%set_permissions %{_bindir}/wall %{_bindir}/write
%endif
%dnl # ulsubset == core, pre & post
%dnl
@ -841,6 +841,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%postun -n uuidd
%{service_del_postun uuidd.socket uuidd.service}
%post -n util-linux-tty-tools
%set_permissions %{_bindir}/wall %{_bindir}/write
%endif
%dnl # ulsubset == systemd, pre & post
%dnl
@ -1485,18 +1488,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_libdir}/libuuid.so.1
%{_libdir}/libuuid.so.1.*
%files -n util-linux-tty-tools
%{_bindir}/mesg
%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_mandir}/man1/mesg.1.gz
%{_mandir}/man1/wall.1.gz
%{_mandir}/man1/write.1.gz
%{_datadir}/bash-completion/completions/wall
%{_datadir}/bash-completion/completions/write
%{_datadir}/bash-completion/completions/mesg
# devel, lang and uuidd files are not packaged in staging mode
# and packaged separately in full mode
# FIXME: Is it needed?
@ -1567,6 +1558,19 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_sbindir}/rcuuidd
%{_unitdir}/uuidd.service
%{_unitdir}/uuidd.socket
%files -n util-linux-tty-tools
%{_bindir}/mesg
%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_mandir}/man1/mesg.1.gz
%{_mandir}/man1/wall.1.gz
%{_mandir}/man1/write.1.gz
%{_datadir}/bash-completion/completions/wall
%{_datadir}/bash-completion/completions/write
%{_datadir}/bash-completion/completions/mesg
%endif
# ulsubset == systemd