Explicitly run ldconfig in the buildroot
This commit is contained in:
parent
48a71633e6
commit
6ff958f2aa
52
glibc.spec
52
glibc.spec
|
@ -1,6 +1,6 @@
|
||||||
%define glibcsrcdir glibc-2.26.9000-1217-gcdd14619a7
|
%define glibcsrcdir glibc-2.26.9000-1217-gcdd14619a7
|
||||||
%define glibcversion 2.26.9000
|
%define glibcversion 2.26.9000
|
||||||
%define glibcrelease 50%{?dist}
|
%define glibcrelease 51%{?dist}
|
||||||
# Pre-release tarballs are pulled in from git using a command that is
|
# Pre-release tarballs are pulled in from git using a command that is
|
||||||
# effectively:
|
# effectively:
|
||||||
#
|
#
|
||||||
|
@ -352,10 +352,22 @@ Linux system will not function.
|
||||||
# File triggers to do ldconfig calls automatically (see rhbz#1380878)
|
# File triggers to do ldconfig calls automatically (see rhbz#1380878)
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
# File triggers for when libraries are added or removed in standard paths
|
# File triggers for when libraries are added or removed in standard
|
||||||
%transfiletriggerin -p /sbin/ldconfig -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
|
# paths. Use Lua to avoid a dependency on /bin/sh. Due to an RPM
|
||||||
|
# spec file parser deficiency, we cannot move the trigger into a
|
||||||
|
# subpackage.
|
||||||
|
%transfiletriggerin -p <lua> -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
|
||||||
|
os.execute("/sbin/ldconfig")
|
||||||
|
%end
|
||||||
|
|
||||||
|
%transfiletriggerpostun -p <lua> -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
|
||||||
|
os.execute("/sbin/ldconfig")
|
||||||
|
%end
|
||||||
|
|
||||||
|
# We need to run ldconfig manually because ldconfig cannot handle the
|
||||||
|
# relative include path in the /etc/ld.so.conf file we gneerate.
|
||||||
|
%undefine __brp_ldconfig
|
||||||
|
|
||||||
%transfiletriggerpostun -p /sbin/ldconfig -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
@ -373,12 +385,6 @@ accessing NIS services.
|
||||||
This library is provided for backwards compatibility only;
|
This library is provided for backwards compatibility only;
|
||||||
applications should use libnsl2 instead to gain IPv6 support.
|
applications should use libnsl2 instead to gain IPv6 support.
|
||||||
|
|
||||||
%post -n libnsl
|
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%postun -n libnsl
|
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# glibc "devel" sub-package
|
# glibc "devel" sub-package
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
@ -1122,6 +1128,18 @@ rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1
|
||||||
# Further, see https://github.com/projectatomic/rpm-ostree/pull/1173#issuecomment-355014583
|
# Further, see https://github.com/projectatomic/rpm-ostree/pull/1173#issuecomment-355014583
|
||||||
rm -f ${RPM_BUILD_ROOT}/{usr/,}sbin/sln
|
rm -f ${RPM_BUILD_ROOT}/{usr/,}sbin/sln
|
||||||
|
|
||||||
|
######################################################################
|
||||||
|
# Run ldconfig to create all the symbolic links we need
|
||||||
|
######################################################################
|
||||||
|
|
||||||
|
# Note: This has to happen before creating /etc/ld.so.conf.
|
||||||
|
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig
|
||||||
|
truncate -s 0 $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache
|
||||||
|
|
||||||
|
# ldconfig is statically linked, so we can use the new version.
|
||||||
|
${RPM_BUILD_ROOT}/sbin/ldconfig -N -r ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Install info files
|
# Install info files
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
@ -1681,9 +1699,6 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
|
||||||
truncate -s 0 $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive
|
truncate -s 0 $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig
|
|
||||||
truncate -s 0 $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Run the glibc testsuite
|
# Run the glibc testsuite
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
@ -1819,8 +1834,6 @@ end
|
||||||
|
|
||||||
%post -p %{_prefix}/sbin/glibc_post_upgrade.%{_target_cpu}
|
%post -p %{_prefix}/sbin/glibc_post_upgrade.%{_target_cpu}
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%posttrans all-langpacks -e -p <lua>
|
%posttrans all-langpacks -e -p <lua>
|
||||||
-- If at the end of the transaction we are still installed
|
-- If at the end of the transaction we are still installed
|
||||||
-- (have a template of non-zero size), then we rebuild the
|
-- (have a template of non-zero size), then we rebuild the
|
||||||
|
@ -1860,10 +1873,6 @@ if [ "$1" = 0 ]; then
|
||||||
fi
|
fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%post utils -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%postun utils -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%pre -n nscd
|
%pre -n nscd
|
||||||
getent group nscd >/dev/null || /usr/sbin/groupadd -g 28 -r nscd
|
getent group nscd >/dev/null || /usr/sbin/groupadd -g 28 -r nscd
|
||||||
getent passwd nscd >/dev/null ||
|
getent passwd nscd >/dev/null ||
|
||||||
|
@ -1992,6 +2001,11 @@ fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 29 2018 Florian Weimer <fweimer@redhat.com> - 2.26.9000-51
|
||||||
|
- Explicitly run ldconfig in the buildroot
|
||||||
|
- Do not run ldconfig from scriptlets
|
||||||
|
- Put triggers into the glibc-common package, do not pass arguments to ldconfig
|
||||||
|
|
||||||
* Mon Jan 29 2018 Florian Weimer <fweimer@redhat.com> - 2.26.9000-50
|
* Mon Jan 29 2018 Florian Weimer <fweimer@redhat.com> - 2.26.9000-50
|
||||||
- Auto-sync with upstream branch master,
|
- Auto-sync with upstream branch master,
|
||||||
commit cdd14619a713ab41e26ba700add4880604324dbb:
|
commit cdd14619a713ab41e26ba700add4880604324dbb:
|
||||||
|
|
Loading…
Reference in New Issue