From 31e6d08f20a804fccb958e19045d8f9e9806071a Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 8 Jan 2019 17:12:52 +0800 Subject: netbase/base-files: move /etc/hosts from netbase to base-files Move /etc/hosts to base-files, and also add entry to it according to hostname setting. This fixes the problem of commands like `hostname -f' failing due to lack of such entry. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-core/netbase/netbase/hosts | 8 -------- meta/recipes-core/netbase/netbase_5.5.bb | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 meta/recipes-core/netbase/netbase/hosts (limited to 'meta/recipes-core/netbase') diff --git a/meta/recipes-core/netbase/netbase/hosts b/meta/recipes-core/netbase/netbase/hosts deleted file mode 100644 index b94f414d5c..0000000000 --- a/meta/recipes-core/netbase/netbase/hosts +++ /dev/null @@ -1,8 +0,0 @@ -127.0.0.1 localhost.localdomain localhost - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -fe00::0 ip6-localnet -ff00::0 ip6-mcastprefix -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters diff --git a/meta/recipes-core/netbase/netbase_5.5.bb b/meta/recipes-core/netbase/netbase_5.5.bb index 2061f864bc..eb53adda8d 100644 --- a/meta/recipes-core/netbase/netbase_5.5.bb +++ b/meta/recipes-core/netbase/netbase_5.5.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab PE = "1" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz \ - file://netbase-add-rpcbind-as-an-alias-to-sunrpc.patch \ - file://hosts" + file://netbase-add-rpcbind-as-an-alias-to-sunrpc.patch" SRC_URI[md5sum] = "15f2d9b3783802f7f48f6734b6540ac4" SRC_URI[sha256sum] = "309bddc69a43b98e5a450992b70cdfc0e3d1afb9107bc631d04b0714be98f88b" @@ -16,10 +15,7 @@ SRC_URI[sha256sum] = "309bddc69a43b98e5a450992b70cdfc0e3d1afb9107bc631d04b0714be UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () { install -d ${D}/${mandir}/man8 ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts install -m 0644 etc-rpc ${D}${sysconfdir}/rpc install -m 0644 etc-protocols ${D}${sysconfdir}/protocols install -m 0644 etc-services ${D}${sysconfdir}/services } - -CONFFILES_${PN} = "${sysconfdir}/hosts" -- cgit 1.2.3-korg