packaging: Disabling nscd entirely

configure --disable-nscd

Change-Id: Ia36c10bad5bd2eb75a64d97c7b618df672228864
Signed-off-by: Dongkyun, Son <dongkyun.s@samsung.com>

diff --git a/packaging/linaro-glibc.spec b/packaging/linaro-glibc.spec
index 66ac247..b154d02 100644 (file)
--- a/packaging/linaro-glibc.spec
+++ b/packaging/linaro-glibc.spec
@@ -75,8 +75,6 @@ Source8:        glibc_post_upgrade.c
 Source9:        glibc.rpmlintrc
 Source10:       baselibs.conf
 # For systemd 
-Source20:       nscd.conf
-Source21:       nscd.service
 Source1001:    glibc.manifest
 
 Requires(pre):  filesystem
@@ -131,17 +129,6 @@ Requires:       glibc = %{version}
 %description locale
 Locale data for the internationalisation features of the GNU C library.
 
-%package -n nscd
-Summary:        Name Service Caching Daemon
-License:        GPL-2.0+
-Group:          System/Service
-Provides:       glibc:/usr/sbin/nscd
-Requires:       glibc = %{version}
-
-%description -n nscd
-Nscd caches name service lookups and can dramatically improve
-performance with NIS, NIS+, and LDAP.
-
 %package profile
 Summary:        Libc Profiling and Debugging Versions
 License:        LGPL-2.1+ and LGPL-2.1+-with-GCC-exception and GPL-2.0+
@@ -295,7 +282,8 @@ configure_and_build_glibc() {
                --enable-multi-arch \
 %endif
                --enable-kernel=%{enablekernel} \
-               --enable-bind-now  --enable-obsolete-rpc
+               --enable-bind-now  --enable-obsolete-rpc \
+               --disable-nscd
        # explicitly set CFLAGS to use the full CFLAGS (not the reduced one for configure)
        make %{?_smp_mflags} #CFLAGS="$cflags" BUILD_CFLAGS="$cflags"
        cd ..
@@ -437,15 +425,6 @@ cp -p cc-base/manual/libc/*.html %{buildroot}%{_datadir}/doc/glibc
 %endif
 
 
-# nscd tools:
-
-cp nscd/nscd.conf %{buildroot}/etc
-mkdir -p %{buildroot}/etc/init.d
-ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
-mkdir -p %{buildroot}/var/run/nscd
-touch %{buildroot}/var/run/nscd/{passwd,group,hosts}
-touch %{buildroot}/var/run/nscd/{socket,nscd.pid}
-
 #
 # Create ld.so.conf
 #
@@ -474,11 +453,6 @@ for i in sbin/sln usr/bin/tzselect usr/sbin/zic usr/sbin/zdump etc/localtime; do
 done
 rm -rf %{buildroot}%{_datadir}/zoneinfo
 
-mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
-install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
-mkdir -p %{buildroot}/usr/lib/systemd/system
-install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system
-
 %ifarch armv7hl
 # Provide compatibility link
 ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
@@ -512,11 +486,6 @@ done
 %postun info
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
-%post -n nscd
-mkdir -p /var/run/nscd
-exit 0
-
-
 %files
 %manifest %{name}.manifest
 # glibc
@@ -695,22 +664,6 @@ exit 0
 %defattr(-,root,root)
 %{_prefix}/share/i18n
 
-%files -n nscd
-%manifest %{name}.manifest
-%defattr(-,root,root)
-%config(noreplace) /etc/nscd.conf
-%{_sbindir}/nscd
-%{_sbindir}/rcnscd
-/usr/lib/systemd/system/nscd.service
-%dir /usr/lib/tmpfiles.d
-/usr/lib/tmpfiles.d/nscd.conf
-%dir %attr(0755,root,root) %ghost /var/run/nscd
-%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/nscd.pid
-%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/socket
-%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/passwd
-%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/group
-%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/hosts
-
 %if %{build_profile}
 %files profile
 %manifest %{name}.manifest

diff --git a/packaging/nscd.conf b/packaging/nscd.conf
deleted file mode 100644 (file)
index ba48981..0000000
--- a/packaging/nscd.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/nscd 0755 root root

diff --git a/packaging/nscd.service b/packaging/nscd.service
deleted file mode 100644 (file)
index 6b4ea0e..0000000
--- a/packaging/nscd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-After=syslog.target
-
-[Service]
-ExecStart=/usr/sbin/nscd --foreground
-ExecStop=/usr/sbin/nscd --shutdown
-ExecReload=/usr/sbin/nscd -i passwd
-ExecReload=/usr/sbin/nscd -i group
-ExecReload=/usr/sbin/nscd -i hosts
-ExecReload=/usr/sbin/nscd -i services
-ExecReload=/usr/sbin/nscd -i netgroup
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-