date:20181009

[OE-core] [PATCH V3] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES

2018-10-09 Thread Hongxu Jia

They can't be built without opengl in DISTRO_FEATURES.
[snip]
|webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
fatal error: GL/gl.h: No such file or directory
[snip]

Some sort of GL is needed yes. We indicate that with opengl loosely in OE

Signed-off-by: Hongxu Jia 
---
 meta/recipes-sato/webkit/webkitgtk_2.20.5.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
index c8d4f94..7f1ffce 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
@@ -30,8 +30,7 @@ SRC_URI[sha256sum] = 
"15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check 
upstream-version-is-even gtk-doc
 
-# depends on libxt
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
 DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native 
gperf-native sqlite3 \
-- 
2.10.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for "webkitgtk: add opengl to REQUI..." and 1 more (rev2)

2018-10-09 Thread Patchwork

== Series Details ==

Series: "webkitgtk: add opengl to REQUI..." and 1 more (rev2)
Revision: 2
URL   : https://patchwork.openembedded.org/series/13867/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 417245923c)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH V2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES

2018-10-09 Thread Andre McCurdy

On Tue, Oct 9, 2018 at 8:09 PM, Hongxu Jia  wrote:
> They can't be built without opengl in DISTRO_FEATURES.
> [snip]
> |webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
> fatal error: GL/gl.h: No such file or directory
> [snip]
>
> Some sort of GL is needed yes. We indicate that with opengl losely in OE

It's loosely, not losely.

> Signed-off-by: Hongxu Jia 
> ---
>  meta/recipes-sato/webkit/webkitgtk_2.20.5.bb | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb 
> b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
> index c8d4f94..7f1ffce 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
> @@ -30,8 +30,7 @@ SRC_URI[sha256sum] = 
> "15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac
>
>  inherit cmake pkgconfig gobject-introspection perlnative 
> distro_features_check upstream-version-is-even gtk-doc
>
> -# depends on libxt
> -REQUIRED_DISTRO_FEATURES = "x11"
> +REQUIRED_DISTRO_FEATURES = "x11 opengl"
>
>  DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn 
> libgcrypt \
> gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native 
> gperf-native sqlite3 \
> --
> 2.10.2
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH V2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES

2018-10-09 Thread Hongxu Jia

They can't be built without opengl in DISTRO_FEATURES.
[snip]
|webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
fatal error: GL/gl.h: No such file or directory
[snip]

Some sort of GL is needed yes. We indicate that with opengl losely in OE

Signed-off-by: Hongxu Jia 
---
 meta/recipes-sato/webkit/webkitgtk_2.20.5.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
index c8d4f94..7f1ffce 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
@@ -30,8 +30,7 @@ SRC_URI[sha256sum] = 
"15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check 
upstream-version-is-even gtk-doc
 
-# depends on libxt
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
 DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native 
gperf-native sqlite3 \
-- 
2.10.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES

2018-10-09 Thread Hongxu Jia


On 2018年10月09日 09:53, Khem Raj wrote:

On Mon, Oct 8, 2018 at 6:47 PM ChenQi  wrote:

ping

I think webkitgtk does require the 'opengl' distro feature.

We have in mesa.inc:
PACKAGECONFIG ??= " \
 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'opengl egl gles gbm dri', '', d)} \
 ..."

PROVIDES = " \
  ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl',
'', d)} \
  ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1
virtual/libgles2', '', d)} \
  ..."

And webkitgtk's source codes are like:
#if USE(LIBEPOXY)
// libepoxy headers have to be included before  in
order to avoid
// picking up khrplatform.h inclusion that's done in ANGLE.
#include 
#endif

#include 
#include 

#if PLATFORM(IOS)
#import 
#elif PLATFORM(MAC)
#include 
#elif PLATFORM(WIN)
#include "OpenGLESShims.h"
#elif USE(LIBEPOXY)
//  already included above.
#elif USE(OPENGL_ES_2)
#include 
#else
#include "OpenGLShims.h"
#endif

And libepoxy is wrapper around libgl.

So I think we can conclude 'opengl' is required distro feature for
webkitgkt? At least this is the current situation in OE.

some sort of GL is needed yes. We indicate that with opengl losely
in OE


OK, I will send V2 since webkitgtk is upgraded to 2.20.5

and the weston backport fix is obsolete since weston is upgraded to 5.0

//Hongxu


Best Regards,
Chen Qi

On 09/03/2018 05:35 PM, Hongxu Jia wrote:

They can't be built without opengl in DISTRO_FEATURES.
[snip]
|webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
fatal error: GL/gl.h: No such file or directory
[snip]

Signed-off-by: Hongxu Jia 
---
   meta/recipes-sato/webkit/webkitgtk_2.20.3.bb | 3 +--
   1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
index a528c5d..93d74bb 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
@@ -29,8 +29,7 @@ SRC_URI[sha256sum] = 
"579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48

   inherit cmake pkgconfig gobject-introspection perlnative 
distro_features_check upstream-version-is-even gtk-doc

-# depends on libxt
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"

   DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn 
libgcrypt \
  gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native 
gperf-native sqlite3 \


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libsndfile1: CVE-2018-13139

2018-10-09 Thread changqing.li

From: Changqing Li 

A stack-based buffer overflow in psf_memset in common.c in libsndfile 1.0.28.

Fixed in https://github.com/erikd/libsndfile/issues/397

Signed-off-by: Changqing Li 
---
 .../libsndfile/libsndfile1/CVE-2018-13139.patch| 35 ++
 .../libsndfile/libsndfile1_1.0.28.bb   |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 
meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-13139.patch

diff --git 
a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-13139.patch 
b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-13139.patch
new file mode 100644
index 000..4ae3674
--- /dev/null
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-13139.patch
@@ -0,0 +1,35 @@
+From 5473aeef7875e54bd0f786fbdd259a35aaee875c Mon Sep 17 00:00:00 2001
+From: Changqing Li 
+Date: Wed, 10 Oct 2018 08:59:30 +0800
+Subject: [PATCH] libsndfile1: patch for CVE-2018-13139
+
+Upstream-Status: Backport [https://github.com/bwarden/libsndfile/
+commit/df18323c622b54221ee7ace74b177cd152d7]
+
+CVE: CVE-2018-13139
+
+Signed-off-by: Changqing Li 
+---
+ programs/sndfile-deinterleave.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c
+index e27593e..721bee7 100644
+--- a/programs/sndfile-deinterleave.c
 b/programs/sndfile-deinterleave.c
+@@ -89,6 +89,12 @@ main (int argc, char **argv)
+   exit (1) ;
+   } ;
+ 
++  if (sfinfo.channels > MAX_CHANNELS)
++  {   printf ("\nError : Input file '%s' has too many (%d) channels. 
Limit is %d.\n",
++  argv [1], sfinfo.channels, MAX_CHANNELS) ;
++  exit (1) ;
++  } ;
++
+   state.channels = sfinfo.channels ;
+   sfinfo.channels = 1 ;
+ 
+-- 
+2.7.4
+
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb 
b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
index ed43b74..b28f675 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
@@ -12,6 +12,7 @@ SRC_URI = 
"http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \
file://CVE-2017-8363.patch \
file://CVE-2017-14245-14246.patch \
file://CVE-2017-14634.patch \
+   file://CVE-2018-13139.patch \
   "
 
 SRC_URI[md5sum] = "646b5f98ce89ac60cdb060fcd398247c"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libxml2: move xmlcatalog and xmllint back into libxml2-utils

2018-10-09 Thread Andre McCurdy

Packaging of libxml2-utils has been broken since 2011:

  
http://git.openembedded.org/openembedded-core/commit/?id=76052861cc95fd4ad4c4b9eb6ce4cd1065ad4dc9

Signed-off-by: Andre McCurdy 
---
 meta/recipes-core/libxml/libxml2_2.9.8.bb | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb 
b/meta/recipes-core/libxml/libxml2_2.9.8.bb
index f01cb2c..d35f608 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb
@@ -67,12 +67,13 @@ python populate_packages_prepend () {
 d.setVar('PKG_libxml2', '${MLPREFIX}libxml2')
 }
 
-PACKAGES += "${PN}-utils ${PN}-python"
+PACKAGE_BEFORE_PN += "${PN}-utils"
+PACKAGES += "${PN}-python"
 
 FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
 FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*"
-FILES_${PN}-utils += "${bindir}/*"
-FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN}-utils = "${bindir}/*"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
 
 do_configure_prepend () {
# executables take longer to package: these should not be executable
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] populate_sdk_ext.bbclass: avoid populating tools twice

2018-10-09 Thread Jens Rehsack

When running `bitbake -c populate_sdk_ext ...` for an image
recipe inheriting populate_sdk_qt5, `nativesdk-qemu-helper` is
deployed via `nativesdk-packagegroup-sdk-host`, which already
contains some of the tools (by name: "oe-find-native-sysroot
runqemu*").

To avoid error like:
Configuring nativesdk-packagegroup-qt5-toolchain-host.

NOTE: Running intercept scripts:
NOTE: > Executing update_gio_module_cache-nativesdk intercept ...
NOTE: + [ True = False ]
+ qemu-x86_64 -r 3.2.0 -E 
LD_LIBRARY_PATH=/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/lib:/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/lib
 -L 
/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image
 
/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/libexec/nativesdk-gio-querymodules
 
/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/lib/gio/modules/

NOTE: Executing copy_buildsystem ...
DEBUG: Executing python function copy_buildsystem
NOTE: Generating sstate task list...
NOTE: Generating sstate-cache...
NOTE: Generating sstate-cache...
DEBUG: Python function copy_buildsystem finished
NOTE: Executing install_tools ...
DEBUG: Executing shell function install_tools
Traceback (most recent call last):
  File "/home/sno/gpw-community-bsp/sources/poky/scripts/lnr", line 21, in 

os.symlink(target, linkname)
FileExistsError: [Errno 17] File exists: 
'../../../../layers/poky/scripts/oe-find-native-sysroot' -> 
'/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image//opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/bin/oe-find-native-sysroot'
WARNING: exit code 1 from a shell command.
DEBUG: Python function do_populate_sdk_ext finished

only add those tools unpackaged to the deployment which are
still missing.

Signed-off-by: Jens Rehsack 
---
 meta/classes/populate_sdk_ext.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_ext.bbclass 
b/meta/classes/populate_sdk_ext.bbclass
index 9c31d70f2a..e30c49296d 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -531,7 +531,8 @@ install_tools() {
scripts="devtool recipetool oe-find-native-sysroot runqemu* wic"
for script in $scripts; do
for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} 
-maxdepth 1 -executable -name "$script"`; do
-   lnr ${scriptfn} 
${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/`basename $scriptfn`
+   
targetscriptfn="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/$(basename 
$scriptfn)"
+   test -e ${targetscriptfn} || lnr ${scriptfn} 
${targetscriptfn}
done
done
# We can't use the same method as above because files in the sysroot 
won't exist at this point
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] linux-firmware: use ${nonarch_base_libdir} for all firmware

2018-10-09 Thread Stefan Agner

From: Stefan Agner 

Replace the remaining hardcoded '/lib' in kernel firmware installation
path with ${nonarch_base_libdir}.

Signed-off-by: Stefan Agner 
---
 meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb 
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 7829c24579..2525545bdd 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -811,9 +811,9 @@ LICENSE_${PN}-ibt-misc= "Firmware-ibt_firmware"
 FILES_${PN}-ibt-license = 
"${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware"
 FILES_${PN}-ibt-hw-37-7 = 
"${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bseq"
 FILES_${PN}-ibt-hw-37-8 = 
"${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq"
-FILES_${PN}-ibt-11-5= "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi 
/lib/firmware/intel/ibt-11-5.ddc"
-FILES_${PN}-ibt-12-16   = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi 
/lib/firmware/intel/ibt-12-16.ddc"
-FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi 
/lib/firmware/intel/ibt-17-*.ddc"
+FILES_${PN}-ibt-11-5= "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi 
${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc"
+FILES_${PN}-ibt-12-16   = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi 
${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc"
+FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi 
${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc"
 FILES_${PN}-ibt-misc= "${nonarch_base_libdir}/firmware/ibt-*"
 
 RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license"
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] cmake.bbclass: search both sysroot-native and host for native packages

2018-10-09 Thread Burton, Ross

All but this one apply now... weird.

If you can rebase on top of poky-contrib:ross/thud then that would be great.

Ross

On Tue, 9 Oct 2018 at 15:07, Pascal Bach  wrote:

> Certain headers and libraries like `math.h` an `-m` are only available on
> the
> host as they are provided by the host toolchain.
>
> This leads to issues that a find_library in CMake doesn't find the `m`
> library
> of a find_path doesn't find `math.h`. This issue occurred in the wireshark
> recipe
> for example.
>
> This change enables CMake to also look on the host for libraries and
> includes when
> building a native package.
>
> Signed-off-by: Pascal Bach 
> ---
>  meta/classes/cmake.bbclass | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 6e2c34e4c6..89a2a77a50 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -43,8 +43,8 @@ OECMAKE_RPATH ?= ""
>  OECMAKE_PERLNATIVE_DIR ??= ""
>  OECMAKE_EXTRA_ROOT_PATH ?= ""
>
> -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
> -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
> +OECMAKE_FIND_ROOT_PATH_MODE = "ONLY"
> +OECMAKE_FIND_ROOT_PATH_MODE_class-native = "BOTH"
>
>  EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
>
> @@ -93,10 +93,10 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}"
> CACHE STRING "LDFLAGS" )
>  # only search in the paths provided so cmake doesnt pick
>  # up libraries and tools from the native build machine
>  set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE}
> ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH}
> ${EXTERNAL_TOOLCHAIN})
> -set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
> -set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
> ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} )
> -set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
> -set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
> +set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
> +set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
> +set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
> +set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ${OECMAKE_FIND_ROOT_PATH_MODE} )
>
>  $cmake_sysroot
>
> --
> 2.11.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] Yocto Project Status WW41’18

2018-10-09 Thread Jolley, Stephen K

Current Dev Position: YP 2.6 M4.

Next Deadline: YP 2.6 M4 Build Target is Oct. 1, 2018


SWAT Team Rotation:

· SWAT lead is currently: Paul

· SWAT team rotation: Paul -> Ross on Oct. 12, 2018

· SWAT team rotation: Ross -> Amanda on Oct. 17, 2018

· https://wiki.yoctoproject.org/wiki/Yocto_Build_Failure_Swat_Team


Key Status/Updates:

· 2.6 M3 rc1 has been built and is in QA; currently 100% complete.  See 
https://wiki.yoctoproject.org/wiki/2.6_QA_Status.  The report should be 
published soon.

· The build appliance issue identified last week is not a blocking 
issue for 2.6 M3 and has a simple fix now included in master.

· We’re now past feature freeze and all major changes planned for 2.6 
have been merged so only bug fixes will be accepted now.

· The reproducibility problem for non-IA binaries in the debug symbol 
sections has been investigated and a fix has been merged in master.

· There were fixes merged to the gitsm bitbake fetcher which caused 
other breakage. The known breakage has now been fixed, if further problems are 
seen, please report them ASAP.

· We are now into 2.6 M4’s window so we will likely branch for thud and 
build rc1 as soon as the report for M3 is out and that milestone release is 
made.


Planned Releases for YP 2.6:

· YP 2.6 M3 Release Target was Sept. 7, 2018

· YP 2.6 M4 Build Target is Oct. 1, 2018

· YP 2.6 M4 Release Target is Oct. 26, 2018


Planned upcoming dot releases:

· YP 2.4.4 (Rocko) will be targeted after YP 2.6 M4 is done.

· YP 2.5.2 (Sumo) will be targeted after YP 2.4.4 is done.


Tracking Metrics:

· WDD 2527 (last week 2534) 
(https://wiki.yoctoproject.org/charts/combo.html)

· Poky Patch Metrics

oTotal patches found: 1665 (last week 1657)

oPercentage of patches in the Pending State: 735 (44%) [last week 732 (44%)]


Key Status Links for YP:

https://wiki.yoctoproject.org/wiki/Yocto_Project_v2.6_Status

https://wiki.yoctoproject.org/wiki/Yocto_2.6_Schedule

https://wiki.yoctoproject.org/wiki/Yocto_2.6_Features


The Status reports are now stored on the wiki at: 
https://wiki.yoctoproject.org/wiki/Weekly_Status


[If anyone has suggestions for other information you’d like to see on this 
weekly status update, let us know!]

Thanks,

Stephen K. Jolley
Yocto Project Program Manager
INTEL, MS JF1-255, 2111 N.E. 25th Avenue, Hillsboro, OR 97124
•Cell:(208) 244-4460
• Email: stephen.k.jol...@intel.com

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for cmake.bbclass: search both sysroot-native and host for native packages

2018-10-09 Thread Patchwork

== Series Details ==

Series: cmake.bbclass: search both sysroot-native and host for native packages
Revision: 1
URL   : https://patchwork.openembedded.org/series/14431/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 9a84114a27)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for cmake.bbclass: move CMAKE_NO_SYSTEM_FROM_IMPORTED to toolchain.cmake

2018-10-09 Thread Patchwork

== Series Details ==

Series: cmake.bbclass: move CMAKE_NO_SYSTEM_FROM_IMPORTED to toolchain.cmake
Revision: 1
URL   : https://patchwork.openembedded.org/series/14430/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 9a84114a27)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2] cmake.bbclass: allow cmake to find hosttools

2018-10-09 Thread Pascal Bach

Currently the generated toolchain file is unable to find hosttools as they
do not appear in the search paths.

One example where this is useful is for projects that query git for their 
version
number as git is usually provided via HOSTTOOLS.

Just adding HOSTTOOLS_DIR is not enough as binaries are located directly under
${HOSTTOOLS_DIR}. Like ${HOSTTOOLS_DIR}/git for example.
CMake however only searches in [s]bin sub directories of the paths specified in
CMAKE_FIND_ROOT_PATH. Explicitly adding / to CMAKE_SYSTEM_PROGRAM_PATH makes
CMake look in the right location.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index fd40a9863e..0dd6f6e6de 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -89,7 +89,7 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE 
STRING "LDFLAGS" )
 
 # only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
-set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN})
+set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR})
 set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
 set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} )
 set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
@@ -108,6 +108,10 @@ list(APPEND CMAKE_MODULE_PATH 
"${STAGING_DATADIR}/cmake/Modules/")
 # add for non /usr/lib libdir, e.g. /usr/lib64
 set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})
 
+# by default CMake only looks in [s]bin subdirectories of CMAKE_FIND_ROOT_PATH
+# adding / makes CMake look for binaries in hosttools too.
+set( CMAKE_SYSTEM_PROGRAM_PATH /)
+
 EOF
 }
 
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] cmake.bbclass: allow cmake to find hosttools

2018-10-09 Thread Pascal Bach

On 09.10.2018 16:06, Burton, Ross wrote:
> The hashes don't match anything public and git isn't happy:
>
> Applying: cmake.bbclass: allow cmake to find hosttools
> error: sha1 information is lacking or useless (meta/classes/cmake.bbclass).
> error: could not build fake ancestor
> Patch failed at 0001 cmake.bbclass: allow cmake to find hosttools

I noticed too, the patch was based on another patch I sent. Should have sent 
these as a patch set even tough
they are not really related.

I will resubmit.

Pascal

>
> Ross
>
> On Tue, 9 Oct 2018 at 14:36, Pascal Bach  > wrote:
>
> Currently the generated toolchain file is unable to find hosttools as they
> do not appear in the search paths.
>
> One example where this is useful is for projects that query git for their 
> version
> number as git is usually provided via HOSTTOOLS.
>
> Just adding HOSTTOOLS_DIR is not enough as binaries are located directly 
> under
> ${HOSTTOOLS_DIR}. Like ${HOSTTOOLS_DIR}/git for example.
> CMake however only searches in [s]bin sub directories of the paths 
> specified in
> CMAKE_FIND_ROOT_PATH. Explicitly adding / to CMAKE_SYSTEM_PROGRAM_PATH 
> makes
> CMake look in the right location.
>
> Signed-off-by: Pascal Bach  >
> ---
>  meta/classes/cmake.bbclass | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 684f71299a..421d85fd9d 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -92,7 +92,7 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" 
> CACHE STRING "LDFLAGS" )
>
>  # only search in the paths provided so cmake doesnt pick
>  # up libraries and tools from the native build machine
> -set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
> ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
> ${EXTERNAL_TOOLCHAIN})
> +set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
> ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
> ${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR})
>  set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
>  set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
>  set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
> @@ -113,6 +113,10 @@ list(APPEND CMAKE_MODULE_PATH 
> "${STAGING_DATADIR}/cmake/Modules/")
>  # add for non /usr/lib libdir, e.g. /usr/lib64
>  set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
>
> +# by default CMake only looks in [s]bin subdirectories of 
> CMAKE_FIND_ROOT_PATH
> +# adding / makes CMake look for binaries in hosttools too.
> +set( CMAKE_SYSTEM_PROGRAM_PATH /)
> +
>  # avoid treating imports as system includes
>  set( CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
>
> -- 
> 2.11.0
>
> -- 
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org 
> 
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] cmake.bbclass: allow cmake to find hosttools

2018-10-09 Thread Burton, Ross

The hashes don't match anything public and git isn't happy:

Applying: cmake.bbclass: allow cmake to find hosttools
error: sha1 information is lacking or useless (meta/classes/cmake.bbclass).
error: could not build fake ancestor
Patch failed at 0001 cmake.bbclass: allow cmake to find hosttools

Ross

On Tue, 9 Oct 2018 at 14:36, Pascal Bach  wrote:

> Currently the generated toolchain file is unable to find hosttools as they
> do not appear in the search paths.
>
> One example where this is useful is for projects that query git for their
> version
> number as git is usually provided via HOSTTOOLS.
>
> Just adding HOSTTOOLS_DIR is not enough as binaries are located directly
> under
> ${HOSTTOOLS_DIR}. Like ${HOSTTOOLS_DIR}/git for example.
> CMake however only searches in [s]bin sub directories of the paths
> specified in
> CMAKE_FIND_ROOT_PATH. Explicitly adding / to CMAKE_SYSTEM_PROGRAM_PATH
> makes
> CMake look in the right location.
>
> Signed-off-by: Pascal Bach 
> ---
>  meta/classes/cmake.bbclass | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 684f71299a..421d85fd9d 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -92,7 +92,7 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}"
> CACHE STRING "LDFLAGS" )
>
>  # only search in the paths provided so cmake doesnt pick
>  # up libraries and tools from the native build machine
> -set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE}
> ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH}
> ${EXTERNAL_TOOLCHAIN})
> +set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE}
> ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH}
> ${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR})
>  set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
>  set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
>  set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
> @@ -113,6 +113,10 @@ list(APPEND CMAKE_MODULE_PATH
> "${STAGING_DATADIR}/cmake/Modules/")
>  # add for non /usr/lib libdir, e.g. /usr/lib64
>  set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
>
> +# by default CMake only looks in [s]bin subdirectories of
> CMAKE_FIND_ROOT_PATH
> +# adding / makes CMake look for binaries in hosttools too.
> +set( CMAKE_SYSTEM_PROGRAM_PATH /)
> +
>  # avoid treating imports as system includes
>  set( CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
>
> --
> 2.11.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] cmake.bbclass: use CMAKE_SYSTEM_LIBRARY_PATH instead of CMAKE_LIBRARY_PATH

2018-10-09 Thread Pascal Bach

CMAKE_LIBRARY_PATH is intended to be set by projects.
CMAKE_SYSTEM_LIBRARY_PATH is better suited to be used in a toolchain
file.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 251ddd9afe..6e2c34e4c6 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -111,7 +111,7 @@ set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} )
 list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/")
 
 # add for non /usr/lib libdir, e.g. /usr/lib64
-set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})
+set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
 
 EOF
 }
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] perf: make tools needed for API documentation respect the manpages PACKAGECONFIG

2018-10-09 Thread Ross Burton

Signed-off-by: Ross Burton 
---
 meta/recipes-kernel/perf/perf.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 514c87835d0..586422f769e 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -22,17 +22,15 @@ PACKAGECONFIG[libunwind] = ",NO_LIBUNWIND=1 
NO_LIBDW_DWARF_UNWIND=1,libunwind"
 PACKAGECONFIG[libnuma] = ",NO_LIBNUMA=1"
 PACKAGECONFIG[systemtap] = ",NO_SDT=1,systemtap"
 PACKAGECONFIG[jvmti] = ",NO_JVMTI=1"
-
 # libaudit support would need scripting to be enabled
 PACKAGECONFIG[audit] = ",NO_LIBAUDIT=1,audit"
+PACKAGECONFIG[manpages] = ",,xmlto-native asciidoc-native"
 
 DEPENDS = " \
 virtual/${MLPREFIX}libc \
 ${MLPREFIX}elfutils \
 ${MLPREFIX}binutils \
 bison-native flex-native xz \
-xmlto-native \
-asciidoc-native \
 "
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] cmake.bbclass: search both sysroot-native and host for native packages

2018-10-09 Thread Pascal Bach

Certain headers and libraries like `math.h` an `-m` are only available on the
host as they are provided by the host toolchain.

This leads to issues that a find_library in CMake doesn't find the `m` library
of a find_path doesn't find `math.h`. This issue occurred in the wireshark 
recipe
for example.

This change enables CMake to also look on the host for libraries and includes 
when
building a native package.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 6e2c34e4c6..89a2a77a50 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -43,8 +43,8 @@ OECMAKE_RPATH ?= ""
 OECMAKE_PERLNATIVE_DIR ??= ""
 OECMAKE_EXTRA_ROOT_PATH ?= ""
 
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
+OECMAKE_FIND_ROOT_PATH_MODE = "ONLY"
+OECMAKE_FIND_ROOT_PATH_MODE_class-native = "BOTH"
 
 EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
 
@@ -93,10 +93,10 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE 
STRING "LDFLAGS" )
 # only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
 set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN})
-set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} )
-set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
+set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
+set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
+set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ${OECMAKE_FIND_ROOT_PATH_MODE} )
 
 $cmake_sysroot
 
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for cmake.bbclass: allow cmake to find hosttools

2018-10-09 Thread Patchwork

== Series Details ==

Series: cmake.bbclass: allow cmake to find hosttools
Revision: 1
URL   : https://patchwork.openembedded.org/series/14429/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 9a84114a27)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] cmake.bbclass: move CMAKE_NO_SYSTEM_FROM_IMPORTED to toolchain.cmake

2018-10-09 Thread Pascal Bach

The setting influences the build like other settings already in toolchain.cmake.
It is more appropriate to set it there instead of providing it as a random
command line parameter to CMake.

It also makes it easier to use the toolchain.cmake file independent of bitbake.
Like the devshell for example.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 89a2a77a50..684f71299a 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -113,6 +113,9 @@ list(APPEND CMAKE_MODULE_PATH 
"${STAGING_DATADIR}/cmake/Modules/")
 # add for non /usr/lib libdir, e.g. /usr/lib64
 set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
 
+# avoid treating imports as system includes
+set( CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
+
 EOF
 }
 
@@ -157,7 +160,6 @@ cmake_do_configure() {
  -DCMAKE_INSTALL_SO_NO_EXE=0 \
  -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
  -DCMAKE_VERBOSE_MAKEFILE=1 \
- -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
  ${EXTRA_OECMAKE} \
  -Wno-dev
 }
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] cmake.bbclass: allow cmake to find hosttools

2018-10-09 Thread Pascal Bach

Currently the generated toolchain file is unable to find hosttools as they
do not appear in the search paths.

One example where this is useful is for projects that query git for their 
version
number as git is usually provided via HOSTTOOLS.

Just adding HOSTTOOLS_DIR is not enough as binaries are located directly under
${HOSTTOOLS_DIR}. Like ${HOSTTOOLS_DIR}/git for example.
CMake however only searches in [s]bin sub directories of the paths specified in
CMAKE_FIND_ROOT_PATH. Explicitly adding / to CMAKE_SYSTEM_PROGRAM_PATH makes
CMake look in the right location.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 684f71299a..421d85fd9d 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -92,7 +92,7 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE 
STRING "LDFLAGS" )
 
 # only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
-set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN})
+set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR})
 set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
 set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
 set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
@@ -113,6 +113,10 @@ list(APPEND CMAKE_MODULE_PATH 
"${STAGING_DATADIR}/cmake/Modules/")
 # add for non /usr/lib libdir, e.g. /usr/lib64
 set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
 
+# by default CMake only looks in [s]bin subdirectories of CMAKE_FIND_ROOT_PATH
+# adding / makes CMake look for binaries in hosttools too.
+set( CMAKE_SYSTEM_PROGRAM_PATH /)
+
 # avoid treating imports as system includes
 set( CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
 
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v4 3/3] busybox: unify recipe style

2018-10-09 Thread Andrej Valek

- change spaces to tabs and unify indent level

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc | 98 +--
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index 97b73c1dc0..10582a7534 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -117,13 +117,13 @@ do_prepare_config () {
${S}/.config
sed -i -e '${configmangle}' ${S}/.config
if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then
- # disable networking applets
- mv ${S}/.config ${S}/.config.oe-tmp
- awk 'BEGIN{net=0}
- /^# Networking Utilities/{net=1}
- /^#$/{if(net){net=net+1}}
- {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \
- ${S}/.config.oe-tmp > ${S}/.config
+   # disable networking applets
+   mv ${S}/.config ${S}/.config.oe-tmp
+   awk 'BEGIN{net=0}
+   /^# Networking Utilities/{net=1}
+   /^#$/{if(net){net=net+1}}
+   {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not 
set")}else{print}}' \
+   ${S}/.config.oe-tmp > ${S}/.config
fi
sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R 
-n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config
sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config
@@ -151,7 +151,7 @@ do_compile() {
export KCONFIG_NOTIMESTAMP=1
fi
if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep 
"CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
-   # split the .config into two parts, and make two busybox binaries
+   # split the .config into two parts, and make two busybox 
binaries
if [ -e .config.orig ]; then
# Need to guard again an interrupted do_compile - 
restore any backup
cp .config.orig .config
@@ -303,51 +303,51 @@ do_install () {
sed -i "s:/usr/sbin/:${sbindir}/:" 
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
-if grep -q "CONFIG_MDEV=y" ${B}/.config; then
-   install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
-   if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
-   install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
-   install -d ${D}${sysconfdir}/mdev
-   install -m 0755 ${WORKDIR}/find-touchscreen.sh 
${D}${sysconfdir}/mdev
-   install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
-   fi
+   if grep -q "CONFIG_MDEV=y" ${B}/.config; then
+   install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
+   if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
+   install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
+   install -d ${D}${sysconfdir}/mdev
+   install -m 0755 ${WORKDIR}/find-touchscreen.sh 
${D}${sysconfdir}/mdev
+   install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
+   fi
+   fi
+   if grep -q "CONFIG_INIT=y" ${B}/.config; then
+   install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
+   install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
+   fi
+
+   if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
+   if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
+   install -d ${D}${systemd_unitdir}/system
+   sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-klogd.service.in \
+   > ${D}${systemd_unitdir}/system/busybox-klogd.service
+   fi
+
+   if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
+   install -d ${D}${systemd_unitdir}/system
+   sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-syslog.service.in \
+   > ${D}${systemd_unitdir}/system/busybox-syslog.service
+   if  [ ! -e 
${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then
+   sed -i '/klog/d' 
${D}${systemd_unitdir}/system/busybox-syslog.service
+   fi
+   if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
+   install -d ${D}${sysconfdir}/default
+   install -m 0644 
${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
+   fi
+   fi
+   fi
+
+   # Remove the sysvinit specific configuration file for systemd systems 
to avoid confusion
+   if

[OE-core] [PATCH v4 2/3] busybox: do not write grep outputs into log

2018-10-09 Thread Andrej Valek

Make grep quiet for prevent to write information into logs.

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index 7b427ab0f7..97b73c1dc0 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -278,32 +278,32 @@ do_install () {
install -m 644 ${WORKDIR}/syslog-startup.conf 
${D}${sysconfdir}/syslog-startup.conf
install -m 644 ${WORKDIR}/syslog.conf 
${D}${sysconfdir}/syslog.conf
fi
-   if grep "CONFIG_CROND=y" ${B}/.config; then
+   if grep -q "CONFIG_CROND=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-cron 
${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_HTTPD=y" ${B}/.config; then
+   if grep -q "CONFIG_HTTPD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-httpd 
${D}${sysconfdir}/init.d/
install -d ${D}/srv/www
fi
-   if grep "CONFIG_UDHCPD=y" ${B}/.config; then
+   if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-udhcpd 
${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_HWCLOCK=y" ${B}/.config; then
+   if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_UDHCPC=y" ${B}/.config; then
+   if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then
install -d ${D}${sysconfdir}/udhcpc.d
install -d ${D}${datadir}/udhcpc
install -m 0755 ${WORKDIR}/simple.script 
${D}${sysconfdir}/udhcpc.d/50default
sed -i "s:/SBIN_DIR/:${base_sbindir}/:" 
${D}${sysconfdir}/udhcpc.d/50default
install -m 0755 ${WORKDIR}/default.script 
${D}${datadir}/udhcpc/default.script
fi
-   if grep "CONFIG_INETD=y" ${B}/.config; then
+   if grep -q "CONFIG_INETD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/inetd 
${D}${sysconfdir}/init.d/inetd.${BPN}
sed -i "s:/usr/sbin/:${sbindir}/:" 
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
-if grep "CONFIG_MDEV=y" ${B}/.config; then
+if grep -q "CONFIG_MDEV=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
@@ -312,7 +312,7 @@ do_install () {
install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
fi
fi
-if grep "CONFIG_INIT=y" ${B}/.config; then
+if grep -q "CONFIG_INIT=y" ${B}/.config; then
 install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
 install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
 fi
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v4 1/3] busybox: fix conflict with runlevel applet

2018-10-09 Thread Andrej Valek

- remove OE runlevel script which conflicts with busybox's applet
- don't install empty directories

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc   |  4 +---
 meta/recipes-core/busybox/busybox/init.cfg  |  1 +
 meta/recipes-core/busybox/busybox_1.29.2.bb |  1 -
 meta/recipes-core/busybox/files/runlevel| 11 ---
 4 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 meta/recipes-core/busybox/files/runlevel

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index e1fba4243a..7b427ab0f7 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -254,8 +254,7 @@ do_install () {
ln -sf busybox ${D}${base_bindir}/busybox.nosuid
fi
else
-   install -d ${D}${base_bindir} ${D}${base_sbindir}
-   install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
+   install -d ${D}${base_bindir} ${D}${bindir} ${D}${libdir}
cat busybox.links | while read FILE; do
NAME=`basename "$FILE"`
install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}"
@@ -316,7 +315,6 @@ do_install () {
 if grep "CONFIG_INIT=y" ${B}/.config; then
 install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
 install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
-install -D -m 0755 ${WORKDIR}/runlevel 
${D}${base_sbindir}/runlevel
 fi
 
 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
diff --git a/meta/recipes-core/busybox/busybox/init.cfg 
b/meta/recipes-core/busybox/busybox/init.cfg
index 3c1fdd42b6..b69fe0ea9c 100644
--- a/meta/recipes-core/busybox/busybox/init.cfg
+++ b/meta/recipes-core/busybox/busybox/init.cfg
@@ -1,4 +1,5 @@
 CONFIG_INIT=y
+CONFIG_RUNLEVEL=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb 
b/meta/recipes-core/busybox/busybox_1.29.2.bb
index 3496a857c4..df3ea5906b 100644
--- a/meta/recipes-core/busybox/busybox_1.29.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -40,7 +40,6 @@ SRC_URI = 
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://inittab \
file://rcS \
file://rcK \
-   file://runlevel \
file://makefile-libbb-race.patch \
 "
 SRC_URI_append_libc-musl = " file://musl.cfg "
diff --git a/meta/recipes-core/busybox/files/runlevel 
b/meta/recipes-core/busybox/files/runlevel
deleted file mode 100644
index 866f3b5945..00
--- a/meta/recipes-core/busybox/files/runlevel
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# busybox init does not have LSB ( sysvinit ) like initlevels
-# so lets fake it to 5 which is what we default anyway
-# this helps with opkg post installs where it tries to invoke
-# update-rc.d ad post install step.
-# for package upgrades
-# See code in update-rc.d around line 190 where it calls runlevel
-# program
-#
-echo "5"
-
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v4 0/3] busybox: refactor

2018-10-09 Thread Andrej Valek

Changes:

[v2]
 - split into 3 commits
 - fix indent

[v3]
 - remove missed runlevel script

[v4]
 - sync changes with current master

Andrej Valek (3):
  busybox: fix conflict with runlevel applet
  busybox: do not write grep outputs into log
  busybox: unify recipe style

 meta/recipes-core/busybox/busybox.inc   | 114 ++--
 meta/recipes-core/busybox/busybox/init.cfg  |   1 +
 meta/recipes-core/busybox/busybox_1.29.2.bb |   1 -
 meta/recipes-core/busybox/files/runlevel|  11 ---
 4 files changed, 57 insertions(+), 70 deletions(-)
 delete mode 100644 meta/recipes-core/busybox/files/runlevel

-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] selftest/runqemu: Handle SystemExit

2018-10-09 Thread Richard Purdie

The sigchld handler in runqemu can raise a SystemExit when qemu shuts down.
Rather than backtracing, accept this as a successful test result.

ERROR: runqemu.QemuTest.test_qemu_can_shutdown (subunit.RemotedTestCase)
testtools.testresult.real._StringException: Traceback (most recent call last):
  File 
"/home/pokybuild/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/cases/runqemu.py",
 line 183, in test_qemu_can_shutdown
qemu_shutdown_succeeded = 
self._start_qemu_shutdown_check_if_shutdown_succeeded(qemu, shutdown_timeout)
  File 
"/home/pokybuild/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/cases/runqemu.py",
 line 175, in _start_qemu_shutdown_check_if_shutdown_succeeded
time.sleep(1)
  File 
"/home/pokybuild/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/utils/qemurunner.py",
 line 100, in handleSIGCHLD
raise SystemExit
SystemExit

Signed-off-by: Richard Purdie 
---
 meta/lib/oeqa/selftest/cases/runqemu.py | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py 
b/meta/lib/oeqa/selftest/cases/runqemu.py
index e57f503a577..edc2e424e6e 100644
--- a/meta/lib/oeqa/selftest/cases/runqemu.py
+++ b/meta/lib/oeqa/selftest/cases/runqemu.py
@@ -166,14 +166,17 @@ class QemuTest(OESelftestTestCase):
 # when qemu was shutdown by the above shutdown command
 qemu.runner.stop_thread()
 time_track = 0
-while True:
-is_alive = qemu.check()
-if not is_alive:
-return True
-if time_track > timeout:
-return False
-time.sleep(1)
-time_track += 1
+try:
+while True:
+is_alive = qemu.check()
+if not is_alive:
+return True
+if time_track > timeout:
+return False
+time.sleep(1)
+time_track += 1
+except SystemExit:
+return True
 
 def test_qemu_can_shutdown(self):
 self.assertExists(self.qemuboot_conf)
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] qemurunner: Remove the signal handler before stopping qemu

2018-10-09 Thread Richard Purdie

The qemu shutdown can race with the signal handler removal leading to
confusing tracebacks on slower/loaded systems.

Remove the signal handler first before shutting down.

Signed-off-by: Richard Purdie 
---
 meta/lib/oeqa/utils/qemurunner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/utils/qemurunner.py 
b/meta/lib/oeqa/utils/qemurunner.py
index c3c643d7107..dfab1bd5f11 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -350,10 +350,10 @@ class QemuRunner:
 return True
 
 def stop(self):
-self.stop_thread()
-self.stop_qemu_system()
 if hasattr(self, "origchldhandler"):
 signal.signal(signal.SIGCHLD, self.origchldhandler)
+self.stop_thread()
+self.stop_qemu_system()
 if self.runqemu:
 if hasattr(self, "monitorpid"):
 os.kill(self.monitorpid, signal.SIGKILL)
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] lttng-modules: Fix build failure by syncing up with kernel 4.19

2018-10-09 Thread zhe.he

From: He Zhe 

linux-yocto-dev has been upreved to v4.19. This patch backports a patch from
upstream to make lttng-modules sync up with linux-yocto-dev and later
linux-yocto, and fix the following do_compile error.

| 
tmp/work/qemux86_64-poky-linux/lttng-modules/2.10.7-r0/lttng-modules-2.10.7/probes/../probes/lttng-tracepoint-event-impl.h:143:6:
 error: conflict
ing types for 'trace_sock_exceed_buf_limit'
|  void trace_##_name(_proto);
|   ^~

Signed-off-by: He Zhe 
---
 ...ose-sk-wmem-in-sock_exceed_buf_limit-trac.patch | 67 ++
 meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb  |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 
meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch

diff --git 
a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch
 
b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch
new file mode 100644
index 000..92e12df
--- /dev/null
+++ 
b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch
@@ -0,0 +1,67 @@
+From 9e67b4c94b94493123d38379bd9b3eceae23a6f1 Mon Sep 17 00:00:00 2001
+From: Michael Jeanson 
+Date: Fri, 7 Sep 2018 12:21:12 -0400
+Subject: [PATCH] Fix: net: expose sk wmem in sock_exceed_buf_limit tracepoint
+ (4.19)
+
+See upstream commit:
+
+  commit d6f19938eb031ee2158272757db33258153ae59c
+  Author: Yafang Shao 
+  Date:   Sun Jul 1 23:31:30 2018 +0800
+
+net: expose sk wmem in sock_exceed_buf_limit tracepoint
+
+Currently trace_sock_exceed_buf_limit() only show rmem info,
+but wmem limit may also be hit.
+So expose wmem info in this tracepoint as well.
+
+Regarding memcg, I think it is better to introduce a new tracepoint(if
+that is needed), i.e. trace_memcg_limit_hit other than show memcg info in
+trace_sock_exceed_buf_limit.
+
+Signed-off-by: Michael Jeanson 
+Signed-off-by: Mathieu Desnoyers 
+Upstream-Status: Backport
+Signed-off-by: He Zhe 
+---
+ instrumentation/events/lttng-module/sock.h | 23 ++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/instrumentation/events/lttng-module/sock.h 
b/instrumentation/events/lttng-module/sock.h
+index 5cd02ca..cd0c92b 100644
+--- a/instrumentation/events/lttng-module/sock.h
 b/instrumentation/events/lttng-module/sock.h
+@@ -21,7 +21,28 @@ LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
+   )
+ )
+ 
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
++
++LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
++
++  TP_PROTO(struct sock *sk, struct proto *prot, long allocated, int kind),
++
++  TP_ARGS(sk, prot, allocated, kind),
++
++  TP_FIELDS(
++  ctf_string(name, prot->name)
++  ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
++  ctf_integer(long, allocated, allocated)
++  ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot))
++  ctf_integer(int, rmem_alloc, atomic_read(>sk_rmem_alloc))
++  ctf_integer(int, sysctl_wmem, sk_get_wmem0(sk, prot))
++  ctf_integer(int, wmem_alloc, refcount_read(>sk_wmem_alloc))
++  ctf_integer(int, wmem_queued, sk->sk_wmem_queued)
++  ctf_integer(int, kind, kind)
++  )
++)
++
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
+ 
+ LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
+ 
+-- 
+2.7.4
+
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb 
b/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb
index 4f14106..f6c865a 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb
@@ -15,6 +15,7 @@ COMPATIBLE_HOST = 
'(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
+   
file://0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch \
 "
 
 SRC_URI[md5sum] = "d3cb4520948083bf1573a2e4cb7406aa"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for busybox: fix conflict with runlevel applet (rev4)

2018-10-09 Thread Patchwork

== Series Details ==

Series: busybox: fix conflict with runlevel applet (rev4)
Revision: 4
URL   : https://patchwork.openembedded.org/series/14363/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 9a84114a27)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for busybox: fix conflict with runlevel applet (rev5)

2018-10-09 Thread Patchwork

== Series Details ==

Series: busybox: fix conflict with runlevel applet (rev5)
Revision: 5
URL   : https://patchwork.openembedded.org/series/14363/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 9a84114a27)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] glib-2.0: add missing locale dependencies to PN-ptest

2018-10-09 Thread Ross Burton

The test suite skips several tests if the required locales are not found, so add
them as dependencies of glib-2.0-ptest.

Signed-off-by: Ross Burton 
---
 meta/recipes-core/glib-2.0/glib.inc | 13 +
 1 file changed, 13 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib.inc 
b/meta/recipes-core/glib-2.0/glib.inc
index ad4f2aebd71..f78aa9bfe6d 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -152,6 +152,19 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
 glibc-gconv-iso8859-15 \
 glibc-charmap-invariant \
 glibc-localedata-translit-cjk-variants \
+locale-base-tr-tr \
+locale-base-lt-lt \
+locale-base-ja-jp.euc-jp \
+locale-base-fa-ir \
+locale-base-ru-ru \
+locale-base-de-de \
+locale-base-pl-pl \
+locale-base-hr-hr \
+locale-base-el-gr \
+locale-base-fr-fr \
+locale-base-fr-fr \
+locale-base-es-es \
+locale-base-en-gb \
"
 
 INSANE_SKIP_${PN}-ptest += "libdir"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] glib: fix Lithuanian strings in GDate test suite

2018-10-09 Thread Ross Burton

This test suite has hard-coded strings which don't match the new translations in
glibc 2.28, so update the test suite.

Signed-off-by: Ross Burton 
---
 meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch | 20 
 meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch 
b/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch
new file mode 100644
index 000..dd0aff72813
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch
@@ -0,0 +1,20 @@
+Update Lithuanian month names in the test suite as glibc changed the 
translations.
+
+Upstream-Status: Submitted 
[https://gitlab.gnome.org/GNOME/glib/merge_requests/373]
+Signed-off-by: Ross Burton 
+
+diff --git a/glib/tests/date.c b/glib/tests/date.c
+index b801ca704..6646c227c 100644
+--- a/glib/tests/date.c
 b/glib/tests/date.c
+@@ -365,8 +365,8 @@ test_month_names (void)
+   TEST_DATE ( 1,  4, 2018,  "%Y m. %OB",  "2018 m. balandis");
+   TEST_DATE ( 1,  5, 2018,  "%Y m. %OB","2018 m. gegužė");
+   TEST_DATE ( 1,  6, 2018,  "%Y m. %OB",  "2018 m. birželis");
+-  TEST_DATE (17,  7, 2018, "%Y m. %b %e d.", "2018 m. Lie 17 d.");
+-  TEST_DATE ( 1,  8, 2018,  "%Y m. %Ob",   "2018 m. Rgp");
++  TEST_DATE (17,  7, 2018, "%Y m. %b %e d.",   "2018 m. Liep. 17 d.");
++  TEST_DATE ( 1,  8, 2018,  "%Y m. %Ob", "2018 m. rugp.");
+ }
+   else
+ g_test_skip ("locale lt_LT not available, skipping Lithuanian month names 
test");
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb 
b/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
index 6ebf1d25994..1271a7c269b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
@@ -13,6 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz 
\
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
file://0001-Do-not-ignore-return-value-of-write.patch \
file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
+   file://date-lt.patch \
"
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 3/3] busybox: unify recipe style

2018-10-09 Thread Andrej Valek

- change spaces to tabs and unify indent level

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc | 98 +--
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index 97b73c1dc0..10582a7534 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -117,13 +117,13 @@ do_prepare_config () {
${S}/.config
sed -i -e '${configmangle}' ${S}/.config
if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then
- # disable networking applets
- mv ${S}/.config ${S}/.config.oe-tmp
- awk 'BEGIN{net=0}
- /^# Networking Utilities/{net=1}
- /^#$/{if(net){net=net+1}}
- {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \
- ${S}/.config.oe-tmp > ${S}/.config
+   # disable networking applets
+   mv ${S}/.config ${S}/.config.oe-tmp
+   awk 'BEGIN{net=0}
+   /^# Networking Utilities/{net=1}
+   /^#$/{if(net){net=net+1}}
+   {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not 
set")}else{print}}' \
+   ${S}/.config.oe-tmp > ${S}/.config
fi
sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R 
-n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config
sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config
@@ -151,7 +151,7 @@ do_compile() {
export KCONFIG_NOTIMESTAMP=1
fi
if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep 
"CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
-   # split the .config into two parts, and make two busybox binaries
+   # split the .config into two parts, and make two busybox 
binaries
if [ -e .config.orig ]; then
# Need to guard again an interrupted do_compile - 
restore any backup
cp .config.orig .config
@@ -303,51 +303,51 @@ do_install () {
sed -i "s:/usr/sbin/:${sbindir}/:" 
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
-if grep -q "CONFIG_MDEV=y" ${B}/.config; then
-   install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
-   if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
-   install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
-   install -d ${D}${sysconfdir}/mdev
-   install -m 0755 ${WORKDIR}/find-touchscreen.sh 
${D}${sysconfdir}/mdev
-   install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
-   fi
+   if grep -q "CONFIG_MDEV=y" ${B}/.config; then
+   install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
+   if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
+   install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
+   install -d ${D}${sysconfdir}/mdev
+   install -m 0755 ${WORKDIR}/find-touchscreen.sh 
${D}${sysconfdir}/mdev
+   install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
+   fi
+   fi
+   if grep -q "CONFIG_INIT=y" ${B}/.config; then
+   install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
+   install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
+   fi
+
+   if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
+   if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
+   install -d ${D}${systemd_unitdir}/system
+   sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-klogd.service.in \
+   > ${D}${systemd_unitdir}/system/busybox-klogd.service
+   fi
+
+   if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
+   install -d ${D}${systemd_unitdir}/system
+   sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-syslog.service.in \
+   > ${D}${systemd_unitdir}/system/busybox-syslog.service
+   if  [ ! -e 
${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then
+   sed -i '/klog/d' 
${D}${systemd_unitdir}/system/busybox-syslog.service
+   fi
+   if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
+   install -d ${D}${sysconfdir}/default
+   install -m 0644 
${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
+   fi
+   fi
+   fi
+
+   # Remove the sysvinit specific configuration file for systemd systems 
to avoid confusion
+   if

[OE-core] [PATCH v3 2/3] busybox: do not write grep outputs into log

2018-10-09 Thread Andrej Valek

Make grep quiet for prevent to write information into logs.

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index 7b427ab0f7..97b73c1dc0 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -278,32 +278,32 @@ do_install () {
install -m 644 ${WORKDIR}/syslog-startup.conf 
${D}${sysconfdir}/syslog-startup.conf
install -m 644 ${WORKDIR}/syslog.conf 
${D}${sysconfdir}/syslog.conf
fi
-   if grep "CONFIG_CROND=y" ${B}/.config; then
+   if grep -q "CONFIG_CROND=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-cron 
${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_HTTPD=y" ${B}/.config; then
+   if grep -q "CONFIG_HTTPD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-httpd 
${D}${sysconfdir}/init.d/
install -d ${D}/srv/www
fi
-   if grep "CONFIG_UDHCPD=y" ${B}/.config; then
+   if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-udhcpd 
${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_HWCLOCK=y" ${B}/.config; then
+   if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_UDHCPC=y" ${B}/.config; then
+   if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then
install -d ${D}${sysconfdir}/udhcpc.d
install -d ${D}${datadir}/udhcpc
install -m 0755 ${WORKDIR}/simple.script 
${D}${sysconfdir}/udhcpc.d/50default
sed -i "s:/SBIN_DIR/:${base_sbindir}/:" 
${D}${sysconfdir}/udhcpc.d/50default
install -m 0755 ${WORKDIR}/default.script 
${D}${datadir}/udhcpc/default.script
fi
-   if grep "CONFIG_INETD=y" ${B}/.config; then
+   if grep -q "CONFIG_INETD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/inetd 
${D}${sysconfdir}/init.d/inetd.${BPN}
sed -i "s:/usr/sbin/:${sbindir}/:" 
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
-if grep "CONFIG_MDEV=y" ${B}/.config; then
+if grep -q "CONFIG_MDEV=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
@@ -312,7 +312,7 @@ do_install () {
install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
fi
fi
-if grep "CONFIG_INIT=y" ${B}/.config; then
+if grep -q "CONFIG_INIT=y" ${B}/.config; then
 install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
 install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
 fi
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 1/3] busybox: fix conflict with runlevel applet

2018-10-09 Thread Andrej Valek

- remove OE runlevel script which conflicts with busybox's applet
- don't install empty directories

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc   |  4 +---
 meta/recipes-core/busybox/busybox/init.cfg  |  1 +
 meta/recipes-core/busybox/busybox_1.29.2.bb |  1 -
 meta/recipes-core/busybox/files/runlevel| 11 ---
 4 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 meta/recipes-core/busybox/files/runlevel

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index e1fba4243a..7b427ab0f7 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -254,8 +254,7 @@ do_install () {
ln -sf busybox ${D}${base_bindir}/busybox.nosuid
fi
else
-   install -d ${D}${base_bindir} ${D}${base_sbindir}
-   install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
+   install -d ${D}${base_bindir} ${D}${bindir} ${D}${libdir}
cat busybox.links | while read FILE; do
NAME=`basename "$FILE"`
install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}"
@@ -316,7 +315,6 @@ do_install () {
 if grep "CONFIG_INIT=y" ${B}/.config; then
 install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
 install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
-install -D -m 0755 ${WORKDIR}/runlevel 
${D}${base_sbindir}/runlevel
 fi
 
 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
diff --git a/meta/recipes-core/busybox/busybox/init.cfg 
b/meta/recipes-core/busybox/busybox/init.cfg
index 3c1fdd42b6..b69fe0ea9c 100644
--- a/meta/recipes-core/busybox/busybox/init.cfg
+++ b/meta/recipes-core/busybox/busybox/init.cfg
@@ -1,4 +1,5 @@
 CONFIG_INIT=y
+CONFIG_RUNLEVEL=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb 
b/meta/recipes-core/busybox/busybox_1.29.2.bb
index 3496a857c4..df3ea5906b 100644
--- a/meta/recipes-core/busybox/busybox_1.29.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -40,7 +40,6 @@ SRC_URI = 
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://inittab \
file://rcS \
file://rcK \
-   file://runlevel \
file://makefile-libbb-race.patch \
 "
 SRC_URI_append_libc-musl = " file://musl.cfg "
diff --git a/meta/recipes-core/busybox/files/runlevel 
b/meta/recipes-core/busybox/files/runlevel
deleted file mode 100644
index 866f3b5945..00
--- a/meta/recipes-core/busybox/files/runlevel
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# busybox init does not have LSB ( sysvinit ) like initlevels
-# so lets fake it to 5 which is what we default anyway
-# this helps with opkg post installs where it tries to invoke
-# update-rc.d ad post install step.
-# for package upgrades
-# See code in update-rc.d around line 190 where it calls runlevel
-# program
-#
-echo "5"
-
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/3] busybox: fix conflict with runlevel applet

2018-10-09 Thread Burton, Ross

Don't you want to delete runlevel here too?

Ross

On Tue, 9 Oct 2018 at 08:45, Andrej Valek  wrote:

> - remove OE runlevel script which conflicts with busybox's applet
> - don't install empty directories
>
> Signed-off-by: Andrej Valek 
> ---
>  meta/recipes-core/busybox/busybox.inc  | 4 +---
>  meta/recipes-core/busybox/busybox/init.cfg | 1 +
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/busybox/busybox.inc
> b/meta/recipes-core/busybox/busybox.inc
> index e1fba4243a..7b427ab0f7 100644
> --- a/meta/recipes-core/busybox/busybox.inc
> +++ b/meta/recipes-core/busybox/busybox.inc
> @@ -254,8 +254,7 @@ do_install () {
> ln -sf busybox ${D}${base_bindir}/busybox.nosuid
> fi
> else
> -   install -d ${D}${base_bindir} ${D}${base_sbindir}
> -   install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
> +   install -d ${D}${base_bindir} ${D}${bindir} ${D}${libdir}
> cat busybox.links | while read FILE; do
> NAME=`basename "$FILE"`
> install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}"
> @@ -316,7 +315,6 @@ do_install () {
>  if grep "CONFIG_INIT=y" ${B}/.config; then
>  install -D -m 0777 ${WORKDIR}/rcS
> ${D}${sysconfdir}/init.d/rcS
>  install -D -m 0777 ${WORKDIR}/rcK
> ${D}${sysconfdir}/init.d/rcK
> -install -D -m 0755 ${WORKDIR}/runlevel
> ${D}${base_sbindir}/runlevel
>  fi
>
>  if
> ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> diff --git a/meta/recipes-core/busybox/busybox/init.cfg
> b/meta/recipes-core/busybox/busybox/init.cfg
> index 3c1fdd42b6..b69fe0ea9c 100644
> --- a/meta/recipes-core/busybox/busybox/init.cfg
> +++ b/meta/recipes-core/busybox/busybox/init.cfg
> @@ -1,4 +1,5 @@
>  CONFIG_INIT=y
> +CONFIG_RUNLEVEL=y
>  CONFIG_FEATURE_USE_INITTAB=y
>  CONFIG_HALT=y
>  CONFIG_POWEROFF=y
> --
> 2.11.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] Demos for the Yocto Project booth at ELCE in Edinburgh

2018-10-09 Thread Alex Lennon


Hi Nico,

I hope this email finds you well. I am guessing you've stepped up to 
take the Yocto Community banner since Jefro stepped down in June?


I've been in the orbit of the OpenEmbedded/Yocto eco-system for many 
years, since before the Yocto Project was announced by the Linux 
Foundation to us at ELCE 2010 Cambridge.


Recently I kicked off an OpenSource project to enable makers and others 
to live stream events very easily with here at DoES Liverpool


We're calling it #MakeSpaceLive and it's based on Resin.io / Docker / 
Yocto / GStreamer.


I've attached an introductory email my colleague Dan sent to the Yocto 
list as he's coming up to ELCE Edinburgh in his journalistic capacity 
and I've suggested he meets up with the Yocto team and perhaps demos an 
RPi running #MakeSpaceLive code.


Dan's also thinking of hosting a mini-talk or a BoF meeting to see what 
the feedback is from the community on where we need to direct the project.


Please let me know how this fits with your plans.

Kind Regards,

Alex

On 18/09/2018 14:29, Nicolas Dechesne wrote:

Dear all,

As usual, the Yocto Project will have a booth at the ELCE conference
in Edinburgh next month. While the booth is a great opportunity for
everyone to get a new sticker of your favorite project ;-) we are also
very excited when developers from our community get a chance to show
off the fun and cool things they build thanks to the Yocto Project!

If you want to bring any of your cool demo on the YP booth, please
send me an email so that we can plan and discuss any of the logistics!

Also, don't forget the YP Dev Day Europe, which is right after ELCE,
in Edinburgh, more information can be found here:
https://www.yoctoproject.org/yocto-project-dev-day-europe-2018/

cheers
nico


--

Dynamic Devices Ltd 

Alex J Lennon MA (Cantab) MIET MIOD / Director
DoES Liverpool 1st Floor The Tapestry 68 – 76 Kempston Street Liverpool 
L3 8HL, United Kingdom


mobile: +44 (0)7478 346120

Linkedin  Skype 
 
 



This e-mail message may contain confidential or legally privileged 
information and is intended only for the use of the intended 
recipient(s). Any unauthorized disclosure, dissemination, distribution, 
copying or the taking of any action in reliance on the information 
herein is prohibited. E-mails are not secure and cannot be guaranteed to 
be error free as they can be intercepted, amended, or contain viruses. 
Anyone who communicates with us by e-mail is deemed to have accepted 
these risks. Company Name is not responsible for errors or omissions in 
this message and denies any responsibility for any damage arising from 
the use of e-mail. Any opinion and other statement contained in this 
message and any attachment are solely those of the author and do not 
necessarily represent those of the company.


--- Begin Message ---

Greetings Yocto mailing listers,

I am pretty new to Yocto and completely new to this list obviously. So 
allow me to introduce myself.


My name is Dan Lynch and I'm a Linux/FOSS geek/dev and journalist from 
Liverpool. I've been working on a brand new open hardware and FOSS 
project with Alex Lennon who some of you will know, plus another local 
lad called Matt Croughan who you are probably less likely to know.


We started it 2 weeks ago, it's called MakeSpace.Live and it's already 
taken off like a rocket. So much so that I think we could do a good demo 
on the Yocto stand.


I am already going to be in Edinburgh for the Open Source Summit ina 
couple of weeks and Alex mentioned you were looking for people to 
demo/discuss things on your stand.


Do I need to do anything formal to apply or can I just come along with a 
load of Raspberry Pis and cameras? Our project leverages Yocto for the 
Pi images so it is relevant obviously.


Many thanks in advance,

Dan


--
http://danlynch.org
--
___
yocto mailing list
yo...@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

--- End Message ---
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] populate_sdk_base: move template files location to variables

2018-10-09 Thread Andrej Valek

Do we have some blocker for this?

Regards,
Andrej

On 10/4/18 8:40 AM, Andrej Valek wrote:
> Let users to use custom toolchain template files instead of overloading
> the whole function.
> 
> Signed-off-by: Andrej Valek 
> ---
>  meta/classes/populate_sdk_base.bbclass | 11 +++
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/populate_sdk_base.bbclass 
> b/meta/classes/populate_sdk_base.bbclass
> index e07ad0cc6b..d9a391c613 100644
> --- a/meta/classes/populate_sdk_base.bbclass
> +++ b/meta/classes/populate_sdk_base.bbclass
> @@ -228,14 +228,17 @@ fakeroot tar_sdk() {
>   tar ${SDKTAROPTS} -cf - . | xz -T 0 > 
> ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
>  }
>  
> +TOOLCHAIN_SHAR_EXT_TMPL ?= "${COREBASE}/meta/files/toolchain-shar-extract.sh"
> +TOOLCHAIN_SHAR_REL_TMPL ?= 
> "${COREBASE}/meta/files/toolchain-shar-relocate.sh"
> +
>  fakeroot create_shar() {
>   # copy in the template shar extractor script
> - cp ${COREBASE}/meta/files/toolchain-shar-extract.sh 
> ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
> + cp ${TOOLCHAIN_SHAR_EXT_TMPL} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
>  
>   rm -f ${T}/pre_install_command ${T}/post_install_command
>  
>   if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then
> - cp ${COREBASE}/meta/files/toolchain-shar-relocate.sh 
> ${T}/post_install_command
> + cp ${TOOLCHAIN_SHAR_REL_TMPL} ${T}/post_install_command
>   fi
>   cat << "EOF" >> ${T}/pre_install_command
>  ${SDK_PRE_INSTALL_COMMAND}
> @@ -299,8 +302,8 @@ def sdk_variables(d):
>  
>  do_populate_sdk[vardeps] += "${@sdk_variables(d)}"
>  
> -do_populate_sdk[file-checksums] += 
> "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \
> -
> ${COREBASE}/meta/files/toolchain-shar-extract.sh:True"
> +do_populate_sdk[file-checksums] += "${TOOLCHAIN_SHAR_REL_TMPL}:True \
> +${TOOLCHAIN_SHAR_EXT_TMPL}:True"
>  
>  do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
>  do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x 
> in d.getVar('SDK_DEPENDS').split()])}  ${@d.getVarFlag('do_rootfs', 
> 'depends', False)}"
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2 2/3] busybox: do not write grep outputs into log

2018-10-09 Thread Andrej Valek

Make grep quiet for prevent to write information into logs.

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index 7b427ab0f7..97b73c1dc0 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -278,32 +278,32 @@ do_install () {
install -m 644 ${WORKDIR}/syslog-startup.conf 
${D}${sysconfdir}/syslog-startup.conf
install -m 644 ${WORKDIR}/syslog.conf 
${D}${sysconfdir}/syslog.conf
fi
-   if grep "CONFIG_CROND=y" ${B}/.config; then
+   if grep -q "CONFIG_CROND=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-cron 
${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_HTTPD=y" ${B}/.config; then
+   if grep -q "CONFIG_HTTPD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-httpd 
${D}${sysconfdir}/init.d/
install -d ${D}/srv/www
fi
-   if grep "CONFIG_UDHCPD=y" ${B}/.config; then
+   if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-udhcpd 
${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_HWCLOCK=y" ${B}/.config; then
+   if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
fi
-   if grep "CONFIG_UDHCPC=y" ${B}/.config; then
+   if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then
install -d ${D}${sysconfdir}/udhcpc.d
install -d ${D}${datadir}/udhcpc
install -m 0755 ${WORKDIR}/simple.script 
${D}${sysconfdir}/udhcpc.d/50default
sed -i "s:/SBIN_DIR/:${base_sbindir}/:" 
${D}${sysconfdir}/udhcpc.d/50default
install -m 0755 ${WORKDIR}/default.script 
${D}${datadir}/udhcpc/default.script
fi
-   if grep "CONFIG_INETD=y" ${B}/.config; then
+   if grep -q "CONFIG_INETD=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/inetd 
${D}${sysconfdir}/init.d/inetd.${BPN}
sed -i "s:/usr/sbin/:${sbindir}/:" 
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
-if grep "CONFIG_MDEV=y" ${B}/.config; then
+if grep -q "CONFIG_MDEV=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
@@ -312,7 +312,7 @@ do_install () {
install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
fi
fi
-if grep "CONFIG_INIT=y" ${B}/.config; then
+if grep -q "CONFIG_INIT=y" ${B}/.config; then
 install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
 install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
 fi
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2 1/3] busybox: fix conflict with runlevel applet

2018-10-09 Thread Andrej Valek

- remove OE runlevel script which conflicts with busybox's applet
- don't install empty directories

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc  | 4 +---
 meta/recipes-core/busybox/busybox/init.cfg | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index e1fba4243a..7b427ab0f7 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -254,8 +254,7 @@ do_install () {
ln -sf busybox ${D}${base_bindir}/busybox.nosuid
fi
else
-   install -d ${D}${base_bindir} ${D}${base_sbindir}
-   install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
+   install -d ${D}${base_bindir} ${D}${bindir} ${D}${libdir}
cat busybox.links | while read FILE; do
NAME=`basename "$FILE"`
install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}"
@@ -316,7 +315,6 @@ do_install () {
 if grep "CONFIG_INIT=y" ${B}/.config; then
 install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
 install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
-install -D -m 0755 ${WORKDIR}/runlevel 
${D}${base_sbindir}/runlevel
 fi
 
 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
diff --git a/meta/recipes-core/busybox/busybox/init.cfg 
b/meta/recipes-core/busybox/busybox/init.cfg
index 3c1fdd42b6..b69fe0ea9c 100644
--- a/meta/recipes-core/busybox/busybox/init.cfg
+++ b/meta/recipes-core/busybox/busybox/init.cfg
@@ -1,4 +1,5 @@
 CONFIG_INIT=y
+CONFIG_RUNLEVEL=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2 3/3] busybox: unify recipe style

2018-10-09 Thread Andrej Valek

- change spaces to tabs and unify indent level

Signed-off-by: Andrej Valek 
---
 meta/recipes-core/busybox/busybox.inc | 98 +--
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index 97b73c1dc0..10582a7534 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -117,13 +117,13 @@ do_prepare_config () {
${S}/.config
sed -i -e '${configmangle}' ${S}/.config
if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then
- # disable networking applets
- mv ${S}/.config ${S}/.config.oe-tmp
- awk 'BEGIN{net=0}
- /^# Networking Utilities/{net=1}
- /^#$/{if(net){net=net+1}}
- {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \
- ${S}/.config.oe-tmp > ${S}/.config
+   # disable networking applets
+   mv ${S}/.config ${S}/.config.oe-tmp
+   awk 'BEGIN{net=0}
+   /^# Networking Utilities/{net=1}
+   /^#$/{if(net){net=net+1}}
+   {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not 
set")}else{print}}' \
+   ${S}/.config.oe-tmp > ${S}/.config
fi
sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R 
-n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config
sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config
@@ -151,7 +151,7 @@ do_compile() {
export KCONFIG_NOTIMESTAMP=1
fi
if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep 
"CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
-   # split the .config into two parts, and make two busybox binaries
+   # split the .config into two parts, and make two busybox 
binaries
if [ -e .config.orig ]; then
# Need to guard again an interrupted do_compile - 
restore any backup
cp .config.orig .config
@@ -303,51 +303,51 @@ do_install () {
sed -i "s:/usr/sbin/:${sbindir}/:" 
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
-if grep -q "CONFIG_MDEV=y" ${B}/.config; then
-   install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
-   if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
-   install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
-   install -d ${D}${sysconfdir}/mdev
-   install -m 0755 ${WORKDIR}/find-touchscreen.sh 
${D}${sysconfdir}/mdev
-   install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
-   fi
+   if grep -q "CONFIG_MDEV=y" ${B}/.config; then
+   install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
+   if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
+   install -m 644 ${WORKDIR}/mdev.conf 
${D}${sysconfdir}/mdev.conf
+   install -d ${D}${sysconfdir}/mdev
+   install -m 0755 ${WORKDIR}/find-touchscreen.sh 
${D}${sysconfdir}/mdev
+   install -m 0755 ${WORKDIR}/mdev-mount.sh 
${D}${sysconfdir}/mdev
+   fi
+   fi
+   if grep -q "CONFIG_INIT=y" ${B}/.config; then
+   install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
+   install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
+   fi
+
+   if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
+   if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
+   install -d ${D}${systemd_unitdir}/system
+   sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-klogd.service.in \
+   > ${D}${systemd_unitdir}/system/busybox-klogd.service
+   fi
+
+   if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
+   install -d ${D}${systemd_unitdir}/system
+   sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-syslog.service.in \
+   > ${D}${systemd_unitdir}/system/busybox-syslog.service
+   if  [ ! -e 
${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then
+   sed -i '/klog/d' 
${D}${systemd_unitdir}/system/busybox-syslog.service
+   fi
+   if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
+   install -d ${D}${sysconfdir}/default
+   install -m 0644 
${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
+   fi
+   fi
+   fi
+
+   # Remove the sysvinit specific configuration file for systemd systems 
to avoid confusion
+   if

42 matches

Mail list logo