summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-01-08 17:12:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:08 +0000
commit53cebfdfcc189a65de82eccdbd18acf4d979e624 (patch)
tree772c4e40dc35af47a39efa425794ad787448fa11 /meta
parent4dd51032160897be4132242d6aaaf4dd1e5167da (diff)
downloadpoky-53cebfdfcc189a65de82eccdbd18acf4d979e624.tar.gz
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. (From OE-Core rev: 31e6d08f20a804fccb958e19045d8f9e9806071a) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/base-files/base-files/hosts (renamed from meta/recipes-core/netbase/netbase/hosts)0
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb5
-rw-r--r--meta/recipes-core/netbase/netbase_5.5.bb6
3 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-core/netbase/netbase/hosts b/meta/recipes-core/base-files/base-files/hosts
index b94f414d5c..b94f414d5c 100644
--- a/meta/recipes-core/netbase/netbase/hosts
+++ b/meta/recipes-core/base-files/base-files/hosts
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 6e75652f15..6e30c149ba 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f"
13SRC_URI = "file://rotation \ 13SRC_URI = "file://rotation \
14 file://nsswitch.conf \ 14 file://nsswitch.conf \
15 file://motd \ 15 file://motd \
16 file://hosts \
16 file://host.conf \ 17 file://host.conf \
17 file://profile \ 18 file://profile \
18 file://shells \ 19 file://shells \
@@ -113,6 +114,7 @@ do_install () {
113 ln -snf ../run ${D}${localstatedir}/run 114 ln -snf ../run ${D}${localstatedir}/run
114 ln -snf ../run/lock ${D}${localstatedir}/lock 115 ln -snf ../run/lock ${D}${localstatedir}/lock
115 116
117 install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
116 ${BASEFILESISSUEINSTALL} 118 ${BASEFILESISSUEINSTALL}
117 119
118 rotation=`cat ${WORKDIR}/rotation` 120 rotation=`cat ${WORKDIR}/rotation`
@@ -140,6 +142,7 @@ DISTRO_VERSION[vardepsexclude] += "DATE"
140do_install_basefilesissue () { 142do_install_basefilesissue () {
141 if [ "${hostname}" ]; then 143 if [ "${hostname}" ]; then
142 echo ${hostname} > ${D}${sysconfdir}/hostname 144 echo ${hostname} > ${D}${sysconfdir}/hostname
145 echo "127.0.1.1 ${hostname}" >> ${D}${sysconfdir}/hosts
143 fi 146 fi
144 147
145 install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} 148 install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir}
@@ -177,5 +180,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
177 180
178PACKAGE_ARCH = "${MACHINE_ARCH}" 181PACKAGE_ARCH = "${MACHINE_ARCH}"
179 182
180CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells" 183CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells"
181CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" 184CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile"
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
7PE = "1" 7PE = "1"
8 8
9SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz \ 9SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz \
10 file://netbase-add-rpcbind-as-an-alias-to-sunrpc.patch \ 10 file://netbase-add-rpcbind-as-an-alias-to-sunrpc.patch"
11 file://hosts"
12 11
13SRC_URI[md5sum] = "15f2d9b3783802f7f48f6734b6540ac4" 12SRC_URI[md5sum] = "15f2d9b3783802f7f48f6734b6540ac4"
14SRC_URI[sha256sum] = "309bddc69a43b98e5a450992b70cdfc0e3d1afb9107bc631d04b0714be98f88b" 13SRC_URI[sha256sum] = "309bddc69a43b98e5a450992b70cdfc0e3d1afb9107bc631d04b0714be98f88b"
@@ -16,10 +15,7 @@ SRC_URI[sha256sum] = "309bddc69a43b98e5a450992b70cdfc0e3d1afb9107bc631d04b0714be
16UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" 15UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
17do_install () { 16do_install () {
18 install -d ${D}/${mandir}/man8 ${D}${sysconfdir} 17 install -d ${D}/${mandir}/man8 ${D}${sysconfdir}
19 install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
20 install -m 0644 etc-rpc ${D}${sysconfdir}/rpc 18 install -m 0644 etc-rpc ${D}${sysconfdir}/rpc
21 install -m 0644 etc-protocols ${D}${sysconfdir}/protocols 19 install -m 0644 etc-protocols ${D}${sysconfdir}/protocols
22 install -m 0644 etc-services ${D}${sysconfdir}/services 20 install -m 0644 etc-services ${D}${sysconfdir}/services
23} 21}
24
25CONFFILES_${PN} = "${sysconfdir}/hosts"