Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change when ldconfig runs and what files it looks for #1861

Merged
merged 1 commit into from
Dec 10, 2021
Merged

Change when ldconfig runs and what files it looks for #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/glibc/glibc-tmpfiles.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
f /etc/ld.so.conf 0644 root root -
C /etc/ld.so.conf 0644 root root -
f /etc/ld.so.cache 0644 root root -
d /etc/ld.so.conf.d/ 0644 root root -
d /run/cache/ldconfig 0700 root root -
f /run/cache/ldconfig/aux-cache 0600 root root -
14 changes: 13 additions & 1 deletion packages/glibc/glibc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ License: LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH GCC-exception-2.0) AND GP
URL: http://www.gnu.org/software/glibc/
Source0: https://ftp.gnu.org/gnu/glibc/glibc-%{version}.tar.xz
Source1: glibc-tmpfiles.conf
Source2: ld.so.conf
Source3: ldconfig-service.conf

# Upstream patches from 2.34 release branch:
# ```
Expand Down Expand Up @@ -93,9 +95,13 @@ make %{?_smp_mflags} -O -r
%install
make -j1 install_root=%{buildroot} install -C build

mkdir -p %{buildroot}%{_cross_tmpfilesdir}
install -d %{buildroot}%{_cross_tmpfilesdir}
install -d %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}
install -d %{buildroot}%{_cross_unitdir}/ldconfig.service.d

install -p -m 0644 %{S:1} %{buildroot}%{_cross_tmpfilesdir}/glibc.conf
install -p -m 0644 %{S:2} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf
install -p -m 0644 %{S:3} %{buildroot}%{_cross_unitdir}/ldconfig.service.d/ldconfig.conf

truncate -s 0 %{buildroot}%{_cross_libdir}/gconv/gconv-modules
chmod 644 %{buildroot}%{_cross_libdir}/gconv/gconv-modules
Expand Down Expand Up @@ -177,6 +183,12 @@ chmod 644 %{buildroot}%{_cross_datadir}/locale/locale.alias
%exclude %{_cross_datadir}/locale/*
%exclude %{_cross_localstatedir}/db/Makefile

%dir %{_cross_factorydir}
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf

%dir %{_cross_unitdir}/ldconfig.service.d
%{_cross_libdir}/systemd/system/ldconfig.service.d/ldconfig.conf

%files devel
%{_cross_libdir}/*.a
%{_cross_libdir}/*.o
Expand Down
1 change: 1 addition & 0 deletions packages/glibc/ld.so.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ld.so.conf.d/*.conf
4 changes: 4 additions & 0 deletions packages/glibc/ldconfig-service.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Unit]
# Run `ldconfig.service` after `tmpfilesd`, since `ldconfig` will attempt to
# read files from `/etc/ld.so.conf.d`, which are created by `tmpfilesd`
After=systemd-tmpfiles-setup.service