aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2019-05-08 08:31:51 +0200
committerKhem Raj <raj.khem@gmail.com>2019-05-09 20:34:32 -0700
commit122ceec56269d3946deea685b2f646bd19782e10 (patch)
treeb63a93801f4eaab685e3d53ab4883f32bda10af9
parent42c02c088513d476577dc90cb367c7d98aa858fd (diff)
downloadmeta-openembedded-contrib-122ceec56269d3946deea685b2f646bd19782e10.tar.gz
meta-openembedded-contrib-122ceec56269d3946deea685b2f646bd19782e10.tar.bz2
meta-openembedded-contrib-122ceec56269d3946deea685b2f646bd19782e10.zip
xfce4-session: get rid of machine-host
OE-Core's base-file does add hostname to hosts since: commit 31e6d08f20a804fccb958e19045d8f9e9806071a Author: Chen Qi <Qi.Chen@windriver.com> Date: Tue Jan 8 17:12:52 2019 +0800 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@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-xfce/conf/layer.conf4
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/machine-host.bb17
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb2
3 files changed, 0 insertions, 23 deletions
diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf
index fd7f9b5412..da07f8e163 100644
--- a/meta-xfce/conf/layer.conf
+++ b/meta-xfce/conf/layer.conf
@@ -20,7 +20,3 @@ LAYERDEPENDS_xfce-layer += "meta-python"
LAYERDEPENDS_xfce-layer += "networking-layer"
LAYERSERIES_COMPAT_xfce-layer = "thud warrior"
-
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
- xfce4-session->machine-host \
-"
diff --git a/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
deleted file mode 100644
index c79197445e..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Meta package adding machine name to known hosts"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-ALLOW_EMPTY_${PN} = "1"
-
-LOCALHOSTMACHINE = "127.0.0.1 ${MACHINE}"
-
-# on some machines starting applications as xfce4-terminal take ages without
-# machine name in hosts
-pkg_postinst_${PN} () {
-if ! grep -q '${LOCALHOSTMACHINE}' $D/etc/hosts ; then
- echo '${LOCALHOSTMACHINE}' >> $D/etc/hosts
-fi
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb
index b11aaa4fe9..f09af5b79b 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb
@@ -30,5 +30,3 @@ FILES_${PN} += " \
FILES_${PN} += " \
${libdir}/xfce4/session/splash-engines/*.la \
"
-
-RDEPENDS_${PN} += "machine-host"