From 21e17ff5f9102c9025c0ebe2cab1f75ca97b72e8 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 22 Jun 2015 15:53:07 +0200 Subject: xfce4-session: ensure ip for machine is found by adding to hosts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes very ugly behaviour: Starting applications e.g xfce4-terminal can delay for minutes in case network is connected. There was a similar approach implemented for xfce4-session but this was removed in commit f54d3a506fef603d8d0c538d1d69a6597152c169 Author: Ash Charles Date: Mon Feb 23 08:40:53 2015 -0800 xfce4-session: Remove unneeded pkg_postinst The pkg_postinst inherited from previous versions of this recipe no longer seems necessary; no error message seen at runtime in a quick test. As it made the generated packages unnecessarily machine-specific, remove this post-install step. Based on the ensuring discussion, this supersedes the original patch [1]. [1] http://lists.openembedded.org/pipermail/openembedded-devel/2015-February/100454.html Signed-off-by: Ash Charles Tested-by: Andreas Müller Signed-off-by: Martin Jansa Unfortuantely my tests for that patch only checked for the messagebox: | Could not look up internet address for | This will prevent Xfce from operating correctly. | It may be possible to correct the problem by adding | to the file /etc/hosts on your system. For unknown reasons this messagebox is not created but the hint is still extremely valid. To avoid making 'xfce4-session' machine specific an extra meta-recipe 'machine-host' was created on which 'xfce4-session' rdepends. Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/xfce4-session/machine-host.bb | 17 +++++++++++++++++ .../recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 meta-xfce/recipes-xfce/xfce4-session/machine-host.bb (limited to 'meta-xfce/recipes-xfce') diff --git a/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb new file mode 100644 index 0000000000..03bd205a28 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb @@ -0,0 +1,17 @@ +SUMMARY = "Meta package adding machine name to known hosts" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" + +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.12.1.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb index 81c56ccfae..215aec32b7 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb @@ -26,3 +26,5 @@ FILES_${PN} += " \ " FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" + +RDEPENDS_${PN} += "machine-host" -- cgit 1.2.3-korg