!157 delete rpath
From: @yangmingtaip Reviewed-by: @openeuler-basic Signed-off-by: @openeuler-basic
This commit is contained in:
commit
0600509d0a
24
systemd.spec
24
systemd.spec
@ -20,7 +20,7 @@
|
|||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 248
|
Version: 248
|
||||||
Release: 10
|
Release: 11
|
||||||
License: MIT and LGPLv2+ and GPLv2+
|
License: MIT and LGPLv2+ and GPLv2+
|
||||||
Summary: System and Service Manager
|
Summary: System and Service Manager
|
||||||
|
|
||||||
@ -86,6 +86,7 @@ BuildRequires: gnu-efi gnu-efi-devel
|
|||||||
BuildRequires: valgrind-devel
|
BuildRequires: valgrind-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: util-linux
|
BuildRequires: util-linux
|
||||||
|
BuildRequires: chrpath
|
||||||
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
Requires(post): coreutils
|
Requires(post): coreutils
|
||||||
@ -401,6 +402,19 @@ install -m 0755 %{SOURCE105} %{buildroot}/usr/lib/udev
|
|||||||
install -m 0755 %{SOURCE106} %{buildroot}/usr/lib/udev
|
install -m 0755 %{SOURCE106} %{buildroot}/usr/lib/udev
|
||||||
install -m 0755 %{SOURCE107} %{buildroot}/usr/lib/udev
|
install -m 0755 %{SOURCE107} %{buildroot}/usr/lib/udev
|
||||||
|
|
||||||
|
# remove rpath info
|
||||||
|
for file in $(find %{buildroot}/ -executable -type f -exec file {} ';' | grep "\<ELF\>" | awk -F ':' '{print $1}')
|
||||||
|
do
|
||||||
|
if [ ! -u "$file" ]; then
|
||||||
|
if [ -w "$file" ]; then
|
||||||
|
chrpath -d $file
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# add rpath path /usr/lib/systemd in ld.so.conf.d
|
||||||
|
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
|
||||||
|
echo "/usr/lib/systemd" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%ninja_test -C %{_vpath_builddir}
|
%ninja_test -C %{_vpath_builddir}
|
||||||
|
|
||||||
@ -537,11 +551,15 @@ getent group systemd-resolve &>/dev/null || groupadd -r -g 193 systemd-resolve 2
|
|||||||
getent passwd systemd-resolve &>/dev/null || useradd -r -u 193 -l -g systemd-resolve -d / -s /sbin/nologin -c "systemd Resolver" systemd-resolve &>/dev/null || :
|
getent passwd systemd-resolve &>/dev/null || useradd -r -u 193 -l -g systemd-resolve -d / -s /sbin/nologin -c "systemd Resolver" systemd-resolve &>/dev/null || :
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
/sbin/ldconfig
|
||||||
systemd-machine-id-setup &>/dev/null || :
|
systemd-machine-id-setup &>/dev/null || :
|
||||||
systemctl daemon-reexec &>/dev/null || :
|
systemctl daemon-reexec &>/dev/null || :
|
||||||
journalctl --update-catalog &>/dev/null || :
|
journalctl --update-catalog &>/dev/null || :
|
||||||
systemd-tmpfiles --create &>/dev/null || :
|
systemd-tmpfiles --create &>/dev/null || :
|
||||||
|
|
||||||
|
%postun
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
# Make sure new journal files will be owned by the "systemd-journal" group
|
# Make sure new journal files will be owned by the "systemd-journal" group
|
||||||
machine_id=$(cat /etc/machine-id 2>/dev/null)
|
machine_id=$(cat /etc/machine-id 2>/dev/null)
|
||||||
chgrp systemd-journal /{run,var}/log/journal/{,${machine_id}} &>/dev/null || :
|
chgrp systemd-journal /{run,var}/log/journal/{,${machine_id}} &>/dev/null || :
|
||||||
@ -1218,6 +1236,7 @@ fi
|
|||||||
%config(noreplace) /etc/rc.d/init.d/README
|
%config(noreplace) /etc/rc.d/init.d/README
|
||||||
%dir /etc/xdg/systemd
|
%dir /etc/xdg/systemd
|
||||||
%config(noreplace) /etc/xdg/systemd/user
|
%config(noreplace) /etc/xdg/systemd/user
|
||||||
|
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||||
|
|
||||||
%{_libdir}/security/pam_systemd.so
|
%{_libdir}/security/pam_systemd.so
|
||||||
/usr/lib/rpm/macros.d/macros.systemd
|
/usr/lib/rpm/macros.d/macros.systemd
|
||||||
@ -1531,6 +1550,9 @@ fi
|
|||||||
%exclude /usr/share/man/man3/*
|
%exclude /usr/share/man/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Sep 4 2021 yangmingtai <yangmingtai@huawei.com> - 248-11
|
||||||
|
- systemd delete rpath
|
||||||
|
|
||||||
* Mon Aug 30 2021 yangmingtai <yangmingtai@huawei.com> - 248-10
|
* Mon Aug 30 2021 yangmingtai <yangmingtai@huawei.com> - 248-10
|
||||||
- enable some patches and delete unused patches
|
- enable some patches and delete unused patches
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user