void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glibc: use upstream nscd conf/systemd files; install etc/gai.conf; drop glibc extra deps.

Browse source 
The glibc pkg does not depend anymore on base-files and glibc-locales, instead
the target pkg should depend on them (base-system, base-chroot, etc).
This commit is contained in:
Juan RP 2014-03-03 09:16:51 +01:00
parent 6eef3ce288
commit cdf6da3181
5 changed files with 9 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/glibc/files/nscd.conf
View file

@ -1,8 +0,0 @@
# Configuration file for nscd(8).
#
logfile /var/log/nscd.log
server-user nobody
enable-cache passwd yes
enable-cache group yes
enable-cache hosts yes
enable-cache services yes

11
srcpkgs/glibc/files/nscd.service
View file

@ -1,11 +0,0 @@
[Unit]
Description=Name Service Cache Daemon
[Service]
ExecStart=/usr/sbin/nscd -d
ExecStop=/usr/sbin/nscd --shutdown
Restart=always
[Install]
WantedBy=multi-user.target
Also=nscd.socket

8
srcpkgs/glibc/files/nscd.socket
View file

@ -1,8 +0,0 @@
[Unit]
Description=Name Service Cache Daemon Socket
[Socket]
ListenStream=/var/run/nscd/socket
[Install]
WantedBy=sockets.target

2
srcpkgs/glibc/files/nscd.tmpfiles.d
View file

@ -1,2 +0,0 @@
d /var/run/nscd 0755 root root -
d /var/db/nscd 0755 root root -

15
srcpkgs/glibc/template
View file

@ -1,7 +1,7 @@
# Template file for 'glibc' # Template file for 'glibc'
pkgname=glibc pkgname=glibc
version=2.19 version=2.19
revision=1 revision=2
bootstrap=yes bootstrap=yes
# Force creation of -dbg pkg, required by valgrind. # Force creation of -dbg pkg, required by valgrind.
force_debug_pkgs=yes force_debug_pkgs=yes
@ -25,8 +25,8 @@ nostrip_files="
XBS5_LP64_OFF64" XBS5_LP64_OFF64"
conf_files=" conf_files="
/etc/rpc /etc/rpc
/etc/gai.conf
/etc/ld.so.conf" /etc/ld.so.conf"
depends="base-files glibc-locales>=${version}_${revision}"
if [ "$CHROOT_READY" ]; then if [ "$CHROOT_READY" ]; then
hostmakedepends="bison perl" hostmakedepends="bison perl"
@ -107,6 +107,10 @@ do_install() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
armv?l) ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 ${DESTDIR}/usr/lib/ld-linux.so.3;; armv?l) ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 ${DESTDIR}/usr/lib/ld-linux.so.3;;
esac esac
vinstall ${wrksrc}/posix/gai.conf 644 etc
rm -rf ${DESTDIR}/var/db
} }
glibc-devel_package() { glibc-devel_package() {
@ -136,9 +140,8 @@ nscd_package() {
short_desc+=" - Name Service Cache Daemon" short_desc+=" - Name Service Cache Daemon"
pkg_install() { pkg_install() {
vmove usr/sbin/nscd vmove usr/sbin/nscd
vinstall ${FILESDIR}/nscd.service 644 usr/lib/systemd/system vinstall ${wrksrc}/nscd/nscd.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/nscd.socket 644 usr/lib/systemd/system vinstall ${wrksrc}/nscd/nscd.tmpfiles 644 usr/lib/tmpfiles.d nscd.conf
vinstall ${FILESDIR}/nscd.tmpfiles.d 644 usr/lib/tmpfiles.d nscd.conf vinstall ${wrksrc}/nscd/nscd.conf 644 etc
vinstall ${FILESDIR}/nscd.conf 644 etc
} }
} }