From 875ce0bf503b6b8b2cf35b39a1b2776aee118645 Mon Sep 17 00:00:00 2001 From: mirko Date: Sat, 28 Apr 2012 22:24:12 +0000 Subject: [toolchain/glibc*] purge support for glibc - use eglibc instead! for reference: http://www.mail-archive.com/openwrt-devel@lists.openwrt.org/msg13425.html git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31503 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/Makefile | 8 ++------ package/base-files/eglibc-files/etc/nsswitch.conf | 13 +++++++++++++ package/base-files/glibc-files/etc/nsswitch.conf | 13 ------------- 3 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 package/base-files/eglibc-files/etc/nsswitch.conf delete mode 100644 package/base-files/glibc-files/etc/nsswitch.conf (limited to 'package/base-files') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a230b1bf0..b22e6b308 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -516,8 +516,8 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) use_libnsl=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl) use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files) - define Package/glibc/install - $(CP) ./glibc-files/* $(1)/ + define Package/eglibc/install + $(CP) ./eglibc-files/* $(1)/ rm -f $(1)/etc/localtime ln -sf /tmp/localtime $(1)/etc/localtime $(INSTALL_DIR) $(1)/lib @@ -534,10 +534,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) done endef - define Package/eglibc/install - $(call Package/glibc/install,$1) - endef - define Package/uClibc/install $(INSTALL_DIR) $(1)/lib $(CP) \ diff --git a/package/base-files/eglibc-files/etc/nsswitch.conf b/package/base-files/eglibc-files/etc/nsswitch.conf new file mode 100644 index 000000000..981c425da --- /dev/null +++ b/package/base-files/eglibc-files/etc/nsswitch.conf @@ -0,0 +1,13 @@ +passwd:files +shadow:files +group:files +hosts:dns files +bootparams:files +ethers:files +netmasks:files +networks:files +protocols:files +rpc:files +services:files +automount:files +aliases:files diff --git a/package/base-files/glibc-files/etc/nsswitch.conf b/package/base-files/glibc-files/etc/nsswitch.conf deleted file mode 100644 index 981c425da..000000000 --- a/package/base-files/glibc-files/etc/nsswitch.conf +++ /dev/null @@ -1,13 +0,0 @@ -passwd:files -shadow:files -group:files -hosts:dns files -bootparams:files -ethers:files -netmasks:files -networks:files -protocols:files -rpc:files -services:files -automount:files -aliases:files -- cgit v1.2.3