[OE-core] [PATCH 1/1] netbase/base-files: move /etc/hosts from netbase to base-files

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces at lists.openembedded.org <openembedded-
> core-bounces at lists.openembedded.org> On Behalf Of Chen Qi
> Sent: den 8 januari 2019 10:13
> To: openembedded-core at lists.openembedded.org
> Subject: [OE-core] [PATCH 1/1] 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 <Qi.Chen at windriver.com>
> ---
>  meta/recipes-core/{netbase/netbase => base-files/base-files}/hosts | 0
>  meta/recipes-core/base-files/base-files_3.0.14.bb                  | 5 ++++-
>  meta/recipes-core/netbase/netbase_5.5.bb                           | 6 +-----
>  3 files changed, 5 insertions(+), 6 deletions(-)
>  rename meta/recipes-core/{netbase/netbase => base-files/base-files}/hosts (100%)
> 
> diff --git a/meta/recipes-core/netbase/netbase/hosts b/meta/recipes-core/base-files/base-files/hosts
> similarity index 100%
> rename from meta/recipes-core/netbase/netbase/hosts
> rename to 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 6e75652..6e30c14 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"
>  SRC_URI = "file://rotation \
>             file://nsswitch.conf \
>             file://motd \
> +           file://hosts \
>             file://host.conf \
>             file://profile \
>             file://shells \
> @@ -113,6 +114,7 @@ do_install () {
>  	ln -snf ../run ${D}${localstatedir}/run
>  	ln -snf ../run/lock ${D}${localstatedir}/lock
> 
> +	install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
>  	${BASEFILESISSUEINSTALL}
> 
>  	rotation=`cat ${WORKDIR}/rotation`
> @@ -140,6 +142,7 @@ DISTRO_VERSION[vardepsexclude] += "DATE"
>  do_install_basefilesissue () {
>  	if [ "${hostname}" ]; then
>  		echo ${hostname} > ${D}${sysconfdir}/hostname
> +		echo "127.0.1.1 ${hostname}" >> ${D}${sysconfdir}/hosts

Should this check the ipv4 DISTRO_FEATURE?
What about IPv6?

>  	fi
> 
>  	install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
> @@ -177,5 +180,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
> 
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
> 
> -CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells"
> +CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells"

A bit more readable:

CONFFILES_${PN} = "${sysconfdir}/fstab ${@'${sysconfdir}/hostname ${sysconfdir}/hosts' if d.getVar('hostname') else ''} ${sysconfdir}/shells"

>  CONFFILES_${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 2061f86..eb53add 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"
> --
> 1.9.1

//Peter