diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-05-12 23:36:35 +0300 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-05-12 23:43:45 +0300 |
| commit | e5e772b10ee7d0329a5eb0618a914ed9c620379d (patch) | |
| tree | 1bfd7d93a3b8e16a7edeec48f60cbbb3ac157768 /sys-libs/glibc/glibc-9999.ebuild | |
| parent | sci-libs/linux-gpib-modules: Version bump (diff) | |
| download | gentoo-e5e772b10ee7d0329a5eb0618a914ed9c620379d.tar.gz gentoo-e5e772b10ee7d0329a5eb0618a914ed9c620379d.tar.bz2 gentoo-e5e772b10ee7d0329a5eb0618a914ed9c620379d.zip | |
sys-libs/glibc: Use etc files from FILESDIR instead of patchset
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'sys-libs/glibc/glibc-9999.ebuild')
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 32cac60af6ee..cc1528ef61a1 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1316,11 +1316,15 @@ glibc_do_src_install() { # Install misc network config files insinto /etc - doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf - doins "${WORKDIR}"/extra/etc/*.conf + doins posix/gai.conf nss/nsswitch.conf + + # Gentoo-specific + newins "${FILESDIR}"/host.conf-1 host.conf if use nscd ; then - doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)" + doins nscd/nscd.conf + + newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd local nscd_args=( -e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):" @@ -1330,9 +1334,6 @@ glibc_do_src_install() { systemd_dounit nscd/nscd.service systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf - else - # Do this since extra/etc/*.conf above might have nscd.conf. - rm -f "${ED}"/etc/nscd.conf fi echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc |