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

Accepting request 1248301 from Base:System

Browse Source 
- Delete /usr/sbin/rc* symlinks
- Drop bashisms from build recipe

OBS-URL: https://build.opensuse.org/request/show/1248301
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=295
This commit is contained in:
Dominique Leuenberger 2025-02-27 13:48:59 +00:00 committed by Git OBS Bridge
commit 6e30656a72
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util-linux.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 24 17:16:49 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Delete /usr/sbin/rc* symlinks
- Drop bashisms from build recipe
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 28 23:05:38 UTC 2025 - Stanislav Brabec <sbrabec@suse.com> Tue Jan 28 23:05:38 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>

30
util-linux.spec
View File

@ -485,38 +485,38 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE"
# Here we define a build function. For the base build, we use it as it # Here we define a build function. For the base build, we use it as it
# is. For python build, we use it repeatedly for all flavors. # is. For python build, we use it repeatedly for all flavors.
function configure_and_build() { configure_and_build() {
# configure options depending on ulbuild and ulsubset values # configure options depending on ulbuild and ulsubset values
configure_options="" configure_options=""
# libmagic is only used for determining in more(1) whether or not a file # libmagic is only used for determining in more(1) whether or not a file
# is binary. but it has builtin code that is doing the same with a simpler # is binary. but it has builtin code that is doing the same with a simpler
# check and the libmagic database dependency is rather large (9MB+) # check and the libmagic database dependency is rather large (9MB+)
configure_options+="--without-libmagic " configure_options="$configure_options --without-libmagic "
%if "%ulbuild" == "python" %if "%ulbuild" == "python"
%define _configure ../configure %define _configure ../configure
configure_options+="--disable-all-programs " configure_options="$configure_options --disable-all-programs "
configure_options+="--with-python " configure_options="$configure_options --with-python "
configure_options+="--enable-pylibmount " configure_options="$configure_options --enable-pylibmount "
configure_options+="--enable-libmount " configure_options="$configure_options --enable-libmount "
configure_options+="--enable-libblkid " configure_options="$configure_options --enable-libblkid "
%endif %endif
# ulbuild == python # ulbuild == python
%if "%ulbuild" == "base" %if "%ulbuild" == "base"
configure_options+="--enable-all-programs " configure_options="$configure_options --enable-all-programs "
configure_options+="--without-python " configure_options="$configure_options --without-python "
%endif %endif
# ulbuild == base # ulbuild == base
%if "%ulsubset" == "core" %if "%ulsubset" == "core"
configure_options+="--without-systemd --disable-liblastlog2" configure_options="$configure_options --without-systemd --disable-liblastlog2"
%endif %endif
# ulsubset == core # ulsubset == core
%if "%ulsubset" == "systemd" %if "%ulsubset" == "systemd"
configure_options+="--with-systemd " configure_options="$configure_options --with-systemd "
%endif %endif
# ulsubset == systemd # ulsubset == systemd
@ -562,7 +562,7 @@ configure_options+="--with-systemd "
--with-vendordir=%{_distconfdir}\ --with-vendordir=%{_distconfdir}\
--disable-libmount-mountfd-support\ --disable-libmount-mountfd-support\
$configure_options $configure_options
make %{?_smp_mflags} %make_build
} }
################ ################
@ -613,7 +613,7 @@ fi
################ ################
%if "%ulbuild" == "base" %if "%ulbuild" == "base"
%make_install %make_install
mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/issue.d} mkdir -p "%{buildroot}/%{_distconfdir}/default" "%{buildroot}/%{_pam_vendordir}" "%{buildroot}/%{_sysconfdir}/issue.d"
install -m 644 %{SOURCE51} %{buildroot}%{_distconfdir}/blkid.conf install -m 644 %{SOURCE51} %{buildroot}%{_distconfdir}/blkid.conf
touch %{buildroot}%{_sysconfdir}/blkid.conf touch %{buildroot}%{_sysconfdir}/blkid.conf
mkdir %{buildroot}%{_sysconfdir}/blkid.conf.d %{buildroot}%{_distconfdir}/blkid.conf.d mkdir %{buildroot}%{_sysconfdir}/blkid.conf.d %{buildroot}%{_distconfdir}/blkid.conf.d
@ -714,8 +714,6 @@ mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
%else %else
# ulsubset != core, ulbuild == base # ulsubset != core, ulbuild == base
echo -n "" >%{name}.lang echo -n "" >%{name}.lang
ln -sf /sbin/service %{buildroot}%{_sbindir}/rcuuidd
ln -sf /sbin/service %{buildroot}%{_sbindir}/rcfstrim
%endif %endif
# ulsubset == core, ulbuild == base # ulsubset == core, ulbuild == base
@ -1587,7 +1585,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%exclude %{_mandir}/man8/parisc64.8.gz %exclude %{_mandir}/man8/parisc64.8.gz
%exclude %{_mandir}/man8/uname26.8.gz %exclude %{_mandir}/man8/uname26.8.gz
%{_sbindir}/rcfstrim
%{_unitdir}/fstrim.service %{_unitdir}/fstrim.service
%{_unitdir}/fstrim.timer %{_unitdir}/fstrim.timer
%endif %endif
@ -1734,7 +1731,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
%{_datadir}/bash-completion/completions/uuidd %{_datadir}/bash-completion/completions/uuidd
%{_mandir}/man8/uuidd.8.gz %{_mandir}/man8/uuidd.8.gz
%{_sbindir}/rcuuidd
%{_unitdir}/uuidd.service %{_unitdir}/uuidd.service
%{_unitdir}/uuidd.socket %{_unitdir}/uuidd.socket