Browse Source

nss-mdns: unbreak after e1eba3d97 (system/skeleton: make nsswitch install conditional)

Fixes http://autobuild.buildroot.net/results/481/4819cacd4b7015ef2bfaaf1b3fc9ba33f9194315/

After commit e1eba3d97, the skeleton no longer has a /etc/nsswitch.conf by
the time nss-mdns gets built, so the sed invocation fails.

Work around it by installing the glibc one early if not already available
in the skeleton.

If we want to do further modification of nsswitch.conf in the future (for
E.G.  samba), then we should probably introduce some hooks to
GLIBC_COPY_NSSWITCH_FILE instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 10 năm trước cách đây
mục cha
commit
c7c0ca288d
1 tập tin đã thay đổi với 3 bổ sung0 xóa
  1. 3 0
      package/nss-mdns/nss-mdns.mk

+ 3 - 0
package/nss-mdns/nss-mdns.mk

@@ -10,6 +10,9 @@ NSS_MDNS_LICENSE = LGPLv2.1+
 NSS_MDNS_LICENSE_FILES = LICENSE
 NSS_MDNS_LICENSE_FILES = LICENSE
 
 
 define NSS_MDNS_INSTALL_CONFIG
 define NSS_MDNS_INSTALL_CONFIG
+	if [ ! -f "$(TARGET_DIR)/etc/nsswitch.conf" ]; then \
+		$(INSTALL) -D -m 0644 package/glibc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf ; \
+	fi
 	sed -r -i -e 's/^(hosts:[[:space:]]+).*/\1files mdns4_minimal [NOTFOUND=return] dns mdns4/' \
 	sed -r -i -e 's/^(hosts:[[:space:]]+).*/\1files mdns4_minimal [NOTFOUND=return] dns mdns4/' \
 	    $(TARGET_DIR)/etc/nsswitch.conf
 	    $(TARGET_DIR)/etc/nsswitch.conf
 endef
 endef