From ee.peng.yeoh at intel.com  Sun Mar  1 00:32:58 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Sun,  1 Mar 2020 08:32:58 +0800
Subject: [oe] [PATCH 1/5] opencv: Enable pkg-config .pc file generation
Message-ID: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>

From: Carlos Rafael Giani <crg7475 at mailbox.org>

In OpenCV 4, .pc file generation is disabled by default. Yet, other
software such as GStreamer and FFmpeg rely on the .pc files during build
time configuration. Explicitely enable .pc file generation to make sure
pkg-config can be used for getting information about OpenCV.

Signed-off-by: Carlos Rafael Giani <crg7475 at mailbox.org>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 77b5dd6..5e89db0 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DCMAKE_SKIP_RPATH=ON \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
+    -DOPENCV_GENERATE_PKGCONFIG=ON \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.7.4


From ee.peng.yeoh at intel.com  Sun Mar  1 00:32:59 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Sun,  1 Mar 2020 08:32:59 +0800
Subject: [oe] [PATCH 2/5] opencv: don't download during configure
In-Reply-To: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583022782-6527-2-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

OpenCV downloads data files during the CMake configure phase, which
is bad because fetching should only happen in do_fetch (and if proxies
are needed, won't be set in do_configure).

The recipe attempts to solve this already by having the repositories in
SRC_URI and moving the files to the correct place before do_configure().
However they are written to ${B} which is then wiped in do_configure so
they're not used.

The OpenCV download logic has a download cache with specially formatted
filenames, so take the downloaded files and populate the cache.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 5e89db0..cfc7854 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -51,10 +51,28 @@ PV = "4.1.0"
 
 S = "${WORKDIR}/git"
 
+# OpenCV wants to download more files during configure.  We download these in
+# do_fetch and construct a source cache in the format it expects
+OPENCV_DLDIR = "${WORKDIR}/downloads"
+
 do_unpack_extra() {
     tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
-    cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
-    cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
+
+    md5() {
+        # Return the MD5 of $1
+        echo $(md5sum $1 | cut -d' ' -f1)
+    }
+    cache() {
+        TAG=$1
+        shift
+        mkdir --parents ${OPENCV_DLDIR}/$TAG
+        for F in $*; do
+            DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F)
+            test -e $DEST || ln -s $F $DEST
+        done
+    }
+    cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
+    cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
 }
 addtask unpack_extra after do_unpack before do_patch
 
@@ -65,6 +83,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
+    -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.7.4


From ee.peng.yeoh at intel.com  Sun Mar  1 00:33:00 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Sun,  1 Mar 2020 08:33:00 +0800
Subject: [oe] [PATCH 3/5] opencv: also download face alignment data in
	do_fetch()
In-Reply-To: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583022782-6527-3-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

The face alignment data is downloaded in do_configure, so download it in
do_fetch and add it to the cache.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index cfc7854..487393f 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
 SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
 
 def ipp_filename(d):
     import re
@@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \
            git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \
            git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \
            file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
            file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \
            file://0003-To-fix-errors-as-following.patch \
@@ -73,6 +75,7 @@ do_unpack_extra() {
     }
     cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
     cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
+    cache data ${WORKDIR}/face/*.dat
 }
 addtask unpack_extra after do_unpack before do_patch
 
-- 
2.7.4


From ee.peng.yeoh at intel.com  Sun Mar  1 00:33:01 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Sun,  1 Mar 2020 08:33:01 +0800
Subject: [oe] [PATCH 4/5] opencv: PACKAGECONFIG for G-API, use system ADE
In-Reply-To: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583022782-6527-4-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

The Graph API is enabled by default, and if ADE isn't present it will
download a copy of the source during do_configure.

Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we
package.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 487393f..03e4f58 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -93,10 +93,11 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
 "
 EXTRA_OECMAKE_append_x86 = " -DX86=ON"
 
-PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
+PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
     ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
 
+PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
 PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
 PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
 PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"
-- 
2.7.4


From ee.peng.yeoh at intel.com  Sun Mar  1 00:33:02 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Sun,  1 Mar 2020 08:33:02 +0800
Subject: [oe] [PATCH 5/5] opencv: abort configure if we need to download
In-Reply-To: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583022782-6527-5-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

OpenCV's habit of downloading files during do_configure is bad form
(as it becomes impossible to do offline builds), so add an option to
error out if a download would be needed.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 .../recipes-support/opencv/opencv/download.patch   | 32 ++++++++++++++++++++++
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb     |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch

diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch b/meta-oe/recipes-support/opencv/opencv/download.patch
new file mode 100644
index 0000000..fa8db88
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/download.patch
@@ -0,0 +1,32 @@
+This CMake module will download files during do_configure.  This is bad as it
+means we can't do offline builds.
+
+Add an option to disallow downloads by emitting a fatal error.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index cdc47ad2cb..74573f45a2 100644
+--- a/cmake/OpenCVDownload.cmake
++++ b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ #    RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it
+ #  Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache
+ 
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files")
+ if(DEFINED ENV{OPENCV_DOWNLOAD_PATH})
+   set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}")
+@@ -153,6 +154,11 @@ function(ocv_download)
+ 
+   # Download
+   if(NOT EXISTS "${CACHE_CANDIDATE}")
++    if(NOT OPENCV_ALLOW_DOWNLOADS)
++      message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++      return()
++    endif()
++
+     ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+     file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
+          INACTIVITY_TIMEOUT 60
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 03e4f58..f679ccb 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -48,6 +48,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            file://0003-To-fix-errors-as-following.patch \
            file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
            file://0001-Dont-use-isystem.patch \
+           file://download.patch \
            "
 PV = "4.1.0"
 
@@ -87,6 +88,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
     -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
+    -DOPENCV_ALLOW_DOWNLOADS=OFF \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.7.4


From raj.khem at gmail.com  Sun Mar  1 02:40:23 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sat, 29 Feb 2020 18:40:23 -0800
Subject: [oe] [PATCH 1/5] opencv: Enable pkg-config .pc file generation
In-Reply-To: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <CAMKF1soxc=WDStbrVAjZzf5CKprvPb4zZW=OVjOB32dtpE944w@mail.gmail.com>

which branch is this intended for? it does not
look it is for master since it sounds more like
backport, please add it to subject prefix so stable
maintainer can get notified about it.

On Sat, Feb 29, 2020 at 4:33 PM Yeoh Ee Peng <ee.peng.yeoh at intel.com> wrote:
>
> From: Carlos Rafael Giani <crg7475 at mailbox.org>
>
> In OpenCV 4, .pc file generation is disabled by default. Yet, other
> software such as GStreamer and FFmpeg rely on the .pc files during build
> time configuration. Explicitely enable .pc file generation to make sure
> pkg-config can be used for getting information about OpenCV.
>
> Signed-off-by: Carlos Rafael Giani <crg7475 at mailbox.org>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
> ---
>  meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> index 77b5dd6..5e89db0 100644
> --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> @@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
>      -DCMAKE_SKIP_RPATH=ON \
>      -DOPENCV_ICV_HASH=${IPP_MD5} \
>      -DIPPROOT=${WORKDIR}/ippicv_lnx \
> +    -DOPENCV_GENERATE_PKGCONFIG=ON \
>      ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
>      ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
>      ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
> --
> 2.7.4
>

From richard.leitner at skidata.com  Sun Mar  1 11:14:00 2020
From: richard.leitner at skidata.com (Richard Leitner)
Date: Sun, 1 Mar 2020 12:14:00 +0100
Subject: [oe] [meta-java] openjre-8 fmacro-prefix-map problem
In-Reply-To: <20200226183011.x7pp6kwn6nlwgcrc@csclub.uwaterloo.ca>
References: <20200226183011.x7pp6kwn6nlwgcrc@csclub.uwaterloo.ca>
Message-ID: <20200301111400.GB1806323@pcleri>

Hi,

On Wed, Feb 26, 2020 at 01:30:11PM -0500, Lennart Sorensen wrote:
> On Mon, Sep 30, 2019, Vincent Prince wrote:
> > Hello again,
> > 
> > I see that there is a patch that should fix the problem:
> > https://git.yoctoproject.org/cgit/cgit.cgi/meta-java/tree/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch
> > It is applied but it seems target compilation options are non filtered?
> 
> I just hit this problem too, and found out why it isn't filtering.
> TARGET_CFLAGS isn't actually exported so the build can't use it to filter.
> 
> Adding this to openjre-8_242.bb fixes the problem:
> 
> export TARGET_CFLAGS
> export TARGET_CXXFLAGS
> 
> No more problem with the host gcc/g++ complaining about -fmacro-prefix-map
> being unknown.

Thanks for the pointer. I'll take a look into it!

regards;rl

> 
> I suspect openjdk-8 would need to same fix but I didn't build that yet.
> 
> -- 
> Len Sorensen
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From otavio.salvador at ossystems.com.br  Sun Mar  1 13:43:46 2020
From: otavio.salvador at ossystems.com.br (Otavio Salvador)
Date: Sun, 1 Mar 2020 10:43:46 -0300
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <20200228150345.11829-1-brgl@bgdev.pl>
References: <20200228150345.11829-1-brgl@bgdev.pl>
Message-ID: <CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>

Hello,

On Fri, Feb 28, 2020 at 12:03 PM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
...
> Over-The-Air updates are a crucial part of IoT systems based on linux.
> There are several OTA update frameworks available and many offer some
> sort of support in yocto (e.g. meta-mender, meta-rauc). There are certain
> operations that are common to all of them such as: generating binary
> delta patches, system recovery, creating provisioning images etc.
>
> This patch proposes to add a new layer in meta-openembedded dedicated to
> OTA. As the first functionality it adds a bbclass for generating binary
> delta images using two popular algorithms - vcdiff and rsync.
>
> Such images can then be easily packaged in update artifacts for different
> OTA frameworks.
>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski at baylibre.com>

I see the value of this, as we are also doing OTA update framework
development, however I wonder if it is worth a new layer for this. For
now, I'd say to put it inside meta-oe directly.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

From ee.peng.yeoh at intel.com  Mon Mar  2 01:27:31 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Mon,  2 Mar 2020 09:27:31 +0800
Subject: [oe] [zeus][PATCH 1/5] opencv: Enable pkg-config .pc file generation
Message-ID: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>

From: Carlos Rafael Giani <crg7475 at mailbox.org>

In OpenCV 4, .pc file generation is disabled by default. Yet, other
software such as GStreamer and FFmpeg rely on the .pc files during build
time configuration. Explicitely enable .pc file generation to make sure
pkg-config can be used for getting information about OpenCV.

Signed-off-by: Carlos Rafael Giani <crg7475 at mailbox.org>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 77b5dd6..5e89db0 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DCMAKE_SKIP_RPATH=ON \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
+    -DOPENCV_GENERATE_PKGCONFIG=ON \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.7.4


From ee.peng.yeoh at intel.com  Mon Mar  2 01:27:32 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Mon,  2 Mar 2020 09:27:32 +0800
Subject: [oe] [zeus][[PATCH 2/5] opencv: don't download during configure
In-Reply-To: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583112455-26910-2-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

OpenCV downloads data files during the CMake configure phase, which
is bad because fetching should only happen in do_fetch (and if proxies
are needed, won't be set in do_configure).

The recipe attempts to solve this already by having the repositories in
SRC_URI and moving the files to the correct place before do_configure().
However they are written to ${B} which is then wiped in do_configure so
they're not used.

The OpenCV download logic has a download cache with specially formatted
filenames, so take the downloaded files and populate the cache.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 5e89db0..cfc7854 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -51,10 +51,28 @@ PV = "4.1.0"
 
 S = "${WORKDIR}/git"
 
+# OpenCV wants to download more files during configure.  We download these in
+# do_fetch and construct a source cache in the format it expects
+OPENCV_DLDIR = "${WORKDIR}/downloads"
+
 do_unpack_extra() {
     tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
-    cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
-    cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
+
+    md5() {
+        # Return the MD5 of $1
+        echo $(md5sum $1 | cut -d' ' -f1)
+    }
+    cache() {
+        TAG=$1
+        shift
+        mkdir --parents ${OPENCV_DLDIR}/$TAG
+        for F in $*; do
+            DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F)
+            test -e $DEST || ln -s $F $DEST
+        done
+    }
+    cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
+    cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
 }
 addtask unpack_extra after do_unpack before do_patch
 
@@ -65,6 +83,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
+    -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.7.4


From ee.peng.yeoh at intel.com  Mon Mar  2 01:27:33 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Mon,  2 Mar 2020 09:27:33 +0800
Subject: [oe] [zeus][[PATCH 3/5] opencv: also download face alignment data
	in do_fetch()
In-Reply-To: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583112455-26910-3-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

The face alignment data is downloaded in do_configure, so download it in
do_fetch and add it to the cache.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index cfc7854..487393f 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
 SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
 
 def ipp_filename(d):
     import re
@@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \
            git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \
            git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \
            file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
            file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \
            file://0003-To-fix-errors-as-following.patch \
@@ -73,6 +75,7 @@ do_unpack_extra() {
     }
     cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
     cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
+    cache data ${WORKDIR}/face/*.dat
 }
 addtask unpack_extra after do_unpack before do_patch
 
-- 
2.7.4


From ee.peng.yeoh at intel.com  Mon Mar  2 01:27:34 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Mon,  2 Mar 2020 09:27:34 +0800
Subject: [oe] [zeus][PATCH 4/5] opencv: PACKAGECONFIG for G-API,
	use system ADE
In-Reply-To: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583112455-26910-4-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

The Graph API is enabled by default, and if ADE isn't present it will
download a copy of the source during do_configure.

Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we
package.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 487393f..03e4f58 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -93,10 +93,11 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
 "
 EXTRA_OECMAKE_append_x86 = " -DX86=ON"
 
-PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
+PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
     ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
 
+PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
 PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
 PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
 PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"
-- 
2.7.4


From ee.peng.yeoh at intel.com  Mon Mar  2 01:27:35 2020
From: ee.peng.yeoh at intel.com (Yeoh Ee Peng)
Date: Mon,  2 Mar 2020 09:27:35 +0800
Subject: [oe] [zeus][PATCH 5/5] opencv: abort configure if we need to
	download
In-Reply-To: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
References: <1583112455-26910-1-git-send-email-ee.peng.yeoh@intel.com>
Message-ID: <1583112455-26910-5-git-send-email-ee.peng.yeoh@intel.com>

From: Ross Burton <ross.burton at intel.com>

OpenCV's habit of downloading files during do_configure is bad form
(as it becomes impossible to do offline builds), so add an option to
error out if a download would be needed.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
 .../recipes-support/opencv/opencv/download.patch   | 32 ++++++++++++++++++++++
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb     |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch

diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch b/meta-oe/recipes-support/opencv/opencv/download.patch
new file mode 100644
index 0000000..fa8db88
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/download.patch
@@ -0,0 +1,32 @@
+This CMake module will download files during do_configure.  This is bad as it
+means we can't do offline builds.
+
+Add an option to disallow downloads by emitting a fatal error.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index cdc47ad2cb..74573f45a2 100644
+--- a/cmake/OpenCVDownload.cmake
++++ b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ #    RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it
+ #  Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache
+ 
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files")
+ if(DEFINED ENV{OPENCV_DOWNLOAD_PATH})
+   set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}")
+@@ -153,6 +154,11 @@ function(ocv_download)
+ 
+   # Download
+   if(NOT EXISTS "${CACHE_CANDIDATE}")
++    if(NOT OPENCV_ALLOW_DOWNLOADS)
++      message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++      return()
++    endif()
++
+     ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+     file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
+          INACTIVITY_TIMEOUT 60
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 03e4f58..f679ccb 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -48,6 +48,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            file://0003-To-fix-errors-as-following.patch \
            file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
            file://0001-Dont-use-isystem.patch \
+           file://download.patch \
            "
 PV = "4.1.0"
 
@@ -87,6 +88,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
     -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
+    -DOPENCV_ALLOW_DOWNLOADS=OFF \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.7.4


From ee.peng.yeoh at intel.com  Mon Mar  2 01:30:37 2020
From: ee.peng.yeoh at intel.com (Yeoh, Ee Peng)
Date: Mon, 2 Mar 2020 01:30:37 +0000
Subject: [oe] [PATCH 1/5] opencv: Enable pkg-config .pc file generation
In-Reply-To: <CAMKF1soxc=WDStbrVAjZzf5CKprvPb4zZW=OVjOB32dtpE944w@mail.gmail.com>
References: <1583022782-6527-1-git-send-email-ee.peng.yeoh@intel.com>
	<CAMKF1soxc=WDStbrVAjZzf5CKprvPb4zZW=OVjOB32dtpE944w@mail.gmail.com>
Message-ID: <BN7PR11MB2721FC59B0578AAAAA707543C8E70@BN7PR11MB2721.namprd11.prod.outlook.com>

Yes, you are right, these series of opencv patches are backport for zeus branch. I missed the prefix while preparing and testing these patches. I had resent them with the zeus branch prefix. Thank you for your correction. 

-----Original Message-----
From: Khem Raj <raj.khem at gmail.com> 
Sent: Sunday, March 1, 2020 10:40 AM
To: Yeoh, Ee Peng <ee.peng.yeoh at intel.com>
Cc: openembeded-devel <openembedded-devel at lists.openembedded.org>; Carlos Rafael Giani <crg7475 at mailbox.org>
Subject: Re: [PATCH 1/5] opencv: Enable pkg-config .pc file generation

which branch is this intended for? it does not look it is for master since it sounds more like backport, please add it to subject prefix so stable maintainer can get notified about it.

On Sat, Feb 29, 2020 at 4:33 PM Yeoh Ee Peng <ee.peng.yeoh at intel.com> wrote:
>
> From: Carlos Rafael Giani <crg7475 at mailbox.org>
>
> In OpenCV 4, .pc file generation is disabled by default. Yet, other 
> software such as GStreamer and FFmpeg rely on the .pc files during 
> build time configuration. Explicitely enable .pc file generation to 
> make sure pkg-config can be used for getting information about OpenCV.
>
> Signed-off-by: Carlos Rafael Giani <crg7475 at mailbox.org>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
> ---
>  meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb 
> b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> index 77b5dd6..5e89db0 100644
> --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> @@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
>      -DCMAKE_SKIP_RPATH=ON \
>      -DOPENCV_ICV_HASH=${IPP_MD5} \
>      -DIPPROOT=${WORKDIR}/ippicv_lnx \
> +    -DOPENCV_GENERATE_PKGCONFIG=ON \
>      ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
>      ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
>      ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", 
> "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 
> -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
> --
> 2.7.4
>

From brgl at bgdev.pl  Mon Mar  2 07:37:15 2020
From: brgl at bgdev.pl (Bartosz Golaszewski)
Date: Mon, 2 Mar 2020 08:37:15 +0100
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
Message-ID: <CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>

niedz., 1 mar 2020 o 14:43 Otavio Salvador
<otavio.salvador at ossystems.com.br> napisa?(a):
>
> Hello,
>
> On Fri, Feb 28, 2020 at 12:03 PM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
> ...
> > Over-The-Air updates are a crucial part of IoT systems based on linux.
> > There are several OTA update frameworks available and many offer some
> > sort of support in yocto (e.g. meta-mender, meta-rauc). There are certain
> > operations that are common to all of them such as: generating binary
> > delta patches, system recovery, creating provisioning images etc.
> >
> > This patch proposes to add a new layer in meta-openembedded dedicated to
> > OTA. As the first functionality it adds a bbclass for generating binary
> > delta images using two popular algorithms - vcdiff and rsync.
> >
> > Such images can then be easily packaged in update artifacts for different
> > OTA frameworks.
> >
> > Signed-off-by: Bartosz Golaszewski <bgolaszewski at baylibre.com>
>
> I see the value of this, as we are also doing OTA update framework
> development, however I wonder if it is worth a new layer for this. For
> now, I'd say to put it inside meta-oe directly.
>

This single class surely doesn't justify a new layer but I have a
bunch of other stuff lined up for upstreaming if this is accepted.
This is thematically separate from most of the recipes in meta-oe too.

Bartosz

From otavio.salvador at ossystems.com.br  Mon Mar  2 11:25:35 2020
From: otavio.salvador at ossystems.com.br (Otavio Salvador)
Date: Mon, 2 Mar 2020 08:25:35 -0300
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
Message-ID: <CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>

On Mon, Mar 2, 2020 at 4:37 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
> niedz., 1 mar 2020 o 14:43 Otavio Salvador
> <otavio.salvador at ossystems.com.br> napisa?(a):
> This single class surely doesn't justify a new layer but I have a
> bunch of other stuff lined up for upstreaming if this is accepted.
> This is thematically separate from most of the recipes in meta-oe too.

So please give us an idea of what are your plans, so we can understand
it better.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

From rpjday at crashcourse.ca  Mon Mar  2 11:40:23 2020
From: rpjday at crashcourse.ca (rpjday at crashcourse.ca)
Date: Mon, 02 Mar 2020 06:40:23 -0500
Subject: [oe] error in meta-oe "indent" recipe file -- absolute path for
 FILES_${PN}-doc"
Message-ID: <20200302064023.Horde.ysbjnASrU_28GwKCJ5dLyb-@crashcourse.ca>


from indent_2.2.12.bb (master):

layer i'm currently perusing applies this patch for indent, with the  
comment that this current error breaks extending this recipe to  
"nativesdk":

FILES_${PN}-doc += "${prefix}/doc/indent/indent.html"
FILES_${PN}-doc_remove = "/usr/doc/indent/indent.html"

certainly seems reasonable to fix this ... should i submit a patch?

rday


From martin.jansa at gmail.com  Mon Mar  2 12:26:52 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Mon, 2 Mar 2020 13:26:52 +0100
Subject: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5
In-Reply-To: <20200229185539.3905864-1-raj.khem@gmail.com>
References: <20200229185539.3905864-1-raj.khem@gmail.com>
Message-ID: <CA+chaQfxab4+mepbvxdNkoj4h9T1T5Qq4TWwne2teiexjyuwnA@mail.gmail.com>

Hi,

added dependency on grpc exists only in meta-networking, so this fails to
parse now.

Cheers,

From pbarker at konsulko.com  Mon Mar  2 17:18:34 2020
From: pbarker at konsulko.com (Paul Barker)
Date: Mon,  2 Mar 2020 17:18:34 +0000
Subject: [oe] [zeus][PATCH] lmsensors: Fix sensord dependencies
Message-ID: <20200302171834.2606-1-pbarker@konsulko.com>

If sensord is removed from PACKAGECONFIG, the recipe should not depend
on rrdtool and the lmsensors package should not depend on
lmsensors-sensord.

Signed-off-by: Paul Barker <pbarker at konsulko.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

Backport of 5674b0a9e8778f7538419451e629ef0c13711123 from master branch.
---
 meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb
index ffafd17f8..316d066d5 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 DEPENDS = " \
     bison-native \
     flex-native \
-    rrdtool \
     virtual/libiconv \
 "
 
@@ -93,7 +92,7 @@ ALLOW_EMPTY_${PN} = "1"
 RDEPENDS_${PN} += " \
     ${PN}-libsensors \
     ${PN}-sensors \
-    ${PN}-sensord \
+    ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \
     ${PN}-fancontrol \
     ${PN}-sensorsdetect \
     ${PN}-sensorsconfconvert \
-- 
2.20.1


From raj.khem at gmail.com  Mon Mar  2 17:22:20 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon, 2 Mar 2020 09:22:20 -0800
Subject: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5
In-Reply-To: <CA+chaQfxab4+mepbvxdNkoj4h9T1T5Qq4TWwne2teiexjyuwnA@mail.gmail.com>
References: <20200229185539.3905864-1-raj.khem@gmail.com>
	<CA+chaQfxab4+mepbvxdNkoj4h9T1T5Qq4TWwne2teiexjyuwnA@mail.gmail.com>
Message-ID: <CAMKF1srZjHaeuTD0FLv0kmmn+Gwq9QThHxhGXB0+WSBSo2bEJg@mail.gmail.com>

On Mon, Mar 2, 2020 at 4:27 AM Martin Jansa <martin.jansa at gmail.com> wrote:
>
> Hi,
>
> added dependency on grpc exists only in meta-networking, so this fails to parse now.
>

I think grpc is common enough to belong to meta-oe as well.

> Cheers,

From brgl at bgdev.pl  Mon Mar  2 17:39:53 2020
From: brgl at bgdev.pl (Bartosz Golaszewski)
Date: Mon, 2 Mar 2020 18:39:53 +0100
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
Message-ID: <CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>

pon., 2 mar 2020 o 12:25 Otavio Salvador
<otavio.salvador at ossystems.com.br> napisa?(a):
>
> On Mon, Mar 2, 2020 at 4:37 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
> > niedz., 1 mar 2020 o 14:43 Otavio Salvador
> > <otavio.salvador at ossystems.com.br> napisa?(a):
> > This single class surely doesn't justify a new layer but I have a
> > bunch of other stuff lined up for upstreaming if this is accepted.
> > This is thematically separate from most of the recipes in meta-oe too.
>
> So please give us an idea of what are your plans, so we can understand
> it better.
>

Sure. Next steps would be:

- Adding a class for generating provisioning partition images.
Basically allowing to split parts of the rootfs into separate ext4 (or
other) image similar to what meta-mender does in its mender-dataimg
class for /data but generalized for configurable directories.

- Adding an image recipe for a factory reset system, where we would
store the provisioning rootfs on a read-only partition together with
an initramfs the role of which would be to reflash the A/B partitions
to bring the device to a known state, this is something we do a lot in
our consulting work.

- Adding standardized target-side scripts for applying binary-delta
images. This uses the fact that many OTA frameworks support extensions
to their client programs. For instance the same script could be used
for applying the vcdiff and rsync patches both as a mender update
module and a rauc handler (with a thin compatibility layer in their
respective OE layers).

It still doesn't exhaust the subject but I think this really makes
sense in a separate layer than being sprinkled all-over meta-oe.

Khem, Armin: any thoughts?

Bart

From otavio.salvador at ossystems.com.br  Mon Mar  2 17:48:18 2020
From: otavio.salvador at ossystems.com.br (Otavio Salvador)
Date: Mon, 2 Mar 2020 14:48:18 -0300
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
Message-ID: <CAP9ODKoF5Eg9YQTSqJmRfeDSyr0a9CtxRoHiHEtZu_JL9ABVrg@mail.gmail.com>

Hello Bartosz,

On Mon, Mar 2, 2020 at 2:39 PM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
> pon., 2 mar 2020 o 12:25 Otavio Salvador
> <otavio.salvador at ossystems.com.br> napisa?(a):
> >
> > On Mon, Mar 2, 2020 at 4:37 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
> > > niedz., 1 mar 2020 o 14:43 Otavio Salvador
> > > <otavio.salvador at ossystems.com.br> napisa?(a):
> Khem, Armin: any thoughts?

All this sounds great, I just don't see it fitting on meta-oe. I'd
like to propose we create an orga for it, on github, and host it
there.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

From raj.khem at gmail.com  Mon Mar  2 18:25:48 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon, 2 Mar 2020 10:25:48 -0800
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
Message-ID: <dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>



On 3/2/20 9:39 AM, Bartosz Golaszewski wrote:
> pon., 2 mar 2020 o 12:25 Otavio Salvador
> <otavio.salvador at ossystems.com.br> napisa?(a):
>>
>> On Mon, Mar 2, 2020 at 4:37 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
>>> niedz., 1 mar 2020 o 14:43 Otavio Salvador
>>> <otavio.salvador at ossystems.com.br> napisa?(a):
>>> This single class surely doesn't justify a new layer but I have a
>>> bunch of other stuff lined up for upstreaming if this is accepted.
>>> This is thematically separate from most of the recipes in meta-oe too.
>>
>> So please give us an idea of what are your plans, so we can understand
>> it better.
>>
> 
> Sure. Next steps would be:
> 
> - Adding a class for generating provisioning partition images.
> Basically allowing to split parts of the rootfs into separate ext4 (or
> other) image similar to what meta-mender does in its mender-dataimg
> class for /data but generalized for configurable directories.
> 
> - Adding an image recipe for a factory reset system, where we would
> store the provisioning rootfs on a read-only partition together with
> an initramfs the role of which would be to reflash the A/B partitions
> to bring the device to a known state, this is something we do a lot in
> our consulting work.
> 
> - Adding standardized target-side scripts for applying binary-delta
> images. This uses the fact that many OTA frameworks support extensions
> to their client programs. For instance the same script could be used
> for applying the vcdiff and rsync patches both as a mender update
> module and a rauc handler (with a thin compatibility layer in their
> respective OE layers).
> 
> It still doesn't exhaust the subject but I think this really makes
> sense in a separate layer than being sprinkled all-over meta-oe.
> 
> Khem, Armin: any thoughts?

there are many ota layers on OE, most of them are self-contained, so a 
question arises, how is this different, somethings here say it could be 
a base layer for all OTAs, which actually seems quite valuable, but it 
has to be such that the existing OTA layers start using pieces from this 
layer, Other part seems to be that its yet another OTA using binary 
delta update techniques, so in such a case, it should be thought of as 
another OTA and perhaps maintained independendently, if there are 
features which are common across all OTAs we can host them in core or 
meta-oe,

> 
> Bart
> 

From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:51 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:51 -0800
Subject: [oe]  [meta-oe][PATCH] collectd: upgrade 5.8.1 -> 5.10.0
Message-ID: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>

0001-conditionally-check-libvirt.patch
Removed because it is not applicable to 5.10.0.

Refresh the following patches:
0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch
0001-configure-Check-for-Wno-error-format-truncation-comp.patch
0001-fix-to-build-with-glibc-2.25.patch

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...-sys-sysctl.h-on-glibc-based-systems.patch | 106 ++++++++++--------
 .../0001-conditionally-check-libvirt.patch    |  39 -------
 ...for-Wno-error-format-truncation-comp.patch |   6 +-
 .../0001-fix-to-build-with-glibc-2.25.patch   |   4 +-
 .../{collectd_5.8.1.bb => collectd_5.10.0.bb} |   5 +-
 5 files changed, 65 insertions(+), 95 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
 rename meta-oe/recipes-extended/collectd/{collectd_5.8.1.bb => collectd_5.10.0.bb} (95%)

diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch b/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch
index 3dee34cd0..57044057b 100644
--- a/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch
+++ b/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch
@@ -3,44 +3,69 @@ From: Khem Raj <raj.khem at gmail.com>
 Date: Sat, 27 Jul 2019 14:20:14 -0700
 Subject: [PATCH] Remove including sys/sysctl.h on glibc based systems
 
-Glibc 2.30 has added deprecation notice and collectd detects it as warning [1]
+Glibc 2.30 has added deprecation notice and collectd detects it as
+warning [1]
 
 Fixes
-sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings]
+sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and
+will be removed." [-Werror,-W#warnings]
 
-[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990
+[1]
+https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990
 
-Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/3234]
+Upstream-Status: Submitted
+[https://github.com/collectd/collectd/pull/3234]
 Signed-off-by: Khem Raj <raj.khem at gmail.com>
 ---
- src/contextswitch.c | 2 +-
- src/memory.c        | 2 +-
- src/swap.c          | 2 +-
- src/uuid.c          | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ src/cpu.c       | 2 +-
+ src/memory.c    | 2 +-
+ src/processes.c | 2 +-
+ src/swap.c      | 2 +-
+ src/uptime.c    | 2 +-
+ src/uuid.c      | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
 
---- a/src/contextswitch.c
-+++ b/src/contextswitch.c
-@@ -26,7 +26,7 @@
- #include "common.h"
- #include "plugin.h"
+diff --git a/src/cpu.c b/src/cpu.c
+index 09d60fe..9d12623 100644
+--- a/src/cpu.c
++++ b/src/cpu.c
+@@ -60,7 +60,7 @@
  
+ #if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) ||                                   \
+     (defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME)
 -#ifdef HAVE_SYS_SYSCTL_H
 +#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
  #include <sys/sysctl.h>
  #endif
  
+diff --git a/src/memory.c b/src/memory.c
+index 10bccde..50a8086 100644
 --- a/src/memory.c
 +++ b/src/memory.c
 @@ -28,7 +28,7 @@
- #include "common.h"
  #include "plugin.h"
+ #include "utils/common/common.h"
  
 -#ifdef HAVE_SYS_SYSCTL_H
 +#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
  #include <sys/sysctl.h>
  #endif
  #ifdef HAVE_SYS_VMMETER_H
+diff --git a/src/processes.c b/src/processes.c
+index f83913a..9f71511 100644
+--- a/src/processes.c
++++ b/src/processes.c
+@@ -87,7 +87,7 @@
+ #if HAVE_MACH_VM_PROT_H
+ #include <mach/vm_prot.h>
+ #endif
+-#if HAVE_SYS_SYSCTL_H
++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
+ #include <sys/sysctl.h>
+ #endif
+ /* #endif HAVE_THREAD_INFO */
+diff --git a/src/swap.c b/src/swap.c
+index 61c9e28..5a475e4 100644
 --- a/src/swap.c
 +++ b/src/swap.c
 @@ -49,7 +49,7 @@
@@ -52,39 +77,8 @@ Signed-off-by: Khem Raj <raj.khem at gmail.com>
  #include <sys/sysctl.h>
  #endif
  #if HAVE_SYS_DKSTAT_H
---- a/src/uuid.c
-+++ b/src/uuid.c
-@@ -29,7 +29,7 @@
- #include "common.h"
- #include "plugin.h"
- 
--#if HAVE_SYS_SYSCTL_H
-+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
- #include <sys/sysctl.h>
- #endif
- 
---- a/src/cpu.c
-+++ b/src/cpu.c
-@@ -60,7 +60,7 @@
- 
- #if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) ||                                   \
-     (defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME)
--#ifdef HAVE_SYS_SYSCTL_H
-+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
- #include <sys/sysctl.h>
- #endif
- 
---- a/src/processes.c
-+++ b/src/processes.c
-@@ -82,7 +82,7 @@
- #if HAVE_MACH_VM_PROT_H
- #include <mach/vm_prot.h>
- #endif
--#if HAVE_SYS_SYSCTL_H
-+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
- #include <sys/sysctl.h>
- #endif
- /* #endif HAVE_THREAD_INFO */
+diff --git a/src/uptime.c b/src/uptime.c
+index 0892bda..4b15150 100644
 --- a/src/uptime.c
 +++ b/src/uptime.c
 @@ -33,7 +33,7 @@
@@ -96,3 +90,19 @@ Signed-off-by: Khem Raj <raj.khem at gmail.com>
  #include <sys/sysctl.h>
  /* Using sysctl interface to retrieve the boot time on *BSD / Darwin / OS X
   * systems */
+diff --git a/src/uuid.c b/src/uuid.c
+index 60d09b5..17e4dd8 100644
+--- a/src/uuid.c
++++ b/src/uuid.c
+@@ -29,7 +29,7 @@
+ #include "plugin.h"
+ #include "utils/common/common.h"
+ 
+-#if HAVE_SYS_SYSCTL_H
++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
+ #include <sys/sysctl.h>
+ #endif
+ 
+-- 
+2.17.1
+
diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
deleted file mode 100644
index 5ee75cb4d..000000000
--- a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 385bf1c2ec57942e17ee529e57eef0dcd99904e6 Mon Sep 17 00:00:00 2001
-From: Roy Li <rongqing.li at windriver.com>
-Date: Tue, 1 Sep 2015 17:00:33 +0800
-Subject: [PATCH] [PATCH] conditionally check libvirt
-
-Upstream-Statue: Pending
-
-check if libvirt is available only when a user wants to use libvirt
-
-Signed-off-by: Roy Li <rongqing.li at windriver.com>
-
----
- configure.ac | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 101d6f9f..a7eca97d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5758,11 +5758,14 @@ else
-   with_libxml2="no (pkg-config doesn't know libxml-2.0)"
- fi
- 
--$PKG_CONFIG --exists libvirt 2>/dev/null
--if test $? = 0; then
--  with_libvirt="yes"
--else
--  with_libvirt="no (pkg-config doesn't know libvirt)"
-+if test "x$enable_libvirt" = "xyes"; then
-+	$PKG_CONFIG --exists libvirt 2>/dev/null
-+	if test "$?" = "0"
-+	then
-+		with_libvirt="yes"
-+	else
-+		with_libvirt="no (pkg-config doesn't know libvirt)"
-+	fi
- fi
- 
- if test "x$with_libxml2" = "xyes"; then
diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
index d2c726800..8d31e12f9 100644
--- a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
+++ b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
@@ -23,9 +23,9 @@ diff --git a/configure.ac b/configure.ac
 index a7eca97d..560eb988 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -6794,6 +6794,7 @@ if test "x$enable_werror" != "xno"; then
-   AM_CFLAGS="$AM_CFLAGS -Werror"
-   AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
+@@ -7101,6 +7101,7 @@ if test "x$GCC" = "xyes"; then
+     AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
+   fi
  fi
 +AX_CHECK_COMPILE_FLAG([-Werror -Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"])
  
diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch
index be942e5ef..1e140f975 100644
--- a/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch
+++ b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch
@@ -11,8 +11,8 @@ diff --git a/src/md.c b/src/md.c
 index 3725f9a..202225b 100644
 --- a/src/md.c
 +++ b/src/md.c
-@@ -25,6 +25,7 @@
- #include "utils_ignorelist.h"
+@@ -26,6 +26,7 @@
+ #include "utils/ignorelist/ignorelist.h"
  
  #include <sys/ioctl.h>
 +#include <sys/sysmacros.h>
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb b/meta-oe/recipes-extended/collectd/collectd_5.10.0.bb
similarity index 95%
rename from meta-oe/recipes-extended/collectd/collectd_5.8.1.bb
rename to meta-oe/recipes-extended/collectd/collectd_5.10.0.bb
index 8b9fd74a8..df3a5b204 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.10.0.bb
@@ -9,15 +9,14 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \
            file://collectd.init \
            file://collectd.service \
            file://no-gcrypt-badpath.patch \
-           file://0001-conditionally-check-libvirt.patch \
            file://0001-fix-to-build-with-glibc-2.25.patch \
            file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \
            file://0005-Disable-new-gcc8-warnings.patch \
            file://0006-libcollectdclient-Fix-string-overflow-errors.patch \
            file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \
            "
-SRC_URI[md5sum] = "bfce96c42cede5243028510bcc57c1e6"
-SRC_URI[sha256sum] = "e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da"
+SRC_URI[md5sum] = "a8344a199b124711bdbec57f1c0b624f"
+SRC_URI[sha256sum] = "a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b"
 
 inherit autotools python3native update-rc.d pkgconfig systemd
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:52 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:52 -0800
Subject: [oe]  [meta-oe][PATCH] dnfdragora: upgrade 1.0.1 -> 1.1.2
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-2-git-send-email-wangmy@cn.fujitsu.com>

refresh the following paches:
0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
0001-To-fix-error-when-do_package.patch
0001-disable-build-manpages.patch

0001-Run-python-scripts-using-env.patch
removed since it is included in 1.1.2

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...PYTHON_INSTALL_DIR-by-running-python.patch | 10 ++++----
 .../0001-Run-python-scripts-using-env.patch   | 25 -------------------
 .../0001-To-fix-error-when-do_package.patch   | 13 +++++-----
 .../0001-disable-build-manpages.patch         | 10 ++++----
 .../dnfdragora/dnfdragora_git.bb              |  7 +++---
 5 files changed, 20 insertions(+), 45 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch

diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
index 46d4dbde4..6a7b1bf31 100644
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
@@ -9,12 +9,12 @@ Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c66b39..1489ef6 100644
+index 230c87b..e699e83 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -19,7 +19,7 @@ else(NOT SPHINX_EXECUTABLE-NOTFOUND)
- 	message(STATUS "Could NOT find sphinx-build.")
- endif(NOT SPHINX_EXECUTABLE-NOTFOUND)
+@@ -19,7 +19,7 @@ else(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
+ 	message(STATUS "Found sphinx-build: ${SPHINX_EXECUTABLE}")
+ endif(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
  
 -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
 +#execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
@@ -22,5 +22,5 @@ index 7c66b39..1489ef6 100644
  execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION)
  message(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch
deleted file mode 100644
index 75b6b8fd9..000000000
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 15d0afcfa4868b7b072b3434bac0064617d61f99 Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui at cn.fujitsu.com>
-Date: Tue, 19 Dec 2017 14:53:14 +0900
-Subject: [PATCH] Run python scripts using env
-
-Otherwise the build tools hardcode the python path into them.
-
-Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
----
- bin/dnfdragora | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/dnfdragora b/bin/dnfdragora
-index b8e0550..cd80f7f 100755
---- a/bin/dnfdragora
-+++ b/bin/dnfdragora
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- # vim: set et ts=4 sw=4:
- #    Copyright 2016-2017 Angelo Naselli <anaselli at linux.it>
- #
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
index 90ce1d0ac..bef471189 100644
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
+++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
@@ -3,7 +3,8 @@ From: Lei Maohui <leimaohui at cn.fujitsu.com>
 Date: Tue, 19 Dec 2017 11:15:29 +0900
 Subject: [PATCH] To fix error when do_package
 
-QA Issue: nativesdk-dnfdragora: Files/directories were installed but not shipped in any package:
+QA Issue: nativesdk-dnfdragora: Files/directories were installed but not
+shipped in any package:
   /etc
   /etc/dnfdragora
   /etc/dnfdragora/dnfdragora.yaml
@@ -14,18 +15,18 @@ Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c66b39..a5659f7 100644
+index 230c87b..1b8d800 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -52,7 +52,7 @@ endif(ENABLE_COMPS)
+@@ -68,7 +68,7 @@ endif(ENABLE_COMPS)
  set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
  set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share")
  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
--set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc")
-+set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc")
+-set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc" CACHE PATH "sysconfig directory (default /etc)")
++set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc" CACHE PATH "sysconfig directory (default /etc)")
  
  # Configure files
  configure_file(${CMAKE_SOURCE_DIR}/etc/dnfdragora.yaml.in ${CMAKE_BINARY_DIR}/etc/dnfdragora.yaml @ONLY)
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
index 88bb63416..c8b105ea3 100644
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
+++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
@@ -9,17 +9,17 @@ Signed-off-by: Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c66b39..fc32750 100644
+index 230c87b..1624998 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -65,7 +65,6 @@ endif(GETTEXT_FOUND)
+@@ -81,7 +81,6 @@ endif(GETTEXT_FOUND)
  
  # Build and install the man-pages
- if(NOT SPHINX_EXECUTABLE-NOTFOUND)
+ if(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
 -	add_subdirectory(man)
- endif(NOT SPHINX_EXECUTABLE-NOTFOUND)
+ endif(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
  
  # Installing application code
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
index 7a51a4a25..007385101 100644
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
+++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
@@ -7,11 +7,10 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git \
            file://0001-disable-build-manpages.patch \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            file://0001-To-fix-error-when-do_package.patch \
-           file://0001-Run-python-scripts-using-env.patch \
            "
 
-PV = "1.0.1+git${SRCPV}"
-SRCREV = "4fef4ce889b8e4fa03191d414f63bfd50796152a"
+PV = "1.1.2+git${SRCPV}"
+SRCREV = "19e123132cfd4efd860e5204261c3c228bfe80a8"
 
 S = "${WORKDIR}/git"
 
@@ -27,7 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=OFF -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}
 
 BBCLASSEXTEND = "nativesdk"
 
-FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora "
+FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora ${sysconfdir}/xdg"
 
 PNBLACKLIST[dnfdragora] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:53 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:53 -0800
Subject: [oe]  [meta-oe][PATCH] freeglut: upgrade 3.0.0 -> 3.2.1
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-3-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../freeglut/{freeglut_3.0.0.bb => freeglut_3.2.1.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/freeglut/{freeglut_3.0.0.bb => freeglut_3.2.1.bb} (78%)

diff --git a/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb b/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
similarity index 78%
rename from meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb
rename to meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
index 3b540bb78..851641c08 100644
--- a/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb
+++ b/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
@@ -4,8 +4,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb"
 
 SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "90c3ca4dd9d51cf32276bc5344ec9754"
-SRC_URI[sha256sum] = "2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2"
+SRC_URI[md5sum] = "cd5c670c1086358598a6d4a9d166949d"
+SRC_URI[sha256sum] = "d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68"
 
 inherit cmake features_check
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:54 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:54 -0800
Subject: [oe]  [meta-oe][PATCH] gtkwave: upgrade 3.3.103 -> 3.3.104
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-4-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../gtkwave/{gtkwave_3.3.103.bb => gtkwave_3.3.104.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/gtkwave/{gtkwave_3.3.103.bb => gtkwave_3.3.104.bb} (85%)

diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb
similarity index 85%
rename from meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb
rename to meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb
index fec3c7ce1..6c06c30aa 100644
--- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb
+++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
 
 SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "5a9a5913f9a02a333b2b23626f153fd7"
-SRC_URI[sha256sum] = "c325abf7cf26c53309a67c0ecaaf196774fa982a717a102c599ac8a516eeeaf7"
+SRC_URI[md5sum] = "23879689ecf7e2cdd2cd5a91c5c601da"
+SRC_URI[sha256sum] = "d20dd1a9307b908439c68122a9f81d3ff434a6bfa5439f0cb01398fec650894f"
 
 inherit pkgconfig autotools gettext texinfo mime mime-xdg
 DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0"
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:55 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:55 -0800
Subject: [oe]  [meta-oe] [PATCH] jsonrpc: upgrade 1.2.0 -> 1.3.0
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-5-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../jsonrpc/{jsonrpc_1.2.0.bb => jsonrpc_1.3.0.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-devtools/jsonrpc/{jsonrpc_1.2.0.bb => jsonrpc_1.3.0.bb} (94%)

diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb
similarity index 94%
rename from meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb
rename to meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb
index dbf44d796..ca9675ed6 100644
--- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb
+++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb
@@ -10,7 +10,7 @@ SECTION = "libs"
 DEPENDS = "curl jsoncpp libmicrohttpd hiredis"
 
 SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp"
-SRCREV = "4ed5b00dcc409405a19e6d8c6478f703153430e1"
+SRCREV = "c696f6932113b81cd20cd4a34fdb1808e773f23e"
 
 S = "${WORKDIR}/git"
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:56 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:56 -0800
Subject: [oe]  [meta-oe] [PATCH] libio-pty-perl: upgrade 1.12 -> 1.14
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-6-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../perl/{libio-pty-perl_1.12.bb => libio-pty-perl_1.14.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-devtools/perl/{libio-pty-perl_1.12.bb => libio-pty-perl_1.14.bb} (73%)

diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb
similarity index 73%
rename from meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb
rename to meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb
index b1a95e577..1ab21d1dc 100644
--- a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb
+++ b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42
 
 SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "11695a1a516b3bd1b90ce75ff0ce3e6d"
-SRC_URI[sha256sum] = "a2ef8770d3309178203f8c8ac25e623e63cf76e97830fd3be280ade1a555290d"
+SRC_URI[md5sum] = "70bcec4b1b19838ed209fb96a13f3e89"
+SRC_URI[sha256sum] = "51f3e4e311128bdb2c6a15f02c51376cb852ccf9df9bebe8dfbb5f9561eb95b5"
 
 S = "${WORKDIR}/IO-Tty-${PV}"
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:57 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:57 -0800
Subject: [oe]  [meta-oe][PATCH] libpwquality: upgrade 1.4.0 -> 1.4.2
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-7-git-send-email-wangmy@cn.fujitsu.com>

refresh add-missing-python-include-dir-for-cross.patch

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...missing-python-include-dir-for-cross.patch | 27 ++++++++-----------
 ...quality_1.4.0.bb => libpwquality_1.4.2.bb} |  4 +--
 2 files changed, 13 insertions(+), 18 deletions(-)
 rename meta-oe/recipes-extended/libpwquality/{libpwquality_1.4.0.bb => libpwquality_1.4.2.bb} (90%)

diff --git a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
index d12492f02..ec8672107 100644
--- a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
+++ b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
@@ -13,28 +13,23 @@ Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/python/Makefile.am b/python/Makefile.am
-index abc5cd3..e35ba71 100644
+index 1d00c0c..52816b2 100644
 --- a/python/Makefile.am
 +++ b/python/Makefile.am
-@@ -14,4 +14,4 @@ all-local:
- 	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=.
+@@ -14,7 +14,7 @@ all-local:
+ 	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
  
  install-exec-local:
--	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix}
-+	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR}
+-	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
++	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR}
+ 
+ clean-local:
+ 	rm -rf py$(PYTHONREV)
 diff --git a/python/setup.py.in b/python/setup.py.in
-index 6457595..d3db0e5 100755
+index a741b91..6759a95 100755
 --- a/python/setup.py.in
 +++ b/python/setup.py.in
-@@ -6,6 +6,7 @@
- 
- from distutils.core import setup, Extension
- from distutils.command.build_ext import build_ext as _build_ext
-+import os
- 
- class build_ext(_build_ext):
-     def genconstants(self, headerfile, outputfile):
-@@ -23,7 +24,7 @@ class build_ext(_build_ext):
+@@ -33,7 +33,7 @@ class sdist(_sdist):
  
  pwqmodule = Extension('pwquality',
              sources = ['pwquality.c'],
@@ -44,5 +39,5 @@ index 6457595..d3db0e5 100755
              libraries = ['pwquality'])
  
 -- 
-1.9.1
+2.17.1
 
diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb
similarity index 90%
rename from meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
rename to meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb
index 9fb25cdc7..24d2f7ec1 100644
--- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
+++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb
@@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME}
            file://add-missing-python-include-dir-for-cross.patch \
 "
 
-SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c"
-SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b"
+SRC_URI[md5sum] = "ae6e61fc33f5dac0de5e847eb7520d71"
+SRC_URI[sha256sum] = "5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e"
 
 UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases"
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:58 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:58 -0800
Subject: [oe]  [meta-oe] [PATCH] protobuf-c: upgrade 1.3.2 -> 1.3.3
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-8-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../protobuf/{protobuf-c_1.3.2.bb => protobuf-c_1.3.3.bb}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-devtools/protobuf/{protobuf-c_1.3.2.bb => protobuf-c_1.3.3.bb} (95%)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
similarity index 95%
rename from meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
index b92f82dec..94c389357 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558"
 
 DEPENDS = "protobuf-native protobuf"
 
-SRCREV = "1390409f4ee4e26d0635310995b516eb702c3f9e"
+SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26"
 
 SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
            file://0001-avoid-race-condition.patch \
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:51:59 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:51:59 -0800
Subject: [oe]  [meta-oe] [PATCH] protobuf: upgrade 3.11.3 -> 3.11.4
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-9-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../protobuf/{protobuf_3.11.3.bb => protobuf_3.11.4.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-devtools/protobuf/{protobuf_3.11.3.bb => protobuf_3.11.4.bb} (98%)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb
similarity index 98%
rename from meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb
index 4fa576a1a..4d6c5b255 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
 DEPENDS = "zlib"
 DEPENDS_append_class-target = " protobuf-native"
 
-SRCREV = "498de9f761bef56a032815ee44b6e6dbe0892cc4"
+SRCREV = "d0bfd5221182da1a7cc280f3337b5e41a89539cf"
 
 SRC_URI = "git://github.com/google/protobuf.git;branch=3.11.x \
            file://run-ptest \
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 11:52:00 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 03:52:00 -0800
Subject: [oe] [meta-python][PATCH] python3-decorator: upgrade 4.4.1 -> 4.4.2
In-Reply-To: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1583236320-114088-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1583236320-114088-10-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 meta-python/recipes-devtools/python/python-decorator.inc      | 4 ++--
 ...{python3-decorator_4.4.1.bb => python3-decorator_4.4.2.bb} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-decorator_4.4.1.bb => python3-decorator_4.4.2.bb} (100%)

diff --git a/meta-python/recipes-devtools/python/python-decorator.inc b/meta-python/recipes-devtools/python/python-decorator.inc
index 65db1a961..3faee3913 100644
--- a/meta-python/recipes-devtools/python/python-decorator.inc
+++ b/meta-python/recipes-devtools/python/python-decorator.inc
@@ -9,8 +9,8 @@ decorator, just because you can."
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=be2fd2007972bf96c08af3293d728b22"
 
-SRC_URI[md5sum] = "933981f288c4230816b5beee8d40e6ea"
-SRC_URI[sha256sum] = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce"
+SRC_URI[md5sum] = "d83c624cce93e6bdfab144821b526e1d"
+SRC_URI[sha256sum] = "e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7"
 
 inherit pypi
 
diff --git a/meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb b/meta-python/recipes-devtools/python/python3-decorator_4.4.2.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb
rename to meta-python/recipes-devtools/python/python3-decorator_4.4.2.bb
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar  3 12:10:22 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 3 Mar 2020 04:10:22 -0800
Subject: [oe]  [meta-oe][PATCH] renderdoc: upgrade 1.5 -> 1.6
Message-ID: <1583237422-114479-1-git-send-email-wangmy@cn.fujitsu.com>

-License-Update: Copyright year updated to 2020.

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../renderdoc/{renderdoc_1.5.bb => renderdoc_1.6.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/renderdoc/{renderdoc_1.5.bb => renderdoc_1.6.bb} (89%)

diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb
similarity index 89%
rename from meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb
rename to meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb
index 5f81e841d..7cb79d070 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb
@@ -2,9 +2,9 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd"
 DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger"
 HOMEPAGE = "https://github.com/baldurk/renderdoc"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9753b1b4fba3261c27d1ce5c1acef667"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772"
 
-SRCREV = "a94f238e37cfe2f142093eb8e5da7775abaa88c6"
+SRCREV = "0e7f772596035137416be01766c2d61205efc63e"
 SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \
 	   file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \
 	   file://0001-Remove-glslang-pool_allocator-setAllocator.patch \
-- 
2.17.1




From peter.kjellerstedt at axis.com  Tue Mar  3 11:02:47 2020
From: peter.kjellerstedt at axis.com (Peter Kjellerstedt)
Date: Tue, 3 Mar 2020 11:02:47 +0000
Subject: [oe] [meta-networking][PATCH] meta-networking:
 s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
In-Reply-To: <3c14fbe1d2b373efc17de48dcf6d7eecc0ae51cc.camel@andred.net>
References: <20200227164219.24229-1-git@andred.net>
	<7bc1a555a6b845899219c29be5723ce7@XBOX03.axis.com>
	<3c14fbe1d2b373efc17de48dcf6d7eecc0ae51cc.camel@andred.net>
Message-ID: <b94e0ab2a6854ce3b472487ea1616612@XBOX03.axis.com>

> -----Original Message-----
> From: Andr? Draszik <git at andred.net>
> Sent: den 29 februari 2020 08:08
> To: Peter Kjellerstedt <peter.kjellerstedt at axis.com>; openembedded-
> devel at lists.openembedded.org
> Subject: Re: [oe] [meta-networking][PATCH] meta-networking:
> s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
> 
> On Fri, 2020-02-28 at 19:55 +0000, Peter Kjellerstedt wrote:
> > > -----Original Message-----
> > > From: openembedded-devel-bounces at lists.openembedded.org <openembedded-
> devel-bounces at lists.openembedded.org> On
> > > Behalf Of Andr? Draszik
> > > Sent: den 27 februari 2020 17:42
> > > To: openembedded-devel at lists.openembedded.org
> > > Subject: [oe] [meta-networking][PATCH] meta-networking:
> s|${COREBASE}/meta/files/common-
> > > licenses|${COMMON_LICENSE_DIR}
> > >
> > > Signed-off-by: Andr? Draszik <git at andred.net>
> > > ---
> > >  meta-networking/recipes-connectivity/samba/samba_4.10.13.bb | 4 ++--
> > >  meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb        | 2 +-
> > >  meta-networking/recipes-support/arptables/arptables_git.bb  | 2 +-
> > >  meta-networking/recipes-support/ncp/ncp_1.2.4.bb            | 2 +-
> > >  4 files changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/meta-networking/recipes-
> connectivity/samba/samba_4.10.13.bb b/meta-networking/recipes-
> > > connectivity/samba/samba_4.10.13.bb
> > > index 71d8fa2f8..4d57255f1 100644
> > > --- a/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > @@ -3,8 +3,8 @@ SECTION = "console/network"
> > >
> > >  LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
> > >  LIC_FILES_CHKSUM =
> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> > > -                    file://${COREBASE}/meta/files/common-
> licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > -                    file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
> > > +                    file://${COMMON_LICENSE_DIR}/LGPL-
> 3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > +                    file://${COMMON_LICENSE_DIR}/GPL-
> 2.0;md5=801f80980d171dd6425610833a22dbe6 "
> >
> > These two are pointless since there is a provided COPYING file.
> > Just remove them.
> >
> > >  SAMBA_MIRROR = "http://samba.org/samba/ftp"
> > >  MIRRORS += "\
> > > diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> b/meta-networking/recipes-
> > > daemons/lldpd/lldpd_1.0.4.bb
> > > index 8fdaf848f..21b02687f 100644
> > > --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > @@ -1,7 +1,7 @@
> > >  SUMMARY = "A 802.1ab implementation (LLDP) to help you locate
> neighbors of all your equipments"
> > >  SECTION = "net/misc"
> > >  LICENSE = "ISC"
> > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> > > +LIC_FILES_CHKSUM =
> "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> >
> > There is a LICENSE file in the tar ball. Please use it instead.
> >
> > >  DEPENDS = "libbsd libevent"
> > >
> > > diff --git a/meta-networking/recipes-
> support/arptables/arptables_git.bb b/meta-networking/recipes-
> > > support/arptables/arptables_git.bb
> > > index cec1d1f77..e88631e08 100644
> > > --- a/meta-networking/recipes-support/arptables/arptables_git.bb
> > > +++ b/meta-networking/recipes-support/arptables/arptables_git.bb
> > > @@ -1,7 +1,7 @@
> > >  SUMMARY = "Administration tool for arp packet filtering"
> > >  SECTION = "net"
> > >  LICENSE = "GPL-2.0"
> > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
> 2.0;md5=801f80980d171dd6425610833a22dbe6"
> >
> > There is a COPYING file in the Git repository. Please use it instead.
> >
> > >  SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f"
> > >  PV = "0.0.4+git${SRCPV}"
> > >
> > > diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-
> networking/recipes-support/ncp/ncp_1.2.4.bb
> > > index f42223b1f..ba6e23e86 100644
> > > --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no
> features, except \
> > >  one: you don't have to type the coordinates of your peer."
> > >  HOMEPAGE = "http://www.fefe.de/ncp"
> > >  LICENSE = "GPLv2"
> >
> > I can find no information about license either in the code or at
> > http://www.fefe.de/ncp. How do you know this license is correct?
> 
> Please see attached email.

Hmm, ok. I think it would be good if this was actually documented in 
the recipe itself then.

> Cheers,
> Andre'
> 
> >
> > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
> 2.0;md5=801f80980d171dd6425610833a22dbe6"
> > >  DEPENDS = "libowfat"
> > >
> > >  SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2"
> > > --
> > > 2.23.0.rc1
> > >
> > > --
> >
> > //Peter

//Peter


From peter.kjellerstedt at axis.com  Tue Mar  3 11:06:16 2020
From: peter.kjellerstedt at axis.com (Peter Kjellerstedt)
Date: Tue, 3 Mar 2020 11:06:16 +0000
Subject: [oe] [meta-networking][PATCH] meta-networking:
 s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
In-Reply-To: <b94e0ab2a6854ce3b472487ea1616612@XBOX03.axis.com>
References: <20200227164219.24229-1-git@andred.net>
	<7bc1a555a6b845899219c29be5723ce7@XBOX03.axis.com>
	<3c14fbe1d2b373efc17de48dcf6d7eecc0ae51cc.camel@andred.net>
	<b94e0ab2a6854ce3b472487ea1616612@XBOX03.axis.com>
Message-ID: <f6e3a8107f404f07a975c1f09902ce91@XBOX03.axis.com>

> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org <openembedded-
> devel-bounces at lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 3 mars 2020 12:03
> To: Andr? Draszik <git at andred.net>; openembedded-
> devel at lists.openembedded.org
> Subject: Re: [oe] [meta-networking][PATCH] meta-networking:
> s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
> 
> > -----Original Message-----
> > From: Andr? Draszik <git at andred.net>
> > Sent: den 29 februari 2020 08:08
> > To: Peter Kjellerstedt <peter.kjellerstedt at axis.com>; openembedded-
> > devel at lists.openembedded.org
> > Subject: Re: [oe] [meta-networking][PATCH] meta-networking:
> > s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
> >
> > On Fri, 2020-02-28 at 19:55 +0000, Peter Kjellerstedt wrote:
> > > > -----Original Message-----
> > > > From: openembedded-devel-bounces at lists.openembedded.org
> <openembedded-
> > devel-bounces at lists.openembedded.org> On
> > > > Behalf Of Andr? Draszik
> > > > Sent: den 27 februari 2020 17:42
> > > > To: openembedded-devel at lists.openembedded.org
> > > > Subject: [oe] [meta-networking][PATCH] meta-networking:
> > s|${COREBASE}/meta/files/common-
> > > > licenses|${COMMON_LICENSE_DIR}
> > > >
> > > > Signed-off-by: Andr? Draszik <git at andred.net>
> > > > ---
> > > >  meta-networking/recipes-connectivity/samba/samba_4.10.13.bb | 4 ++-
> -
> > > >  meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb        | 2 +-
> > > >  meta-networking/recipes-support/arptables/arptables_git.bb  | 2 +-
> > > >  meta-networking/recipes-support/ncp/ncp_1.2.4.bb            | 2 +-
> > > >  4 files changed, 5 insertions(+), 5 deletions(-)
> > > >
> > > > diff --git a/meta-networking/recipes-
> > connectivity/samba/samba_4.10.13.bb b/meta-networking/recipes-
> > > > connectivity/samba/samba_4.10.13.bb
> > > > index 71d8fa2f8..4d57255f1 100644
> > > > --- a/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > > +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > > @@ -3,8 +3,8 @@ SECTION = "console/network"
> > > >
> > > >  LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
> > > >  LIC_FILES_CHKSUM =
> > "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> > > > -                    file://${COREBASE}/meta/files/common-
> > licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > > -                    file://${COREBASE}/meta/files/common-
> > licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
> > > > +                    file://${COMMON_LICENSE_DIR}/LGPL-
> > 3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > > +                    file://${COMMON_LICENSE_DIR}/GPL-
> > 2.0;md5=801f80980d171dd6425610833a22dbe6 "
> > >
> > > These two are pointless since there is a provided COPYING file.
> > > Just remove them.
> > >
> > > >  SAMBA_MIRROR = "http://samba.org/samba/ftp"
> > > >  MIRRORS += "\
> > > > diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > b/meta-networking/recipes-
> > > > daemons/lldpd/lldpd_1.0.4.bb
> > > > index 8fdaf848f..21b02687f 100644
> > > > --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > > +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > > @@ -1,7 +1,7 @@
> > > >  SUMMARY = "A 802.1ab implementation (LLDP) to help you locate
> > neighbors of all your equipments"
> > > >  SECTION = "net/misc"
> > > >  LICENSE = "ISC"
> > > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> > licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> > > > +LIC_FILES_CHKSUM =
> > "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> > >
> > > There is a LICENSE file in the tar ball. Please use it instead.
> > >
> > > >  DEPENDS = "libbsd libevent"
> > > >
> > > > diff --git a/meta-networking/recipes-
> > support/arptables/arptables_git.bb b/meta-networking/recipes-
> > > > support/arptables/arptables_git.bb
> > > > index cec1d1f77..e88631e08 100644
> > > > --- a/meta-networking/recipes-support/arptables/arptables_git.bb
> > > > +++ b/meta-networking/recipes-support/arptables/arptables_git.bb
> > > > @@ -1,7 +1,7 @@
> > > >  SUMMARY = "Administration tool for arp packet filtering"
> > > >  SECTION = "net"
> > > >  LICENSE = "GPL-2.0"
> > > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> > licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > > +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
> > 2.0;md5=801f80980d171dd6425610833a22dbe6"
> > >
> > > There is a COPYING file in the Git repository. Please use it instead.
> > >
> > > >  SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f"
> > > >  PV = "0.0.4+git${SRCPV}"
> > > >
> > > > diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> b/meta-
> > networking/recipes-support/ncp/ncp_1.2.4.bb
> > > > index f42223b1f..ba6e23e86 100644
> > > > --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > > +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > > @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no
> > features, except \
> > > >  one: you don't have to type the coordinates of your peer."
> > > >  HOMEPAGE = "http://www.fefe.de/ncp"
> > > >  LICENSE = "GPLv2"
> > >
> > > I can find no information about license either in the code or at
> > > http://www.fefe.de/ncp. How do you know this license is correct?
> >
> > Please see attached email.
> 
> Hmm, ok. I think it would be good if this was actually documented in
> the recipe itself then.

Or I guess you can put the mail you attached as a LICENSE file alongside 
the recipe and include it as usual via LIC_FILES_CHKSUM (and SRC_URI).

> > Cheers,
> > Andre'
> >
> > >
> > > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> > licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > > +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
> > 2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > >  DEPENDS = "libowfat"
> > > >
> > > >  SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2"
> > > > --
> > > > 2.23.0.rc1
> > > >
> > > > --
> > >
> > > //Peter
> 
> //Peter

//Peter


From git at andred.net  Tue Mar  3 13:45:32 2020
From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=)
Date: Tue,  3 Mar 2020 13:45:32 +0000
Subject: [oe] [meta-oe][PATCH 1/3] nodejs: drop 'gyp' PACKAGECONFIG
Message-ID: <20200303134534.36509-1-git@andred.net>

From: Andr? Draszik <andre.draszik at jci.com>

During the python3 / nodejs update, the dependencies weren't updated, so
using system-gyp ends up trying to use the python2 version of system-
gyp, which will of course fail.
Fixing this to depend on the python3 version of gyp still doesn't
doesn't make things work, though:
    ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of '.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit code 1:
    gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 'ForEachFormat' while loading dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
    Error running GYP

The reason is the following patch nodejs has applied to its version of gyp as
of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in v8.gyp")
upstream):

--- gyp/pylib/gyp/input.py      2020-03-02 12:36:30.788248197 +0000
+++ node.git/tools/gyp/pylib/gyp/input.py    2020-03-02 12:16:09.956707788 +0000
@@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
           oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
           if build_file_dir:  # build_file_dir may be None (see above).
             os.chdir(build_file_dir)
+          sys.path.append(os.getcwd())
           try:

             parsed_contents = shlex.split(contents)
@@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
                              "module (%s): %s" % (parsed_contents[0], e))
             replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
           finally:
+            sys.path.pop()
             os.chdir(oldwd)
           assert replacement != None
         elif command_string:

Since I'm not sure how to deal with that when using system-gyp, and because
the original intention for using system-gyp was to make the previous nodejs
version compatible with python3 by ultimately switching to the python3 version
of system-gyp which isn't necessary anymore, and given nobody else seems to
be using this PACKAGECONFIG, just drop it.

Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 6eb52c209..49bb71e28 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
 
 PACKAGECONFIG ??= "ares icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[gyp] = ",,gyp-py2-native"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -82,8 +81,6 @@ python do_unpack() {
     shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
     if 'ares' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/cares', True)
-    if 'gyp' in d.getVar('PACKAGECONFIG'):
-        shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
     if 'libuv' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/uv', True)
     if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1


From git at andred.net  Tue Mar  3 13:45:33 2020
From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=)
Date: Tue,  3 Mar 2020 13:45:33 +0000
Subject: [oe] [meta-oe][PATCH 2/3] brotli: allow building a -native version
In-Reply-To: <20200303134534.36509-1-git@andred.net>
References: <20200303134534.36509-1-git@andred.net>
Message-ID: <20200303134534.36509-2-git@andred.net>

From: Andr? Draszik <andre.draszik at jci.com>

nodejs (-native) can be built against a system-installed version of
the brotli libraries. Allow doing that by provide a -native version
of brotli.

Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
---
 meta-oe/recipes-extended/brotli/brotli_1.0.7.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
index e4e454bda..70dbcaffb 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
@@ -18,3 +18,5 @@ do_install_append () {
 		mv -v "${lib}" "$(echo ${lib} | sed s/-static//)"
 	done
 }
+
+BBCLASSEXTEND = "native"
-- 
2.23.0.rc1


From git at andred.net  Tue Mar  3 13:45:34 2020
From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=)
Date: Tue,  3 Mar 2020 13:45:34 +0000
Subject: [oe] [meta-oe][PATCH 3/3] nodejs: allow use of system brotli (and
	make default)
In-Reply-To: <20200303134534.36509-1-git@andred.net>
References: <20200303134534.36509-1-git@andred.net>
Message-ID: <20200303134534.36509-3-git@andred.net>

From: Andr? Draszik <andre.draszik at jci.com>

Use system brotli via PACKAGECONFIG by default. So far,
nodejs had been built using its embedded copy of brotli,
which we generally try to avoid, for the known reasons
(independent updates, cve & license checks, etc).

The nodejs patches to enable this have been submitted.
brotli is in meta-oe, so enabling this by default should
not be a problem.

Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
---
 ...-passing-multiple-libs-to-pkg_config.patch | 41 ++++++++++++
 ...allow-use-of-system-installed-brotli.patch | 66 +++++++++++++++++++
 .../recipes-devtools/nodejs/nodejs_12.14.1.bb |  7 +-
 3 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
new file mode 100644
index 000000000..13edf229b
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
@@ -0,0 +1,41 @@
+From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git at andred.net>
+Date: Mon, 2 Mar 2020 12:17:09 +0000
+Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sometimes it's necessary to pass multiple library names to pkg-config,
+e.g. the brotli shared libraries can be pulled in with
+    pkg-config libbrotlienc libbrotlidec
+
+Update the code to handle both, strings (as used so far), and lists
+of strings.
+
+Signed-off-by: Andr? Draszik <git at andred.net>
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.py b/configure.py
+index beb08df088..e3f78f2fed 100755
+--- a/configure.py
++++ b/configure.py
+@@ -680,7 +680,11 @@ def pkg_config(pkg):
+   retval = ()
+   for flag in ['--libs-only-l', '--cflags-only-I',
+                '--libs-only-L', '--modversion']:
+-    args += [flag, pkg]
++    args += [flag]
++    if isinstance(pkg, list):
++      args += pkg
++    else:
++      args += [pkg]
+     try:
+       proc = subprocess.Popen(shlex.split(pkg_config) + args,
+                               stdout=subprocess.PIPE)
+-- 
+2.25.0
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
new file mode 100644
index 000000000..fc038f3aa
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
@@ -0,0 +1,66 @@
+From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git at andred.net>
+Date: Mon, 2 Mar 2020 12:17:35 +0000
+Subject: [PATCH 2/2] build: allow use of system-installed brotli
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+brotli is available as a shared library since 2016, so it makes sense
+to allow its use as a system-installed version.
+
+Some of the infrastructure was in place already (node.gyp and
+node.gypi), but some bits in the configure script here were missing.
+
+Add them, keeping the default as before, to use the bundled version.
+
+Refs: https://github.com/google/brotli/pull/421
+Signed-off-by: Andr? Draszik <git at andred.net>
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/configure.py b/configure.py
+index e3f78f2fed..0190e31b41 100755
+--- a/configure.py
++++ b/configure.py
+@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath',
+     dest='shared_zlib_libpath',
+     help='a directory to search for the shared zlib DLL')
+ 
++shared_optgroup.add_option('--shared-brotli',
++    action='store_true',
++    dest='shared_brotli',
++    help='link to a shared brotli DLL instead of static linking')
++
++shared_optgroup.add_option('--shared-brotli-includes',
++    action='store',
++    dest='shared_brotli_includes',
++    help='directory containing brotli header files')
++
++shared_optgroup.add_option('--shared-brotli-libname',
++    action='store',
++    dest='shared_brotli_libname',
++    default='brotlidec,brotlienc',
++    help='alternative lib name to link to [default: %default]')
++
++shared_optgroup.add_option('--shared-brotli-libpath',
++    action='store',
++    dest='shared_brotli_libpath',
++    help='a directory to search for the shared brotli DLL')
++
+ shared_optgroup.add_option('--shared-cares',
+     action='store_true',
+     dest='shared_cares',
+@@ -1692,6 +1713,7 @@ configure_napi(output)
+ configure_library('zlib', output)
+ configure_library('http_parser', output)
+ configure_library('libuv', output)
++configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
+ configure_library('cares', output, pkgname='libcares')
+ configure_library('nghttp2', output, pkgname='libnghttp2')
+ configure_v8(output)
+-- 
+2.25.0
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 49bb71e28..1ea438c5b 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -20,6 +20,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://0003-Install-both-binaries-and-use-libdir.patch \
            file://0004-v8-don-t-override-ARM-CFLAGS.patch \
            file://big-endian.patch \
+           file://0001-build-allow-passing-multiple-libs-to-pkg_config.patch \
+           file://0002-build-allow-use-of-system-installed-brotli.patch \
            "
 SRC_URI_append_class-target = " \
            file://0002-Using-native-binaries.patch \
@@ -51,8 +53,9 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '-
 GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
 ARCHFLAGS ?= ""
 
-PACKAGECONFIG ??= "ares icu libuv zlib"
+PACKAGECONFIG ??= "ares brotli icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
+PACKAGECONFIG[brotli] = "--shared-brotli,,brotli"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -81,6 +84,8 @@ python do_unpack() {
     shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
     if 'ares' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/cares', True)
+    if 'brotli' in d.getVar('PACKAGECONFIG'):
+        shutil.rmtree(d.getVar('S') + '/deps/brotli', True)
     if 'libuv' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/uv', True)
     if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1


From martin.jansa at gmail.com  Tue Mar  3 13:53:28 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Tue, 3 Mar 2020 14:53:28 +0100
Subject: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5
In-Reply-To: <CAMKF1srZjHaeuTD0FLv0kmmn+Gwq9QThHxhGXB0+WSBSo2bEJg@mail.gmail.com>
References: <20200229185539.3905864-1-raj.khem@gmail.com>
	<CA+chaQfxab4+mepbvxdNkoj4h9T1T5Qq4TWwne2teiexjyuwnA@mail.gmail.com>
	<CAMKF1srZjHaeuTD0FLv0kmmn+Gwq9QThHxhGXB0+WSBSo2bEJg@mail.gmail.com>
Message-ID: <CA+chaQeF7U2C+t+zugHFry2bpxiFbfa294_A_dnfmdvJ-3pw9A@mail.gmail.com>

Should I send the patch to move grpc from meta-networking to meta-oe to fix
this or do you have it already?

On Mon, Mar 2, 2020 at 6:22 PM Khem Raj <raj.khem at gmail.com> wrote:

> On Mon, Mar 2, 2020 at 4:27 AM Martin Jansa <martin.jansa at gmail.com>
> wrote:
> >
> > Hi,
> >
> > added dependency on grpc exists only in meta-networking, so this fails
> to parse now.
> >
>
> I think grpc is common enough to belong to meta-oe as well.
>
> > Cheers,
>

From brgl at bgdev.pl  Tue Mar  3 13:56:24 2020
From: brgl at bgdev.pl (Bartosz Golaszewski)
Date: Tue, 3 Mar 2020 14:56:24 +0100
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
	<dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
Message-ID: <CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>

pon., 2 mar 2020 o 19:25 Khem Raj <raj.khem at gmail.com> napisa?(a):
>
> >
> > Khem, Armin: any thoughts?
>
> there are many ota layers on OE, most of them are self-contained, so a
> question arises, how is this different, somethings here say it could be
> a base layer for all OTAs, which actually seems quite valuable, but it
> has to be such that the existing OTA layers start using pieces from this

No, it's actually the other way around. The existing OTA layers are
focused on supporting specific tools and they usually provide full
support for some reference platforms. However in every custom project
I worked on we needed to extend those layers and those extensions
became quite repetitive, hence the idea for a layer that gathers
common elements but that is independent from project-specific layers.

If anything the goal is to use this *in conjunction* with specialized
OTA layers.

> layer, Other part seems to be that its yet another OTA using binary
> delta update techniques, so in such a case, it should be thought of as
> another OTA and perhaps maintained independendently, if there are
> features which are common across all OTAs we can host them in core or
> meta-oe,
>

No, this is not an OTA on its own and the generation of binary delta
patches is just one of the features.

Let me give you more context on why I started to do this. We've had a
downstream layer for a client's project compatible with thud with a
complete verified boot chain of trust including dm-verity protected
rootfs mounted by an initramfs stored in signed fitImage + OTA
support. Generating this image required us to alter a couple
inter-task dependencies (fitImage needs to wait for initramfs, but
initramfs needs the dm-verity meta-data which needs the rootfs
partition, and then we need to sign the fitImage etc. etc.).

Then some time during warrior development commit 67628ea66b7d
("uboot-sign.bbclass: fix signature and deployment") was merged in
OE-core which caused us a lot of trouble with our dependencies when
trying to update the layer. In order to not make the same mistake
twice - we thought it's best to upstream our development too for
others to use and to be able to object when someone breaks it for us
(I'm mostly a kernel developer and this is how it works in linux, I'm
not sure if it's the same for yocto).

BTW I'm also preparing a series of patches for meta-security with
dm-verity images as part of this effort.

If this is not something that should be part of meta-openembedded - is
there any way to have it hosted at https://git.yoctoproject.org/cgit/
as an official yocto layer? I'm sorry if this is a dumb question, I
don't know exactly what the policy is for that.

Best regards,
Bartosz

From raj.khem at gmail.com  Tue Mar  3 15:27:21 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 07:27:21 -0800
Subject: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5
In-Reply-To: <CA+chaQeF7U2C+t+zugHFry2bpxiFbfa294_A_dnfmdvJ-3pw9A@mail.gmail.com>
References: <20200229185539.3905864-1-raj.khem@gmail.com>
	<CA+chaQfxab4+mepbvxdNkoj4h9T1T5Qq4TWwne2teiexjyuwnA@mail.gmail.com>
	<CAMKF1srZjHaeuTD0FLv0kmmn+Gwq9QThHxhGXB0+WSBSo2bEJg@mail.gmail.com>
	<CA+chaQeF7U2C+t+zugHFry2bpxiFbfa294_A_dnfmdvJ-3pw9A@mail.gmail.com>
Message-ID: <CAMKF1spqvnHXTOMWX8VV4QponpKun+2tpZS4hAG5JpDDdv8xgQ@mail.gmail.com>

On Tue, Mar 3, 2020 at 5:53 AM Martin Jansa <martin.jansa at gmail.com> wrote:

> Should I send the patch to move grpc from meta-networking to meta-oe to
> fix this or do you have it already?
>

Please send I don?t have it ready

>
> On Mon, Mar 2, 2020 at 6:22 PM Khem Raj <raj.khem at gmail.com> wrote:
>
>> On Mon, Mar 2, 2020 at 4:27 AM Martin Jansa <martin.jansa at gmail.com>
>> wrote:
>> >
>> > Hi,
>> >
>> > added dependency on grpc exists only in meta-networking, so this fails
>> to parse now.
>> >
>>
>> I think grpc is common enough to belong to meta-oe as well.
>>
>> > Cheers,
>>
>

From martin.jansa at gmail.com  Tue Mar  3 16:25:08 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Tue,  3 Mar 2020 17:25:08 +0100
Subject: [oe] [meta-oe][meta-networking][PATCH] grpc: move from
	meta-networking to meta-oe
Message-ID: <20200303162508.12573-1-Martin.Jansa@gmail.com>

* because sysdig from meta-oe depends on it now, since:
  commit ed798c764319d83ad9eb1b963bfc99b1fa1a791a
  Author: Khem Raj <raj.khem at gmail.com>
  Date:   Wed Jan 2 17:59:20 2019 -0800

    sysdig: Upgrade to 0.26.5

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../recipes-core/packagegroups/packagegroup-meta-networking.bb  | 2 +-
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb      | 2 +-
 ...1-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0
 ...01-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 0
 .../recipes-devtools/grpc/grpc_1.24.3.bb                        | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch (100%)
 rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch (100%)
 rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc_1.24.3.bb (100%)

diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index 103c99bb17..1e10c3085f 100644
--- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -55,7 +55,7 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\
 RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf"
 
 RDEPENDS_packagegroup-meta-networking-devtools = "\
-    python3-ldap grpc \
+    python3-ldap \
     "
 
 RDEPENDS_packagegroup-meta-networking-extended = "\
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index d09653901c..e04b48f85a 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -110,7 +110,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\
     android-tools android-tools-conf bootchart breakpad \
     capnproto cgdb cscope ctags \
     debootstrap dmalloc flatbuffers \
-    giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \
+    giflib grpc icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \
     kconfig-frontends lemon libedit libgee libsombok3 \
     libubox log4cplus lshw ltrace lua mcpp memstat mercurial \
     mpich msgpack-c nlohmann-json openocd pax-utils \
diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
similarity index 100%
rename from meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
rename to meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
similarity index 100%
rename from meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
rename to meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
similarity index 100%
rename from meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb
rename to meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
-- 
2.20.1


From raj.khem at gmail.com  Tue Mar  3 17:24:47 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 09:24:47 -0800
Subject: [oe] [meta-oe][PATCH 1/3] nodejs: drop 'gyp' PACKAGECONFIG
In-Reply-To: <20200303134534.36509-1-git@andred.net>
References: <20200303134534.36509-1-git@andred.net>
Message-ID: <CAMKF1so8ZV_HZNma1Ddwn6a6irZ_Lurd5-JEqiDaCajpjdN9oA@mail.gmail.com>

can you rebase it on top of master-next and resend

On Tue, Mar 3, 2020 at 5:45 AM Andr? Draszik <git at andred.net> wrote:
>
> From: Andr? Draszik <andre.draszik at jci.com>
>
> During the python3 / nodejs update, the dependencies weren't updated, so
> using system-gyp ends up trying to use the python2 version of system-
> gyp, which will of course fail.
> Fixing this to depend on the python3 version of gyp still doesn't
> doesn't make things work, though:
>     ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of '.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit code 1:
>     gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 'ForEachFormat' while loading dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
>     Error running GYP
>
> The reason is the following patch nodejs has applied to its version of gyp as
> of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in v8.gyp")
> upstream):
>
> --- gyp/pylib/gyp/input.py      2020-03-02 12:36:30.788248197 +0000
> +++ node.git/tools/gyp/pylib/gyp/input.py    2020-03-02 12:16:09.956707788 +0000
> @@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
>            oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
>            if build_file_dir:  # build_file_dir may be None (see above).
>              os.chdir(build_file_dir)
> +          sys.path.append(os.getcwd())
>            try:
>
>              parsed_contents = shlex.split(contents)
> @@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
>                               "module (%s): %s" % (parsed_contents[0], e))
>              replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
>            finally:
> +            sys.path.pop()
>              os.chdir(oldwd)
>            assert replacement != None
>          elif command_string:
>
> Since I'm not sure how to deal with that when using system-gyp, and because
> the original intention for using system-gyp was to make the previous nodejs
> version compatible with python3 by ultimately switching to the python3 version
> of system-gyp which isn't necessary anymore, and given nobody else seems to
> be using this PACKAGECONFIG, just drop it.
>
> Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
> ---
>  meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> index 6eb52c209..49bb71e28 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> @@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
>
>  PACKAGECONFIG ??= "ares icu libuv zlib"
>  PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
> -PACKAGECONFIG[gyp] = ",,gyp-py2-native"
>  PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
>  PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
>  PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
> @@ -82,8 +81,6 @@ python do_unpack() {
>      shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
>      if 'ares' in d.getVar('PACKAGECONFIG'):
>          shutil.rmtree(d.getVar('S') + '/deps/cares', True)
> -    if 'gyp' in d.getVar('PACKAGECONFIG'):
> -        shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
>      if 'libuv' in d.getVar('PACKAGECONFIG'):
>          shutil.rmtree(d.getVar('S') + '/deps/uv', True)
>      if 'nghttp2' in d.getVar('PACKAGECONFIG'):
> --
> 2.23.0.rc1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From raj.khem at gmail.com  Tue Mar  3 17:24:54 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 09:24:54 -0800
Subject: [oe] [meta-oe][PATCH 3/3] nodejs: allow use of system brotli
 (and make default)
In-Reply-To: <20200303134534.36509-3-git@andred.net>
References: <20200303134534.36509-1-git@andred.net>
	<20200303134534.36509-3-git@andred.net>
Message-ID: <CAMKF1sqnBNGEGU5b2DXT7B08XsOYu6mBMqYJgb0RPePCiZx3Rw@mail.gmail.com>

can you rebase it on top of master-next and resend

On Tue, Mar 3, 2020 at 5:46 AM Andr? Draszik <git at andred.net> wrote:
>
> From: Andr? Draszik <andre.draszik at jci.com>
>
> Use system brotli via PACKAGECONFIG by default. So far,
> nodejs had been built using its embedded copy of brotli,
> which we generally try to avoid, for the known reasons
> (independent updates, cve & license checks, etc).
>
> The nodejs patches to enable this have been submitted.
> brotli is in meta-oe, so enabling this by default should
> not be a problem.
>
> Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
> ---
>  ...-passing-multiple-libs-to-pkg_config.patch | 41 ++++++++++++
>  ...allow-use-of-system-installed-brotli.patch | 66 +++++++++++++++++++
>  .../recipes-devtools/nodejs/nodejs_12.14.1.bb |  7 +-
>  3 files changed, 113 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
>  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
> new file mode 100644
> index 000000000..13edf229b
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
> @@ -0,0 +1,41 @@
> +From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git at andred.net>
> +Date: Mon, 2 Mar 2020 12:17:09 +0000
> +Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Sometimes it's necessary to pass multiple library names to pkg-config,
> +e.g. the brotli shared libraries can be pulled in with
> +    pkg-config libbrotlienc libbrotlidec
> +
> +Update the code to handle both, strings (as used so far), and lists
> +of strings.
> +
> +Signed-off-by: Andr? Draszik <git at andred.net>
> +---
> +Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
> + configure.py | 6 +++++-
> + 1 file changed, 5 insertions(+), 1 deletion(-)
> +
> +diff --git a/configure.py b/configure.py
> +index beb08df088..e3f78f2fed 100755
> +--- a/configure.py
> ++++ b/configure.py
> +@@ -680,7 +680,11 @@ def pkg_config(pkg):
> +   retval = ()
> +   for flag in ['--libs-only-l', '--cflags-only-I',
> +                '--libs-only-L', '--modversion']:
> +-    args += [flag, pkg]
> ++    args += [flag]
> ++    if isinstance(pkg, list):
> ++      args += pkg
> ++    else:
> ++      args += [pkg]
> +     try:
> +       proc = subprocess.Popen(shlex.split(pkg_config) + args,
> +                               stdout=subprocess.PIPE)
> +--
> +2.25.0
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
> new file mode 100644
> index 000000000..fc038f3aa
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
> @@ -0,0 +1,66 @@
> +From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git at andred.net>
> +Date: Mon, 2 Mar 2020 12:17:35 +0000
> +Subject: [PATCH 2/2] build: allow use of system-installed brotli
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +brotli is available as a shared library since 2016, so it makes sense
> +to allow its use as a system-installed version.
> +
> +Some of the infrastructure was in place already (node.gyp and
> +node.gypi), but some bits in the configure script here were missing.
> +
> +Add them, keeping the default as before, to use the bundled version.
> +
> +Refs: https://github.com/google/brotli/pull/421
> +Signed-off-by: Andr? Draszik <git at andred.net>
> +---
> +Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
> + configure.py | 22 ++++++++++++++++++++++
> + 1 file changed, 22 insertions(+)
> +
> +diff --git a/configure.py b/configure.py
> +index e3f78f2fed..0190e31b41 100755
> +--- a/configure.py
> ++++ b/configure.py
> +@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath',
> +     dest='shared_zlib_libpath',
> +     help='a directory to search for the shared zlib DLL')
> +
> ++shared_optgroup.add_option('--shared-brotli',
> ++    action='store_true',
> ++    dest='shared_brotli',
> ++    help='link to a shared brotli DLL instead of static linking')
> ++
> ++shared_optgroup.add_option('--shared-brotli-includes',
> ++    action='store',
> ++    dest='shared_brotli_includes',
> ++    help='directory containing brotli header files')
> ++
> ++shared_optgroup.add_option('--shared-brotli-libname',
> ++    action='store',
> ++    dest='shared_brotli_libname',
> ++    default='brotlidec,brotlienc',
> ++    help='alternative lib name to link to [default: %default]')
> ++
> ++shared_optgroup.add_option('--shared-brotli-libpath',
> ++    action='store',
> ++    dest='shared_brotli_libpath',
> ++    help='a directory to search for the shared brotli DLL')
> ++
> + shared_optgroup.add_option('--shared-cares',
> +     action='store_true',
> +     dest='shared_cares',
> +@@ -1692,6 +1713,7 @@ configure_napi(output)
> + configure_library('zlib', output)
> + configure_library('http_parser', output)
> + configure_library('libuv', output)
> ++configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
> + configure_library('cares', output, pkgname='libcares')
> + configure_library('nghttp2', output, pkgname='libnghttp2')
> + configure_v8(output)
> +--
> +2.25.0
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> index 49bb71e28..1ea438c5b 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> @@ -20,6 +20,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
>             file://0003-Install-both-binaries-and-use-libdir.patch \
>             file://0004-v8-don-t-override-ARM-CFLAGS.patch \
>             file://big-endian.patch \
> +           file://0001-build-allow-passing-multiple-libs-to-pkg_config.patch \
> +           file://0002-build-allow-use-of-system-installed-brotli.patch \
>             "
>  SRC_URI_append_class-target = " \
>             file://0002-Using-native-binaries.patch \
> @@ -51,8 +53,9 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '-
>  GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
>  ARCHFLAGS ?= ""
>
> -PACKAGECONFIG ??= "ares icu libuv zlib"
> +PACKAGECONFIG ??= "ares brotli icu libuv zlib"
>  PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
> +PACKAGECONFIG[brotli] = "--shared-brotli,,brotli"
>  PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
>  PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
>  PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
> @@ -81,6 +84,8 @@ python do_unpack() {
>      shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
>      if 'ares' in d.getVar('PACKAGECONFIG'):
>          shutil.rmtree(d.getVar('S') + '/deps/cares', True)
> +    if 'brotli' in d.getVar('PACKAGECONFIG'):
> +        shutil.rmtree(d.getVar('S') + '/deps/brotli', True)
>      if 'libuv' in d.getVar('PACKAGECONFIG'):
>          shutil.rmtree(d.getVar('S') + '/deps/uv', True)
>      if 'nghttp2' in d.getVar('PACKAGECONFIG'):
> --
> 2.23.0.rc1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From git at andred.net  Tue Mar  3 17:28:50 2020
From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=)
Date: Tue,  3 Mar 2020 17:28:50 +0000
Subject: [oe] [meta-oe][master-next][PATCH v2 1/2] nodejs: drop 'gyp'
	PACKAGECONFIG
Message-ID: <20200303172851.19000-1-git@andred.net>

From: Andr? Draszik <andre.draszik at jci.com>

During the python3 / nodejs update, the dependencies weren't updated, so
using system-gyp ends up trying to use the python2 version of system-
gyp, which will of course fail.
Fixing this to depend on the python3 version of gyp still doesn't
doesn't make things work, though:
    ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of '.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit code 1:
    gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 'ForEachFormat' while loading dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
    Error running GYP

The reason is the following patch nodejs has applied to its version of gyp as
of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in v8.gyp")
upstream):

--- gyp/pylib/gyp/input.py      2020-03-02 12:36:30.788248197 +0000
+++ node.git/tools/gyp/pylib/gyp/input.py    2020-03-02 12:16:09.956707788 +0000
@@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
           oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
           if build_file_dir:  # build_file_dir may be None (see above).
             os.chdir(build_file_dir)
+          sys.path.append(os.getcwd())
           try:

             parsed_contents = shlex.split(contents)
@@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
                              "module (%s): %s" % (parsed_contents[0], e))
             replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
           finally:
+            sys.path.pop()
             os.chdir(oldwd)
           assert replacement != None
         elif command_string:

Since I'm not sure how to deal with that when using system-gyp, and because
the original intention for using system-gyp was to make the previous nodejs
version compatible with python3 by ultimately switching to the python3 version
of system-gyp which isn't necessary anymore, and given nobody else seems to
be using this PACKAGECONFIG, just drop it.

Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 6eb52c209..49bb71e28 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
 
 PACKAGECONFIG ??= "ares icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[gyp] = ",,gyp-py2-native"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -82,8 +81,6 @@ python do_unpack() {
     shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
     if 'ares' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/cares', True)
-    if 'gyp' in d.getVar('PACKAGECONFIG'):
-        shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
     if 'libuv' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/uv', True)
     if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1


From git at andred.net  Tue Mar  3 17:28:51 2020
From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=)
Date: Tue,  3 Mar 2020 17:28:51 +0000
Subject: [oe] [meta-oe][master-next][PATCH v2 2/2] nodejs: allow use of
	system brotli (and make default)
In-Reply-To: <20200303172851.19000-1-git@andred.net>
References: <20200303172851.19000-1-git@andred.net>
Message-ID: <20200303172851.19000-2-git@andred.net>

From: Andr? Draszik <andre.draszik at jci.com>

Use system brotli via PACKAGECONFIG by default. So far,
nodejs had been built using its embedded copy of brotli,
which we generally try to avoid, for the known reasons
(independent updates, cve & license checks, etc).

The nodejs patches to enable this have been submitted.
brotli is in meta-oe, so enabling this by default should
not be a problem.

Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
---
 ...-passing-multiple-libs-to-pkg_config.patch | 41 ++++++++++++
 ...allow-use-of-system-installed-brotli.patch | 66 +++++++++++++++++++
 .../recipes-devtools/nodejs/nodejs_12.14.1.bb |  7 +-
 3 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
new file mode 100644
index 000000000..13edf229b
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
@@ -0,0 +1,41 @@
+From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git at andred.net>
+Date: Mon, 2 Mar 2020 12:17:09 +0000
+Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sometimes it's necessary to pass multiple library names to pkg-config,
+e.g. the brotli shared libraries can be pulled in with
+    pkg-config libbrotlienc libbrotlidec
+
+Update the code to handle both, strings (as used so far), and lists
+of strings.
+
+Signed-off-by: Andr? Draszik <git at andred.net>
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.py b/configure.py
+index beb08df088..e3f78f2fed 100755
+--- a/configure.py
++++ b/configure.py
+@@ -680,7 +680,11 @@ def pkg_config(pkg):
+   retval = ()
+   for flag in ['--libs-only-l', '--cflags-only-I',
+                '--libs-only-L', '--modversion']:
+-    args += [flag, pkg]
++    args += [flag]
++    if isinstance(pkg, list):
++      args += pkg
++    else:
++      args += [pkg]
+     try:
+       proc = subprocess.Popen(shlex.split(pkg_config) + args,
+                               stdout=subprocess.PIPE)
+-- 
+2.25.0
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
new file mode 100644
index 000000000..fc038f3aa
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
@@ -0,0 +1,66 @@
+From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git at andred.net>
+Date: Mon, 2 Mar 2020 12:17:35 +0000
+Subject: [PATCH 2/2] build: allow use of system-installed brotli
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+brotli is available as a shared library since 2016, so it makes sense
+to allow its use as a system-installed version.
+
+Some of the infrastructure was in place already (node.gyp and
+node.gypi), but some bits in the configure script here were missing.
+
+Add them, keeping the default as before, to use the bundled version.
+
+Refs: https://github.com/google/brotli/pull/421
+Signed-off-by: Andr? Draszik <git at andred.net>
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/configure.py b/configure.py
+index e3f78f2fed..0190e31b41 100755
+--- a/configure.py
++++ b/configure.py
+@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath',
+     dest='shared_zlib_libpath',
+     help='a directory to search for the shared zlib DLL')
+ 
++shared_optgroup.add_option('--shared-brotli',
++    action='store_true',
++    dest='shared_brotli',
++    help='link to a shared brotli DLL instead of static linking')
++
++shared_optgroup.add_option('--shared-brotli-includes',
++    action='store',
++    dest='shared_brotli_includes',
++    help='directory containing brotli header files')
++
++shared_optgroup.add_option('--shared-brotli-libname',
++    action='store',
++    dest='shared_brotli_libname',
++    default='brotlidec,brotlienc',
++    help='alternative lib name to link to [default: %default]')
++
++shared_optgroup.add_option('--shared-brotli-libpath',
++    action='store',
++    dest='shared_brotli_libpath',
++    help='a directory to search for the shared brotli DLL')
++
+ shared_optgroup.add_option('--shared-cares',
+     action='store_true',
+     dest='shared_cares',
+@@ -1692,6 +1713,7 @@ configure_napi(output)
+ configure_library('zlib', output)
+ configure_library('http_parser', output)
+ configure_library('libuv', output)
++configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
+ configure_library('cares', output, pkgname='libcares')
+ configure_library('nghttp2', output, pkgname='libnghttp2')
+ configure_v8(output)
+-- 
+2.25.0
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 49bb71e28..1ea438c5b 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -20,6 +20,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://0003-Install-both-binaries-and-use-libdir.patch \
            file://0004-v8-don-t-override-ARM-CFLAGS.patch \
            file://big-endian.patch \
+           file://0001-build-allow-passing-multiple-libs-to-pkg_config.patch \
+           file://0002-build-allow-use-of-system-installed-brotli.patch \
            "
 SRC_URI_append_class-target = " \
            file://0002-Using-native-binaries.patch \
@@ -51,8 +53,9 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '-
 GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
 ARCHFLAGS ?= ""
 
-PACKAGECONFIG ??= "ares icu libuv zlib"
+PACKAGECONFIG ??= "ares brotli icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
+PACKAGECONFIG[brotli] = "--shared-brotli,,brotli"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -81,6 +84,8 @@ python do_unpack() {
     shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
     if 'ares' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/cares', True)
+    if 'brotli' in d.getVar('PACKAGECONFIG'):
+        shutil.rmtree(d.getVar('S') + '/deps/brotli', True)
     if 'libuv' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/uv', True)
     if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1


From raj.khem at gmail.com  Tue Mar  3 18:00:38 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 10:00:38 -0800
Subject: [oe] [meta-oe][master-next][PATCH v2 1/2] nodejs: drop 'gyp'
 PACKAGECONFIG
In-Reply-To: <20200303172851.19000-1-git@andred.net>
References: <20200303172851.19000-1-git@andred.net>
Message-ID: <6daa6cf0-6cce-8a7f-fae2-4c36e3c7bad3@gmail.com>



On 3/3/20 9:28 AM, Andr? Draszik wrote:
> From: Andr? Draszik <andre.draszik at jci.com>
> 
> During the python3 / nodejs update, the dependencies weren't updated, so
> using system-gyp ends up trying to use the python2 version of system-
> gyp, which will of course fail.
> Fixing this to depend on the python3 version of gyp still doesn't
> doesn't make things work, though:
>      ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of '.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit code 1:
>      gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 'ForEachFormat' while loading dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
>      Error running GYP
> 
> The reason is the following patch nodejs has applied to its version of gyp as
> of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in v8.gyp")
> upstream):
> 
> --- gyp/pylib/gyp/input.py      2020-03-02 12:36:30.788248197 +0000
> +++ node.git/tools/gyp/pylib/gyp/input.py    2020-03-02 12:16:09.956707788 +0000
> @@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
>             oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
>             if build_file_dir:  # build_file_dir may be None (see above).
>               os.chdir(build_file_dir)
> +          sys.path.append(os.getcwd())
>             try:
> 
>               parsed_contents = shlex.split(contents)
> @@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
>                                "module (%s): %s" % (parsed_contents[0], e))
>               replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
>             finally:
> +            sys.path.pop()
>               os.chdir(oldwd)
>             assert replacement != None
>           elif command_string:


Please avoid adding diffs to commit message, this confuses git am
perhaps better to express the change with few words.

> 
> Since I'm not sure how to deal with that when using system-gyp, and because
> the original intention for using system-gyp was to make the previous nodejs
> version compatible with python3 by ultimately switching to the python3 version
> of system-gyp which isn't necessary anymore, and given nobody else seems to
> be using this PACKAGECONFIG, just drop it.
> 
> Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
> ---
>   meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> index 6eb52c209..49bb71e28 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> @@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
>   
>   PACKAGECONFIG ??= "ares icu libuv zlib"
>   PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
> -PACKAGECONFIG[gyp] = ",,gyp-py2-native"
>   PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
>   PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
>   PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
> @@ -82,8 +81,6 @@ python do_unpack() {
>       shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
>       if 'ares' in d.getVar('PACKAGECONFIG'):
>           shutil.rmtree(d.getVar('S') + '/deps/cares', True)
> -    if 'gyp' in d.getVar('PACKAGECONFIG'):
> -        shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
>       if 'libuv' in d.getVar('PACKAGECONFIG'):
>           shutil.rmtree(d.getVar('S') + '/deps/uv', True)
>       if 'nghttp2' in d.getVar('PACKAGECONFIG'):
> 

From git at andred.net  Tue Mar  3 18:22:36 2020
From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=)
Date: Tue,  3 Mar 2020 18:22:36 +0000
Subject: [oe] [meta-oe][master-next][PATCH v3] nodejs: drop 'gyp'
	PACKAGECONFIG
Message-ID: <20200303182236.20312-1-git@andred.net>

From: Andr? Draszik <andre.draszik at jci.com>

During the python3 / nodejs update, the dependencies weren't updated, so
using system-gyp ends up trying to use the python2 version of system-
gyp, which will of course fail.
Fixing this to depend on the python3 version of gyp still doesn't
doesn't make things work, though:
    ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of '.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit code 1:
    gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 'ForEachFormat' while loading dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
    Error running GYP

The reason is commit fff922afee6e ("deps,build: compute torque_outputs in v8.gyp")
in NodeJS v12, where they modified their bundled version of gyp to
become incompatible with the upstream version of gyp by adding extra /
unusual search paths to gyp.

Since I'm not sure how to deal with that when using system-gyp, and because
the original intention for using system-gyp was to make the previous nodejs
version compatible with python3 by ultimately switching to the python3 version
of system-gyp which isn't necessary anymore, and given nobody else seems to
be using this PACKAGECONFIG, just drop it.

Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 6eb52c209..49bb71e28 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
 
 PACKAGECONFIG ??= "ares icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[gyp] = ",,gyp-py2-native"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -82,8 +81,6 @@ python do_unpack() {
     shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
     if 'ares' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/cares', True)
-    if 'gyp' in d.getVar('PACKAGECONFIG'):
-        shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
     if 'libuv' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/uv', True)
     if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1


From git at andred.net  Tue Mar  3 18:23:22 2020
From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik)
Date: Tue, 03 Mar 2020 18:23:22 +0000
Subject: [oe] [meta-oe][master-next][PATCH v2 1/2] nodejs: drop 'gyp'
 PACKAGECONFIG
In-Reply-To: <6daa6cf0-6cce-8a7f-fae2-4c36e3c7bad3@gmail.com>
References: <20200303172851.19000-1-git@andred.net>
	<6daa6cf0-6cce-8a7f-fae2-4c36e3c7bad3@gmail.com>
Message-ID: <df06534ba04e39f5a4948283407ca00024458113.camel@andred.net>

On Tue, 2020-03-03 at 10:00 -0800, Khem Raj wrote:
> 
> On 3/3/20 9:28 AM, Andr? Draszik wrote:
> > From: Andr? Draszik <andre.draszik at jci.com>
> > 
> > During the python3 / nodejs update, the dependencies weren't updated, so
> > using system-gyp ends up trying to use the python2 version of system-
> > gyp, which will of course fail.
> > Fixing this to depend on the python3 version of gyp still doesn't
> > doesn't make things work, though:
> >      ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of '.../nodejs-native/12.14.1-
> > r0/temp/run.do_configure.26054' failed with exit code 1:
> >      gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 'ForEachFormat' while loading
> > dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load .../nodejs-native/12.14.1-
> > r0/node-v12.14.1/node.gyp
> >      Error running GYP
> > 
> > The reason is the following patch nodejs has applied to its version of gyp as
> > of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in v8.gyp")
> > upstream):
> > 
> > --- gyp/pylib/gyp/input.py      2020-03-02 12:36:30.788248197 +0000
> > +++ node.git/tools/gyp/pylib/gyp/input.py    2020-03-02 12:16:09.956707788 +0000
> > @@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
> >             oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
> >             if build_file_dir:  # build_file_dir may be None (see above).
> >               os.chdir(build_file_dir)
> > +          sys.path.append(os.getcwd())
> >             try:
> > 
> >               parsed_contents = shlex.split(contents)
> > @@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
> >                                "module (%s): %s" % (parsed_contents[0], e))
> >               replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
> >             finally:
> > +            sys.path.pop()
> >               os.chdir(oldwd)
> >             assert replacement != None
> >           elif command_string:
> 
> Please avoid adding diffs to commit message, this confuses git am
> perhaps better to express the change with few words.

Sorry Khem, I didn't think of that... Done.

A.

> 
> > Since I'm not sure how to deal with that when using system-gyp, and because
> > the original intention for using system-gyp was to make the previous nodejs
> > version compatible with python3 by ultimately switching to the python3 version
> > of system-gyp which isn't necessary anymore, and given nobody else seems to
> > be using this PACKAGECONFIG, just drop it.
> > 
> > Signed-off-by: Andr? Draszik <andre.draszik at jci.com>
> > ---
> >   meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
> >   1 file changed, 3 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> > index 6eb52c209..49bb71e28 100644
> > --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> > @@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
> >   
> >   PACKAGECONFIG ??= "ares icu libuv zlib"
> >   PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
> > -PACKAGECONFIG[gyp] = ",,gyp-py2-native"
> >   PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
> >   PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
> >   PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
> > @@ -82,8 +81,6 @@ python do_unpack() {
> >       shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
> >       if 'ares' in d.getVar('PACKAGECONFIG'):
> >           shutil.rmtree(d.getVar('S') + '/deps/cares', True)
> > -    if 'gyp' in d.getVar('PACKAGECONFIG'):
> > -        shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
> >       if 'libuv' in d.getVar('PACKAGECONFIG'):
> >           shutil.rmtree(d.getVar('S') + '/deps/uv', True)
> >       if 'nghttp2' in d.getVar('PACKAGECONFIG'):
> > 


From raj.khem at gmail.com  Tue Mar  3 21:10:14 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue,  3 Mar 2020 13:10:14 -0800
Subject: [oe] [meta-networking][PATCH] dlm: Fix host-user-contaminated QA
	errors
Message-ID: <20200303211014.2213437-1-raj.khem@gmail.com>

- Drop unused 0001-dlm-fix-package-qa-error.patch
- Merge appends into main task
- remove explicitly mentioning systemd in deps, systemd bbclass will add it
- Add a patch to fix install using cp cmd to preserve file permissions

Fixes
dlm: /usr/lib/libdlmcontrol.so.3 is owned by uid 1000, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../dlm/0001-dlm-fix-package-qa-error.patch   | 32 ------------
 ...ce-cp-a-with-mode-preserving-options.patch | 51 +++++++++++++++++++
 .../recipes-extended/dlm/dlm_4.0.9.bb         | 24 +++------
 3 files changed, 59 insertions(+), 48 deletions(-)
 delete mode 100644 meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch
 create mode 100644 meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch

diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch
deleted file mode 100644
index 3e384f7d97..0000000000
--- a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1fb68433bde97d571fc781b52c9521b17fbb8df0 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li at windriver.com>
-Date: Tue, 24 Jul 2018 17:42:43 +0800
-Subject: [PATCH] dlm: fix package qa error
-
-pass LDFLAG to makefile to fix below error:
-do_package_qa: QA Issue: No GNU_HASH in the elf binary:
-/packages-split/dlm/usr/sbin/dlm_stonith' [ldflags]
-
-Upstream-Status: Inappropriate[oe-specific]
-
-Signed-off-by: Changqing Li <changqing.li at windriver.com>
----
- fence/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fence/Makefile b/fence/Makefile
-index cca0b2c..2b3963c 100644
---- a/fence/Makefile
-+++ b/fence/Makefile
-@@ -33,7 +33,7 @@ BIN_CFLAGS += -fPIE -DPIE
- BIN_CFLAGS += `pkg-config libxml-2.0 --cflags`
- BIN_CFLAGS += -I../include
- 
--BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
- BIN_LDFLAGS += `pkg-config libxml-2.0 --libs`
- BIN_LDFLAGS += -ldl
- 
--- 
-2.7.4
-
diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch
new file mode 100644
index 0000000000..e6a37579ed
--- /dev/null
+++ b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch
@@ -0,0 +1,51 @@
+From 2f72f9271b8dd61ca5092e025b0f8243c6fd68f2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Tue, 3 Mar 2020 12:38:19 -0800
+Subject: [PATCH] make: Replace cp -a with mode preserving options
+
+Helps fix permissions in staging area
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ dlm_controld/Makefile | 4 ++--
+ libdlm/Makefile       | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
+index 6081cf8..fe71be2 100644
+--- a/dlm_controld/Makefile
++++ b/dlm_controld/Makefile
+@@ -88,8 +88,8 @@ install: all
+ 	$(INSTALL) -d $(DESTDIR)/$(PKGDIR)
+ 	$(INSTALL) -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR)
+ 	$(INSTALL) -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
+ 	$(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR)
+ 	$(INSTALL) -m 644 libdlmcontrol.h $(DESTDIR)/$(HDRDIR)
+ 	$(INSTALL) -m 644 dlm_controld.8 $(DESTDIR)/$(MANDIR)/man8/
+diff --git a/libdlm/Makefile b/libdlm/Makefile
+index ab32761..8820bf8 100644
+--- a/libdlm/Makefile
++++ b/libdlm/Makefile
+@@ -125,10 +125,10 @@ install: all
+ 	$(INSTALL) -d $(DESTDIR)/$(UDEVDIR)
+ 	$(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR)
+ 	$(INSTALL) -c -m 755 $(LLT_TARGET) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LLT_SO) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LLT_SO) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR)
+ 	$(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR)
+ 	$(INSTALL) -m 644 $(LLT_PC) $(DESTDIR)/$(PKGDIR)
+ 	$(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR)
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb
index 4bf9944aad..577db7087f 100644
--- a/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb
+++ b/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb
@@ -8,6 +8,7 @@ REQUIRED_DISTRO_FEATURES = "systemd"
 SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \
            file://0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch \
            file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \
+           file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \
            "
 
 SRC_URI[md5sum] = "4c57a941a15547859cd38fd55f66388e"
@@ -21,7 +22,7 @@ LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d"
 
 S = "${WORKDIR}/dlm-dlm-${PV}"
 
-DEPENDS = "corosync systemd"
+DEPENDS += "corosync"
 
 inherit pkgconfig systemd features_check
 
@@ -40,29 +41,20 @@ do_compile_prepend_toolchain-clang() {
     sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile
 }
 
-do_compile_prepend() {
+do_compile() {
     sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile
     sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile
-}
-
-do_compile () {
     oe_runmake 'CC=${CC}'
 }
 
-do_install_append (){
-    install -d ${D}${sysconfdir}/sysconfig/
-    install -d ${D}${sysconfdir}/init.d/
-    install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm
-    install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm
+do_install() {
+    oe_runmake install DESTDIR=${D} LIBDIR=${libdir}
+    install -Dm 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm
+    install -Dm 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm
 
     # install systemd unit files
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-        install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system
+        install -Dm 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system/dlm.service
     fi
 }
 
-do_install() {
-    oe_runmake install DESTDIR=${D} LIBDIR=${libdir}
-}
-
-- 
2.25.1


From leo.yan at linaro.org  Wed Mar  4 03:00:48 2020
From: leo.yan at linaro.org (Leo Yan)
Date: Wed, 4 Mar 2020 11:00:48 +0800
Subject: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3
In-Reply-To: <CAMKF1sq3DnDjXNyyUs5g3rbQp295gEP3xrYteL3adUOOy3Nkug@mail.gmail.com>
References: <20200226122622.33171-1-leo.yan@linaro.org>
	<CAMKF1sq3DnDjXNyyUs5g3rbQp295gEP3xrYteL3adUOOy3Nkug@mail.gmail.com>
Message-ID: <20200304030048.GB8032@leoy-ThinkPad-X240s>

Hi Khem,

On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
> I am seeing version going backward errors still
> 
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
> went backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
> went backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
> went backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]

I googled for this issue, the backwards issue is likely caused by the
PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".

So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
version sequence as:

Old:   2.0.5+git${SRCPV}
Now:   2.1.0+beta3
Later: 2.1.0+git${SRCPV}

Does this make sense for you?

Thanks,
Leo

> On Wed, Feb 26, 2020 at 4:26 AM Leo Yan <leo.yan at linaro.org> wrote:
> >
> > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> >
> > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
> > at 436 with fuzz 1 (offset 123 lines)."
> >
> > Signed-off-by: Leo Yan <leo.yan at linaro.org>
> > ---
> >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
> >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}       | 13 ++++++-------
> >  2 files changed, 8 insertions(+), 9 deletions(-)
> >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (90%)
> >
> > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > index c39ef6fd4..807cc4417 100644
> > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
> >  ===================================================================
> >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
> >  +++ LuaJIT-2.0.5/src/lj_arch.h
> > -@@ -313,7 +313,7 @@
> > - #error "Need at least GCC 4.2 or newer"
> > +@@ -436,7 +436,7 @@
> > + #endif
> >   #endif
> >   #elif !LJ_TARGET_PS3
> >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > similarity index 90%
> > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> > index 93128dda8..2a7243842 100644
> > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > @@ -1,14 +1,14 @@
> >  SUMMARY = "Just-In-Time Compiler for Lua"
> >  LICENSE = "MIT"
> > -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> > +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> >  HOMEPAGE = "http://luajit.org"
> >
> > -PV .= "+git${SRCPV}"
> > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> > +PV = "2.0.5+2.1.0-beta3"
> > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
> > +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
> >             file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
> >             file://clang.patch \
> > -"
> > +           "
> >
> >  S = "${WORKDIR}/git"
> >
> > @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
> >  "
> >  FILES_luajit-common = "${datadir}/${BPN}-${PV}"
> >
> > -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
> > -COMPATIBLE_HOST_aarch64 = "null"
> > +# mips64/ppc/ppc64/riscv64 is not supported in this release
> >  COMPATIBLE_HOST_mipsarchn32 = "null"
> >  COMPATIBLE_HOST_mipsarchn64 = "null"
> >  COMPATIBLE_HOST_powerpc = "null"
> > --
> > 2.17.1
> >

From Haiqing.Bai at windriver.com  Wed Mar  4 03:20:51 2020
From: Haiqing.Bai at windriver.com (Haiqing Bai)
Date: Wed, 4 Mar 2020 11:20:51 +0800
Subject: [oe] [zeus][PATCH] gd: fix CVE-2017-6363
Message-ID: <1583292052-256796-1-git-send-email-Haiqing.Bai@windriver.com>

Backport the CVE patch from the upstream to fix the heap-based buffer
over-read in tiffWriter.

Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
---
 .../recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++++++++++++++++++
 meta-oe/recipes-support/gd/gd_2.2.5.bb        |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch

diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
new file mode 100644
index 000000000..25b5880ff
--- /dev/null
+++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
@@ -0,0 +1,35 @@
+From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier at gentoo.org>
+Date: Wed, 31 Jan 2018 14:50:16 -0500
+Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds
+ #383
+
+The gd image formats allow for a palette of 256 colors,
+so if the transparent index is out of range, disable it.
+
+Upstream-Status: Backport
+[https://github.com/libgd/libgd.git commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c]
+CVE-2017-6363
+
+Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
+---
+ src/gd_gd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gd_gd.c b/src/gd_gd.c
+index f8d39cb..5a86fc3 100644
+--- a/src/gd_gd.c
++++ b/src/gd_gd.c
+@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag)
+ 		if (!gdGetWord (&im->transparent, in)) {
+ 			goto fail1;
+ 		}
+-		if (im->transparent == 257) {
++		/* Make sure transparent index is within bounds of the palette. */
++		if (im->transparent >= 256 || im->transparent < 0) {
+ 			im->transparent = (-1);
+ 		}
+ 	}
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb
index 35f9bb251..dda2e67d6 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
            file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \
            file://CVE-2018-1000222.patch \
            file://CVE-2019-6978.patch \
+           file://CVE-2017-6363.patch \
           "
 
 SRCREV = "8255231b68889597d04d451a72438ab92a405aba"
-- 
2.23.0


From raj.khem at gmail.com  Wed Mar  4 03:25:07 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 19:25:07 -0800
Subject: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3
In-Reply-To: <20200304030048.GB8032@leoy-ThinkPad-X240s>
References: <20200226122622.33171-1-leo.yan@linaro.org>
	<CAMKF1sq3DnDjXNyyUs5g3rbQp295gEP3xrYteL3adUOOy3Nkug@mail.gmail.com>
	<20200304030048.GB8032@leoy-ThinkPad-X240s>
Message-ID: <CAMKF1soEtOcQaWbJ7CEwJO1Ck_jHejZVHcQwmMZrH19mUyVgcQ@mail.gmail.com>

I have pushed a fix with ~

On Tue, Mar 3, 2020 at 7:00 PM Leo Yan <leo.yan at linaro.org> wrote:

> Hi Khem,
>
> On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
> > I am seeing version going backward errors still
> >
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
>
> I googled for this issue, the backwards issue is likely caused by the
> PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".
>
> So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
> we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
> version sequence as:
>
> Old:   2.0.5+git${SRCPV}
> Now:   2.1.0+beta3
> Later: 2.1.0+git${SRCPV}
>
> Does this make sense for you?
>
> Thanks,
> Leo
>
> > On Wed, Feb 26, 2020 at 4:26 AM Leo Yan <leo.yan at linaro.org> wrote:
> > >
> > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> > >
> > > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
> > > at 436 with fuzz 1 (offset 123 lines)."
> > >
> > > Signed-off-by: Leo Yan <leo.yan at linaro.org>
> > > ---
> > >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
> > >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}       | 13
> ++++++-------
> > >  2 files changed, 8 insertions(+), 9 deletions(-)
> > >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb =>
> luajit_git.bb} (90%)
> > >
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > index c39ef6fd4..807cc4417 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
> > >  ===================================================================
> > >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
> > >  +++ LuaJIT-2.0.5/src/lj_arch.h
> > > -@@ -313,7 +313,7 @@
> > > - #error "Need at least GCC 4.2 or newer"
> > > +@@ -436,7 +436,7 @@
> > > + #endif
> > >   #endif
> > >   #elif !LJ_TARGET_PS3
> > >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > similarity index 90%
> > > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > index 93128dda8..2a7243842 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > @@ -1,14 +1,14 @@
> > >  SUMMARY = "Just-In-Time Compiler for Lua"
> > >  LICENSE = "MIT"
> > > -LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> > > +LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> > >  HOMEPAGE = "http://luajit.org"
> > >
> > > -PV .= "+git${SRCPV}"
> > > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> > > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> > > +PV = "2.0.5+2.1.0-beta3"
> > > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
> > > +SRC_URI = "git://
> luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
> > >
>  file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
> > >             file://clang.patch \
> > > -"
> > > +           "
> > >
> > >  S = "${WORKDIR}/git"
> > >
> > > @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
> > >  "
> > >  FILES_luajit-common = "${datadir}/${BPN}-${PV}"
> > >
> > > -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
> > > -COMPATIBLE_HOST_aarch64 = "null"
> > > +# mips64/ppc/ppc64/riscv64 is not supported in this release
> > >  COMPATIBLE_HOST_mipsarchn32 = "null"
> > >  COMPATIBLE_HOST_mipsarchn64 = "null"
> > >  COMPATIBLE_HOST_powerpc = "null"
> > > --
> > > 2.17.1
> > >
>

From leo.yan at linaro.org  Wed Mar  4 03:38:55 2020
From: leo.yan at linaro.org (Leo Yan)
Date: Wed, 4 Mar 2020 11:38:55 +0800
Subject: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3
In-Reply-To: <CAMKF1soEtOcQaWbJ7CEwJO1Ck_jHejZVHcQwmMZrH19mUyVgcQ@mail.gmail.com>
References: <20200226122622.33171-1-leo.yan@linaro.org>
	<CAMKF1sq3DnDjXNyyUs5g3rbQp295gEP3xrYteL3adUOOy3Nkug@mail.gmail.com>
	<20200304030048.GB8032@leoy-ThinkPad-X240s>
	<CAMKF1soEtOcQaWbJ7CEwJO1Ck_jHejZVHcQwmMZrH19mUyVgcQ@mail.gmail.com>
Message-ID: <20200304033855.GC8032@leoy-ThinkPad-X240s>

On Tue, Mar 03, 2020 at 07:25:07PM -0800, Khem Raj wrote:
> I have pushed a fix with ~

Ah, I see that: PV = "2.1.0~beta3".  Thanks a lot!

Leo

From martin.jansa at gmail.com  Wed Mar  4 04:43:38 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Wed, 4 Mar 2020 05:43:38 +0100
Subject: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3
In-Reply-To: <20200304030048.GB8032@leoy-ThinkPad-X240s>
References: <20200226122622.33171-1-leo.yan@linaro.org>
	<CAMKF1sq3DnDjXNyyUs5g3rbQp295gEP3xrYteL3adUOOy3Nkug@mail.gmail.com>
	<20200304030048.GB8032@leoy-ThinkPad-X240s>
Message-ID: <CA+chaQdnHSE0bw=kA8fRek-2ig4jLjr_ibdcML0qZhXbbN=4fQ@mail.gmail.com>

You can use something like:
2.0.99+2.1.0-beta3
to make sure it doesn't go backwards.

2.1.0+beta3 seems wrong, because it would sort higher than final 2.1.0
(without the +git${SRCPV} suffix).

2.1.0~beta3 might work, but it's not used by many recipes.

On Wed, Mar 4, 2020 at 4:01 AM Leo Yan <leo.yan at linaro.org> wrote:

> Hi Khem,
>
> On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
> > I am seeing version going backward errors still
> >
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
>
> I googled for this issue, the backwards issue is likely caused by the
> PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".
>
> So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
> we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
> version sequence as:
>
> Old:   2.0.5+git${SRCPV}
> Now:   2.1.0+beta3
> Later: 2.1.0+git${SRCPV}
>
> Does this make sense for you?
>
> Thanks,
> Leo
>
> > On Wed, Feb 26, 2020 at 4:26 AM Leo Yan <leo.yan at linaro.org> wrote:
> > >
> > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> > >
> > > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
> > > at 436 with fuzz 1 (offset 123 lines)."
> > >
> > > Signed-off-by: Leo Yan <leo.yan at linaro.org>
> > > ---
> > >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
> > >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}       | 13
> ++++++-------
> > >  2 files changed, 8 insertions(+), 9 deletions(-)
> > >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb =>
> luajit_git.bb} (90%)
> > >
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > index c39ef6fd4..807cc4417 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
> > >  ===================================================================
> > >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
> > >  +++ LuaJIT-2.0.5/src/lj_arch.h
> > > -@@ -313,7 +313,7 @@
> > > - #error "Need at least GCC 4.2 or newer"
> > > +@@ -436,7 +436,7 @@
> > > + #endif
> > >   #endif
> > >   #elif !LJ_TARGET_PS3
> > >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > similarity index 90%
> > > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > index 93128dda8..2a7243842 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > @@ -1,14 +1,14 @@
> > >  SUMMARY = "Just-In-Time Compiler for Lua"
> > >  LICENSE = "MIT"
> > > -LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> > > +LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> > >  HOMEPAGE = "http://luajit.org"
> > >
> > > -PV .= "+git${SRCPV}"
> > > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> > > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> > > +PV = "2.0.5+2.1.0-beta3"
> > > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
> > > +SRC_URI = "git://
> luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
> > >
>  file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
> > >             file://clang.patch \
> > > -"
> > > +           "
> > >
> > >  S = "${WORKDIR}/git"
> > >
> > > @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
> > >  "
> > >  FILES_luajit-common = "${datadir}/${BPN}-${PV}"
> > >
> > > -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
> > > -COMPATIBLE_HOST_aarch64 = "null"
> > > +# mips64/ppc/ppc64/riscv64 is not supported in this release
> > >  COMPATIBLE_HOST_mipsarchn32 = "null"
> > >  COMPATIBLE_HOST_mipsarchn64 = "null"
> > >  COMPATIBLE_HOST_powerpc = "null"
> > > --
> > > 2.17.1
> > >
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From raj.khem at gmail.com  Wed Mar  4 04:53:07 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 20:53:07 -0800
Subject: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3
In-Reply-To: <CA+chaQdnHSE0bw=kA8fRek-2ig4jLjr_ibdcML0qZhXbbN=4fQ@mail.gmail.com>
References: <20200226122622.33171-1-leo.yan@linaro.org>
	<CAMKF1sq3DnDjXNyyUs5g3rbQp295gEP3xrYteL3adUOOy3Nkug@mail.gmail.com>
	<20200304030048.GB8032@leoy-ThinkPad-X240s>
	<CA+chaQdnHSE0bw=kA8fRek-2ig4jLjr_ibdcML0qZhXbbN=4fQ@mail.gmail.com>
Message-ID: <CAMKF1sqDD8BRgjvf=NWSLtjazKva12gyz06aUsW=dF0amN66qg@mail.gmail.com>

On Tue, Mar 3, 2020 at 8:43 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>
> You can use something like:
> 2.0.99+2.1.0-beta3
> to make sure it doesn't go backwards.
>
> 2.1.0+beta3 seems wrong, because it would sort higher than final 2.1.0 (without the +git${SRCPV} suffix).
>
> 2.1.0~beta3 might work, but it's not used by many recipes.
>

this came out to work well and is concise too, so I went with this

> On Wed, Mar 4, 2020 at 4:01 AM Leo Yan <leo.yan at linaro.org> wrote:
>>
>> Hi Khem,
>>
>> On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
>> > I am seeing version going backward errors still
>> >
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>>
>> I googled for this issue, the backwards issue is likely caused by the
>> PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".
>>
>> So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
>> we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
>> version sequence as:
>>
>> Old:   2.0.5+git${SRCPV}
>> Now:   2.1.0+beta3
>> Later: 2.1.0+git${SRCPV}
>>
>> Does this make sense for you?
>>
>> Thanks,
>> Leo
>>
>> > On Wed, Feb 26, 2020 at 4:26 AM Leo Yan <leo.yan at linaro.org> wrote:
>> > >
>> > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
>> > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
>> > >
>> > > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
>> > > at 436 with fuzz 1 (offset 123 lines)."
>> > >
>> > > Signed-off-by: Leo Yan <leo.yan at linaro.org>
>> > > ---
>> > >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
>> > >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}       | 13 ++++++-------
>> > >  2 files changed, 8 insertions(+), 9 deletions(-)
>> > >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (90%)
>> > >
>> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > index c39ef6fd4..807cc4417 100644
>> > > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
>> > >  ===================================================================
>> > >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
>> > >  +++ LuaJIT-2.0.5/src/lj_arch.h
>> > > -@@ -313,7 +313,7 @@
>> > > - #error "Need at least GCC 4.2 or newer"
>> > > +@@ -436,7 +436,7 @@
>> > > + #endif
>> > >   #endif
>> > >   #elif !LJ_TARGET_PS3
>> > >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
>> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > similarity index 90%
>> > > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>> > > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > index 93128dda8..2a7243842 100644
>> > > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>> > > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > @@ -1,14 +1,14 @@
>> > >  SUMMARY = "Just-In-Time Compiler for Lua"
>> > >  LICENSE = "MIT"
>> > > -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
>> > > +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
>> > >  HOMEPAGE = "http://luajit.org"
>> > >
>> > > -PV .= "+git${SRCPV}"
>> > > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
>> > > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
>> > > +PV = "2.0.5+2.1.0-beta3"
>> > > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
>> > > +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
>> > >             file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
>> > >             file://clang.patch \
>> > > -"
>> > > +           "
>> > >
>> > >  S = "${WORKDIR}/git"
>> > >
>> > > @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
>> > >  "
>> > >  FILES_luajit-common = "${datadir}/${BPN}-${PV}"
>> > >
>> > > -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
>> > > -COMPATIBLE_HOST_aarch64 = "null"
>> > > +# mips64/ppc/ppc64/riscv64 is not supported in this release
>> > >  COMPATIBLE_HOST_mipsarchn32 = "null"
>> > >  COMPATIBLE_HOST_mipsarchn64 = "null"
>> > >  COMPATIBLE_HOST_powerpc = "null"
>> > > --
>> > > 2.17.1
>> > >
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From akuster808 at gmail.com  Wed Mar  4 05:06:23 2020
From: akuster808 at gmail.com (akuster808)
Date: Tue, 3 Mar 2020 21:06:23 -0800
Subject: [oe] [zeus][PATCH] gd: fix CVE-2017-6363
In-Reply-To: <1583292052-256796-1-git-send-email-Haiqing.Bai@windriver.com>
References: <1583292052-256796-1-git-send-email-Haiqing.Bai@windriver.com>
Message-ID: <c9c12515-5552-8054-28a8-e7b72ae9af7e@gmail.com>



On 3/3/20 7:20 PM, Haiqing Bai wrote:
> Backport the CVE patch from the upstream to fix the heap-based buffer
> over-read in tiffWriter.
Did I miss the patch for master?

- armin
>
> Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> ---
>  .../recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++++++++++++++++++
>  meta-oe/recipes-support/gd/gd_2.2.5.bb        |  1 +
>  2 files changed, 36 insertions(+)
>  create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
>
> diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
> new file mode 100644
> index 000000000..25b5880ff
> --- /dev/null
> +++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
> @@ -0,0 +1,35 @@
> +From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001
> +From: Mike Frysinger <vapier at gentoo.org>
> +Date: Wed, 31 Jan 2018 14:50:16 -0500
> +Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds
> + #383
> +
> +The gd image formats allow for a palette of 256 colors,
> +so if the transparent index is out of range, disable it.
> +
> +Upstream-Status: Backport
> +[https://github.com/libgd/libgd.git commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c]
> +CVE-2017-6363
> +
> +Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> +---
> + src/gd_gd.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/src/gd_gd.c b/src/gd_gd.c
> +index f8d39cb..5a86fc3 100644
> +--- a/src/gd_gd.c
> ++++ b/src/gd_gd.c
> +@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag)
> + 		if (!gdGetWord (&im->transparent, in)) {
> + 			goto fail1;
> + 		}
> +-		if (im->transparent == 257) {
> ++		/* Make sure transparent index is within bounds of the palette. */
> ++		if (im->transparent >= 256 || im->transparent < 0) {
> + 			im->transparent = (-1);
> + 		}
> + 	}
> +-- 
> +1.9.1
> +
> diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb
> index 35f9bb251..dda2e67d6 100644
> --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
> +++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
> @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
>             file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \
>             file://CVE-2018-1000222.patch \
>             file://CVE-2019-6978.patch \
> +           file://CVE-2017-6363.patch \
>            "
>  
>  SRCREV = "8255231b68889597d04d451a72438ab92a405aba"


From Haiqing.Bai at windriver.com  Wed Mar  4 06:24:13 2020
From: Haiqing.Bai at windriver.com (Haiqing Bai)
Date: Wed, 4 Mar 2020 14:24:13 +0800
Subject: [oe] [V2][master][zeus][PATCH] gd: fix CVE-2017-6363
Message-ID: <1583303054-235689-1-git-send-email-Haiqing.Bai@windriver.com>

Backport the CVE patch from the upstream to fix the heap-based buffer
over-read in tiffWriter.

Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
---
 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++++++++++++++++++++++
 meta-oe/recipes-support/gd/gd_2.2.5.bb            |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch

diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
new file mode 100644
index 0000000..25b5880
--- /dev/null
+++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
@@ -0,0 +1,35 @@
+From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier at gentoo.org>
+Date: Wed, 31 Jan 2018 14:50:16 -0500
+Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds
+ #383
+
+The gd image formats allow for a palette of 256 colors,
+so if the transparent index is out of range, disable it.
+
+Upstream-Status: Backport
+[https://github.com/libgd/libgd.git commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c]
+CVE-2017-6363
+
+Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
+---
+ src/gd_gd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gd_gd.c b/src/gd_gd.c
+index f8d39cb..5a86fc3 100644
+--- a/src/gd_gd.c
++++ b/src/gd_gd.c
+@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag)
+ 		if (!gdGetWord (&im->transparent, in)) {
+ 			goto fail1;
+ 		}
+-		if (im->transparent == 257) {
++		/* Make sure transparent index is within bounds of the palette. */
++		if (im->transparent >= 256 || im->transparent < 0) {
+ 			im->transparent = (-1);
+ 		}
+ 	}
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb
index 35f9bb2..dda2e67 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
            file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \
            file://CVE-2018-1000222.patch \
            file://CVE-2019-6978.patch \
+           file://CVE-2017-6363.patch \
           "
 
 SRCREV = "8255231b68889597d04d451a72438ab92a405aba"
-- 
1.9.1


From raj.khem at gmail.com  Wed Mar  4 06:42:59 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 22:42:59 -0800
Subject: [oe] [meta-multimedia][PATCH v2] x265: add x265 recipe
In-Reply-To: <20200215005402.18661-1-scott.branden@broadcom.com>
References: <20200215005402.18661-1-scott.branden@broadcom.com>
Message-ID: <CAMKF1srJLkYmt=uH7QWDW_-TpeS0FcrVjU3f1Ec_+1_rc4vtwA@mail.gmail.com>

Hi Scott

I am getting a textrel issue reported on musl builds see
https://errors.yoctoproject.org/Errors/Details/393681/

this recipe is already applied but would be good to root cause this issue
and find appropriate fix

https://errors.yoctoproject.org/Errors/Details/393681/

On Fri, Feb 14, 2020 at 4:54 PM Scott Branden via Openembedded-devel
<openembedded-devel at lists.openembedded.org> wrote:
>
> Add x265 recipe for latest tag of Release_3.2 branch (3.2.1).
>
> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
> ---
>  .../recipes-multimedia/x265/x265_3.2.1.bb     | 22 +++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
>
> diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> new file mode 100644
> index 0000000000..21ae596e05
> --- /dev/null
> +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "H.265/HEVC video encoder"
> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format."
> +HOMEPAGE = "http://www.videolan.org/developers/x265.html"
> +
> +LICENSE = "GPLv2"
> +LICENSE_FLAGS = "commercial"
> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091"
> +
> +DEPENDS = "nasm-native gnutls zlib libpcre"
> +
> +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz"
> +
> +S = "${WORKDIR}/x265_${PV}/source"
> +
> +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca"
> +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc"
> +
> +inherit lib_package pkgconfig cmake
> +
> +AS[unexport] = "1"
> +
> +COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From raj.khem at gmail.com  Wed Mar  4 07:33:52 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 3 Mar 2020 23:33:52 -0800
Subject: [oe] [meta-multimedia][PATCH v2] x265: add x265 recipe
In-Reply-To: <CAMKF1srJLkYmt=uH7QWDW_-TpeS0FcrVjU3f1Ec_+1_rc4vtwA@mail.gmail.com>
References: <20200215005402.18661-1-scott.branden@broadcom.com>
	<CAMKF1srJLkYmt=uH7QWDW_-TpeS0FcrVjU3f1Ec_+1_rc4vtwA@mail.gmail.com>
Message-ID: <CAMKF1sr92Rmpv_ix7zLSLsm_XrZD2CjdaPNn+Pcbp4A2kLS0wg@mail.gmail.com>

On Tue, Mar 3, 2020 at 10:42 PM Khem Raj <raj.khem at gmail.com> wrote:
>
> Hi Scott
>
> I am getting a textrel issue reported on musl builds see
> https://errors.yoctoproject.org/Errors/Details/393681/
>
> this recipe is already applied but would be good to root cause this issue
> and find appropriate fix
>
> https://errors.yoctoproject.org/Errors/Details/393681/

disabling asm helps on 32bit x86

EXTRA_OECMAKE_append_i686 = " -DENABLE_ASSEMBLY=OFF"

can you test this fix and see if this will be ok ?

>
> On Fri, Feb 14, 2020 at 4:54 PM Scott Branden via Openembedded-devel
> <openembedded-devel at lists.openembedded.org> wrote:
> >
> > Add x265 recipe for latest tag of Release_3.2 branch (3.2.1).
> >
> > Signed-off-by: Scott Branden <scott.branden at broadcom.com>
> > ---
> >  .../recipes-multimedia/x265/x265_3.2.1.bb     | 22 +++++++++++++++++++
> >  1 file changed, 22 insertions(+)
> >  create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> >
> > diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> > new file mode 100644
> > index 0000000000..21ae596e05
> > --- /dev/null
> > +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> > @@ -0,0 +1,22 @@
> > +SUMMARY = "H.265/HEVC video encoder"
> > +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format."
> > +HOMEPAGE = "http://www.videolan.org/developers/x265.html"
> > +
> > +LICENSE = "GPLv2"
> > +LICENSE_FLAGS = "commercial"
> > +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091"
> > +
> > +DEPENDS = "nasm-native gnutls zlib libpcre"
> > +
> > +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz"
> > +
> > +S = "${WORKDIR}/x265_${PV}/source"
> > +
> > +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca"
> > +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc"
> > +
> > +inherit lib_package pkgconfig cmake
> > +
> > +AS[unexport] = "1"
> > +
> > +COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
> > --
> > 2.17.1
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From adrian.freihofer at siemens.com  Wed Mar  4 08:23:53 2020
From: adrian.freihofer at siemens.com (Freihofer, Adrian)
Date: Wed, 4 Mar 2020 08:23:53 +0000
Subject: [oe] [meta-networking][PATCH] networkmanager: Upgrade 1.18.4 ->
 1.22.8
In-Reply-To: <b25011d93f8f1ce2c99de352e13cac94c71e2f14.camel@siemens.com>
References: <b25011d93f8f1ce2c99de352e13cac94c71e2f14.camel@siemens.com>
Message-ID: <1c5baebcc371d58c7a12d08b6061f9e410978d56.camel@siemens.com>

What's the status with this patch?

-----Original Message-----
From: "[ext] Freihofer, Adrian" <adrian.freihofer at siemens.com>
To: openembedded-devel at lists.openembedded.org <
openembedded-devel at lists.openembedded.org>
Subject: [oe] [meta-networking][PATCH] networkmanager: Upgrade 1.18.4 
-> 1.22.8
Date: Tue, 25 Feb 2020 08:01:41 +0000

- rebased patches
- Option --enable-polkit-agent is not available with current NM,
removed
- Option --with-libnm-glib is not available with current NM, removed
- New package NM-cloud-setup for new experimental cloud setup feature
- NM tries to re-license from GPL to LGPL, added LGPL to LICENSES
- Removed empty packages libnmutil libnmglib libnmglib-vpn

Signed-off-by: Adrian Freihofer <adrian.freihofer at siemens.com>
---
 ...e.ac-Fix-pkgconfig-sysroot-locations.patch |  6 +--
 ...ttings-settings-property-documentati.patch | 23 +++++-----
 ...Fix-build-with-musl-systemd-specific.patch | 26 ++++++------
 .../musl/0002-Fix-build-with-musl.patch       | 30 +++++++------
 ...ger_1.18.4.bb => networkmanager_1.22.8.bb} | 42 ++++++++++++-------
 5 files changed, 70 insertions(+), 57 deletions(-)
 rename meta-networking/recipes-
connectivity/networkmanager/{networkmanager_1.18.4.bb =>
networkmanager_1.22.8.bb} (77%)

diff --git a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
pkgconfig-sysroot-locations.patch b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
pkgconfig-sysroot-locations.patch
index 302c0292b..19c8c7481 100644
--- a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
pkgconfig-sysroot-locations.patch
+++ b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
pkgconfig-sysroot-locations.patch
@@ -1,4 +1,4 @@
-From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
+From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001
 From: Pablo Saavedra <psaavedra at igalia.com>
 Date: Tue, 13 Mar 2018 17:36:20 +0100
 Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
@@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig
sysroot locations
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 967eac0..b914219 100644
+index 65ceffb..ad4b0fc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
+@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then
  	AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
  
  	AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
diff --git a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
settings-property-documentati.patch b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
settings-property-documentati.patch
index 5581dd3aa..446637b27 100644
--- a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
settings-property-documentati.patch
+++ b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
settings-property-documentati.patch
@@ -1,4 +1,4 @@
-From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001
+From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Thu, 22 Mar 2018 11:08:30 +0100
 Subject: [PATCH] Do not create settings settings/property
documentation
@@ -6,23 +6,29 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 It was tried to get this work but gi / GirRepository could not be
found by
 python. Anyway it is not necessary for us to have the
settings/property docs.
 
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  Makefile.am  | 11 -----------
  configure.ac |  5 -----
  2 files changed, 16 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index b180466..1ab4658 100644
+index d5cbcf5..2a1819a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1298,9 +1298,7 @@ EXTRA_DIST += \
- if HAVE_INTROSPECTION
+@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
+ INTROSPECTION_GIRS += libnm/NM-1.0.gir
  
  libnm_noinst_data = \
 -	libnm/nm-property-docs.xml \
@@ -31,7 +37,7 @@ index b180466..1ab4658 100644
  	libnm/nm-settings-keyfile-docs.xml \
  	libnm/nm-settings-ifcfg-rh-docs.xml
  
-@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS):
$(libnm_lib_h_pub_mkenums)
+@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS):
$(libnm_lib_h_pub_mkenums)
  $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
  
  clients_common_settings_doc_h = clients/common/settings-docs.h
@@ -51,10 +57,10 @@ index b180466..1ab4658 100644
  	$(clients_common_settings_doc_h) \
  	$(clients_common_settings_doc_h).in
 diff --git a/configure.ac b/configure.ac
-index b914219..872c292 100644
+index ad4b0fc..0092092 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0)
+@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
  # check if we can build setting property documentation
  build_docs=no
  if test -n "$INTROSPECTION_MAKEFILE"; then
@@ -66,6 +72,3 @@ index b914219..872c292 100644
  	AC_PATH_PROG(PERL, perl)
  	if test -z "$PERL"; then
  		AC_MSG_ERROR([--enable-introspection requires perl])
--- 
-2.20.1
-
diff --git a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
musl-systemd-specific.patch b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
musl-systemd-specific.patch
index af6f938ce..c23fc308f 100644
--- a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
musl-systemd-specific.patch
+++ b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
musl-systemd-specific.patch
@@ -1,4 +1,4 @@
-From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001
+From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Tue, 2 Apr 2019 01:34:35 +0200
 Subject: [PATCH] Fix build with musl - systemd specific
@@ -12,6 +12,7 @@ for musl.
 Upstream-Status: Pending
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  shared/systemd/src/basic/in-addr-util.c |  1 +
  shared/systemd/src/basic/process-util.c |  9 +++++++++
@@ -22,10 +23,10 @@ Signed-off-by: Andreas M?ller <
schnitzeltony at gmail.com>
  6 files changed, 27 insertions(+), 23 deletions(-)
 
 diff --git a/shared/systemd/src/basic/in-addr-util.c
b/shared/systemd/src/basic/in-addr-util.c
-index 5899f62..0adb248 100644
+index 91d687c..8388304 100644
 --- a/shared/systemd/src/basic/in-addr-util.c
 +++ b/shared/systemd/src/basic/in-addr-util.c
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
  #include "in-addr-util.h"
  #include "macro.h"
  #include "parse-util.h"
@@ -34,10 +35,10 @@ index 5899f62..0adb248 100644
  #include "strxcpyx.h"
  #include "util.h"
 diff --git a/shared/systemd/src/basic/process-util.c
b/shared/systemd/src/basic/process-util.c
-index 7431be3..189060a 100644
+index 1456167..42f51a0 100644
 --- a/shared/systemd/src/basic/process-util.c
 +++ b/shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
+@@ -17,6 +17,9 @@
  #include <sys/wait.h>
  #include <syslog.h>
  #include <unistd.h>
@@ -47,7 +48,7 @@ index 7431be3..189060a 100644
  #if 0 /* NM_IGNORED */
  #if HAVE_VALGRIND_VALGRIND_H
  #include <valgrind/valgrind.h>
-@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) {
+@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
          cached_pid = CACHED_PID_UNSET;
  }
  
@@ -61,7 +62,7 @@ index 7431be3..189060a 100644
  
  pid_t getpid_cached(void) {
          static bool installed = false;
-@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) {
+@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) {
                           * only half-documented (glibc doesn't
document it but LSB does ? though only superficially)
                           * we'll check for errors only in the most
generic fashion possible. */
  
@@ -74,10 +75,10 @@ index 7431be3..189060a 100644
                                  cached_pid = CACHED_PID_UNSET;
                                  return new_pid;
 diff --git a/shared/systemd/src/basic/socket-util.h
b/shared/systemd/src/basic/socket-util.h
-index 15443f1..4807198 100644
+index a0886e0..da47d14 100644
 --- a/shared/systemd/src/basic/socket-util.h
 +++ b/shared/systemd/src/basic/socket-util.h
-@@ -13,6 +13,12 @@
+@@ -14,6 +14,12 @@
  #include <sys/types.h>
  #include <sys/un.h>
  
@@ -147,10 +148,10 @@ index c3b9448..e80a938 100644
  #include <stdio.h>
  #include <sys/types.h>
 diff --git a/shared/systemd/src/basic/string-util.h
b/shared/systemd/src/basic/string-util.h
-index b23f4c8..8f2f6e0 100644
+index 04cc82b..2cf589a 100644
 --- a/shared/systemd/src/basic/string-util.h
 +++ b/shared/systemd/src/basic/string-util.h
-@@ -27,6 +27,11 @@
+@@ -26,6 +26,11 @@
  #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
  #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
  
@@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644
  int strcmp_ptr(const char *a, const char *b) _pure_;
  
  static inline bool streq_ptr(const char *a, const char *b) {
--- 
-2.17.1
-
diff --git a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
musl.patch b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
musl.patch
index e0973af1e..196a3358d 100644
--- a/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
musl.patch
+++ b/meta-networking/recipes-
connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
musl.patch
@@ -1,7 +1,7 @@
-From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001
+From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Mon, 8 Apr 2019 23:10:43 +0200
-Subject: [PATCH 2/2] Fix build with musl
+Subject: [PATCH] Fix build with musl
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace'
[2] (search for
 Upstream-Status: Pending
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  clients/tui/nmt-device-entry.c   | 1 -
  libnm-core/nm-utils.h            | 4 ++++
@@ -41,10 +42,10 @@ Signed-off-by: Andreas M?ller <
schnitzeltony at gmail.com>
  5 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-
entry.c
-index 43fbbc1..3eae286 100644
+index 4ab5932..915248c 100644
 --- a/clients/tui/nmt-device-entry.c
 +++ b/clients/tui/nmt-device-entry.c
-@@ -39,7 +39,6 @@
+@@ -26,7 +26,6 @@
  #include "nmt-device-entry.h"
  
  #include <sys/socket.h>
@@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644
  #include "nmtui.h"
  
 diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 2b5baba..f7abab6 100644
+index 5418a1e..f492da6 100644
 --- a/libnm-core/nm-utils.h
 +++ b/libnm-core/nm-utils.h
-@@ -25,6 +25,10 @@
+@@ -10,6 +10,10 @@
  #error "Only <NetworkManager.h> can be included directly."
  #endif
  
@@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644
  
  #include <netinet/in.h>
 diff --git a/shared/nm-default.h b/shared/nm-default.h
-index 54e9916..26e9f4e 100644
+index ace6ede..25357da 100644
 --- a/shared/nm-default.h
 +++ b/shared/nm-default.h
-@@ -211,6 +211,9 @@
+@@ -182,6 +182,9 @@
  #endif
  
  #include <stdlib.h>
@@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644
 
/**********************************************************************
*******/
  
 diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index bd4fbcc..f70b309 100644
+index 3bbc975..4e8a3f6 100644
 --- a/src/devices/nm-device.c
 +++ b/src/devices/nm-device.c
-@@ -24,6 +24,7 @@
+@@ -9,6 +9,7 @@
  #include "nm-device.h"
  
  #include <netinet/in.h>
@@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644
  #include <unistd.h>
  #include <sys/ioctl.h>
  #include <signal.h>
-@@ -32,7 +33,6 @@
+@@ -17,7 +18,6 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644
  #include <linux/pkt_sched.h>
  
 diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-
platform.c
-index d4b0115..22a3a90 100644
+index 7abe4df..9f53147 100644
 --- a/src/platform/nm-linux-platform.c
 +++ b/src/platform/nm-linux-platform.c
-@@ -28,7 +28,6 @@
+@@ -14,7 +14,6 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644
  #include <linux/if_bridge.h>
  #include <linux/if_link.h>
  #include <linux/if_tun.h>
--- 
-2.17.1
-
diff --git a/meta-networking/recipes-
connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-
networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
similarity index 77%
rename from meta-networking/recipes-
connectivity/networkmanager/networkmanager_1.18.4.bb
rename to meta-networking/recipes-
connectivity/networkmanager/networkmanager_1.22.8.bb
index 27508c4d9..b26a5ce06 100644
--- a/meta-networking/recipes-
connectivity/networkmanager/networkmanager_1.18.4.bb
+++ b/meta-networking/recipes-
connectivity/networkmanager/networkmanager_1.22.8.bb
@@ -2,9 +2,9 @@ SUMMARY = "NetworkManager"
 HOMEPAGE = "
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwiki.gnome.org%2FProjects%2FNetworkManager&amp;data=02%7C01%7Cadrian.freihofer%40siemens.com%7C8de3b1ae8ae9457543af08d7b9c8fd91%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C1%7C637182145207584028&amp;sdata=5npYqRQeaw0I7VUPrDIPcEx47%2FLsqsvge5NFQt2XVt8%3D&amp;reserved=0
"
 SECTION = "net/misc"
 
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM =
"file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
-                    file://libnm-
util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b3
64516c \
 "
 
 DEPENDS = " \
@@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \
     file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
     file://musl/0002-Fix-build-with-musl.patch \
 "
-SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
-SRC_URI[sha256sum] =
"a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
+SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284"
+SRC_URI[sha256sum] =
"9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
@@ -65,7 +65,7 @@ PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-
session-tracking=systemd, \
     --without-systemdsystemunitdir, \
 "
-PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,
--disable-polkit --disable-polkit-agent,polkit"
+PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
 PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-
dun,bluez5"
 # consolekit is not picked by shlibs, so add it to RDEPENDS too
 PACKAGECONFIG[consolekit] = "--with-session-
tracking=consolekit,,consolekit,consolekit"
@@ -75,33 +75,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-
ppp,ppp,ppp"
 PACKAGECONFIG[dhclient] = "--with-
dhclient=${base_sbindir}/dhclient,,,dhcp-client"
 PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
-PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib"
 PACKAGECONFIG[resolvconf] = "--with-
resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
 PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-
supplicant"
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
 PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
+PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-
cloud-setup=no"
 
-PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
+PACKAGES =+ " \
   ${PN}-nmtui ${PN}-nmtui-doc \
-  ${PN}-adsl \
+  ${PN}-adsl ${PN}-cloud-setup \
 "
 
-FILES_libnmutil += "${libdir}/libnm-util.so.*"
-FILES_libnmglib += "${libdir}/libnm-glib.so.*"
-FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
+SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup"
 
 FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-
plugin-adsl.so"
 
+FILES_${PN}-cloud-setup = " \
+    ${libexecdir}/nm-cloud-setup \
+    ${systemd_system_unitdir}/nm-cloud-setup.service \
+    ${systemd_system_unitdir}/nm-cloud-setup.timer \
+    ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \
+    ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-
setup.sh \
+"
+ALLOW_EMPTY_${PN}-cloud-setup = "1"
+SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONF
IG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '',
d)}"
+
 FILES_${PN} += " \
     ${libexecdir} \
     ${libdir}/NetworkManager/${PV}/*.so \
-    ${nonarch_libdir}/NetworkManager/VPN \
+    ${libdir}/NetworkManager \
     ${nonarch_libdir}/NetworkManager/conf.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \
+    ${nonarch_libdir}/NetworkManager/VPN \
+    ${nonarch_libdir}/NetworkManager/system-connections \
     ${datadir}/polkit-1 \
     ${datadir}/dbus-1 \
     ${nonarch_base_libdir}/udev/* \
-    ${systemd_unitdir}/system \
+    ${systemd_system_unitdir} \
     ${libdir}/pppd \
 "


From bunk at stusta.de  Wed Mar  4 09:28:17 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Wed,  4 Mar 2020 11:28:17 +0200
Subject: [oe] [meta-oe][PATCH] Revert "piglist: add from oe-core"
Message-ID: <20200304092817.6711-1-bunk@stusta.de>

This reverts commit af22a7a46ab6306aa4d59037e59b4dcf373b2603.

The recipe is staying in OE-core.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
---
 ...-bash-completions-in-the-right-place.patch | 35 ----------
 ...proper-WAYLAND_INCLUDE_DIRS-variable.patch | 32 ----------
 meta-oe/recipes-graphics/piglit/piglit_git.bb | 64 -------------------
 3 files changed, 131 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
 delete mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
 delete mode 100644 meta-oe/recipes-graphics/piglit/piglit_git.bb

diff --git a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
deleted file mode 100644
index e07e810a7..000000000
--- a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen at intel.com>
-Date: Wed, 13 Jul 2016 19:19:02 +0300
-Subject: [PATCH] cmake: install bash-completions in the right place
-
-The completionsdir variable is a full path and should not be
-prefixed.
-
-This does mean the files may be installed outside of
-CMAKE_INSTALL_PREFIX -- the alternative is more difficult and
-means that bash completion files may be installed where
-bash-completion can't find them.
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
-Upstream-Status: Submitted [mailing list]
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e2abba..784a8f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -532,7 +532,7 @@ install (
- if (BASH_COMPLETION_FOUND)
- 	install(
- 		FILES completions/bash/piglit
--		DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/
-+		DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/
- 	)
- endif (BASH_COMPLETION_FOUND)
- 
--- 
-2.8.1
-
diff --git a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
deleted file mode 100644
index 5d6ec368b..000000000
--- a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001
-From: Pascal Bach <pascal.bach at siemens.com>
-Date: Thu, 4 Oct 2018 14:43:17 +0200
-Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
-
-WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
-set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
-when cross compiling.
-
-Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
-
-Upstream-Status: Submitted [piglit at lists.freedesktop.org]
----
- tests/util/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
-index a5f080156..a303a9f58 100644
---- a/tests/util/CMakeLists.txt
-+++ b/tests/util/CMakeLists.txt
-@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
- 			piglit-framework-gl/piglit_wl_framework.c
- 		)
- 		list(APPEND UTIL_GL_INCLUDES
--			${WAYLAND_wayland-client_INCLUDEDIR}
-+			${WAYLAND_INCLUDE_DIRS}
- 		)
- 	endif()
- 	if(PIGLIT_HAS_X11)
--- 
-2.11.0
-
diff --git a/meta-oe/recipes-graphics/piglit/piglit_git.bb b/meta-oe/recipes-graphics/piglit/piglit_git.bb
deleted file mode 100644
index 58d10d6b9..000000000
--- a/meta-oe/recipes-graphics/piglit/piglit_git.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-SUMMARY = "OpenGL driver testing framework"
-DESCRIPTION = "Piglit is an open-source test suite for OpenGL and OpenCL \
-implementations."
-LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
-
-SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \
-           file://0001-cmake-install-bash-completions-in-the-right-place.patch \
-           file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
-           "
-UPSTREAM_CHECK_COMMITS = "1"
-
-SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813"
-# (when PV goes above 1.0 remove the trailing r)
-PV = "1.0+gitr${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
-X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
-
-DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl"
-
-inherit cmake pkgconfig python3native features_check bash-completion
-
-# depends on virtual/libgl
-REQUIRED_DISTRO_FEATURES += "opengl"
-
-# The built scripts go into the temporary directory according to tempfile
-# (typically /tmp) which can race if multiple builds happen on the same machine,
-# so tell it to use a directory in ${B} to avoid overwriting.
-export TEMP = "${B}/temp/"
-do_compile[dirs] =+ "${B}/temp/"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
-PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}"
-
-
-do_configure_prepend() {
-   if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
-        sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h
-        sed -i -e "/^#.*include.*<GL\/glut.h>$/d" ${S}/src/piglit/glut_wrap.h
-   fi
-}
-
-# Forcibly strip because Piglit is *huge*
-OECMAKE_TARGET_INSTALL = "install/strip"
-
-RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \
-	python3-misc \
-	python3-unixadmin python3-xml python3-multiprocessing \
-	python3-six python3-shell python3-io \
-	python3-netserver bash \
-	"
-
-INSANE_SKIP_${PN} += "dev-so already-stripped"
-
-# As nothing builds against Piglit we don't need to have anything in the
-# sysroot, especially when this is ~2GB of test suite
-SYSROOT_DIRS_remove = "${libdir}"
-
-# Can't be built with ccache
-CCACHE_DISABLE = "1"
-- 
2.17.1


From zhengrq.fnst at cn.fujitsu.com  Wed Mar  4 10:17:18 2020
From: zhengrq.fnst at cn.fujitsu.com (Zheng Ruoqin)
Date: Wed, 4 Mar 2020 18:17:18 +0800
Subject: [oe]  [meta-networking][PATCH] wireshark: upgrade 3.2.1 -> 3.2.2
Message-ID: <1583317038-9789-1-git-send-email-zhengrq.fnst@cn.fujitsu.com>

Signed-off-by: Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com>
---
 .../wireshark/{wireshark_3.2.1.bb => wireshark_3.2.2.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_3.2.1.bb => wireshark_3.2.2.bb} (95%)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
similarity index 95%
rename from meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb
rename to meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
index 5f89ec812..b2bcf5fd9 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
@@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-SRC_URI[md5sum] = "e699b1e001c6303013791d81faf7727d"
-SRC_URI[sha256sum] = "589f640058d6408ebbd695a80ebbd6e7bd99d8db64ecda253d27100dfd27e85b"
+SRC_URI[md5sum] = "e468b78e1176e0212b13ef809f59dcbb"
+SRC_URI[sha256sum] = "5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79"
 
 PE = "1"
 
-- 
2.17.1




From zhengrq.fnst at cn.fujitsu.com  Wed Mar  4 10:19:14 2020
From: zhengrq.fnst at cn.fujitsu.com (Zheng Ruoqin)
Date: Wed, 4 Mar 2020 18:19:14 +0800
Subject: [oe]  [meta-oe] [PATCH] tcsh: upgrade 6.21.00 -> 6.22.02
Message-ID: <1583317154-9856-1-git-send-email-zhengrq.fnst@cn.fujitsu.com>

Signed-off-by: Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com>
---
 .../recipes-shells/tcsh/{tcsh_6.21.00.bb => tcsh_6.22.02.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-shells/tcsh/{tcsh_6.21.00.bb => tcsh_6.22.02.bb} (91%)

diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.21.00.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb
similarity index 91%
rename from meta-oe/recipes-shells/tcsh/tcsh_6.21.00.bb
rename to meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb
index 278ab0458..79ab67ab7 100644
--- a/meta-oe/recipes-shells/tcsh/tcsh_6.21.00.bb
+++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb
@@ -13,8 +13,8 @@ SRC_URI = " \
     file://0001-Enable-system-malloc-on-all-linux.patch \
     file://0002-Add-debian-csh-scripts.patch \
 "
-SRC_URI[md5sum] = "5bd5f11515cc5cca927777fa92f9d4b9"
-SRC_URI[sha256sum] = "c438325448371f59b12a4c93bfd3f6982e6f79f8c5aef4bc83aac8f62766e972"
+SRC_URI[md5sum] = "f34909eab33733aecc05d27adc82277b"
+SRC_URI[sha256sum] = "ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b"
 
 EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'"
 inherit autotools
-- 
2.17.1




From leo.yan at linaro.org  Wed Mar  4 12:28:11 2020
From: leo.yan at linaro.org (Leo Yan)
Date: Wed,  4 Mar 2020 12:28:11 +0000
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
Message-ID: <20200304122811.16655-1-leo.yan@linaro.org>

This recipe is to support OpenCSD, which is an open source
CoreSight trace decode library and utility.

Signed-off-by: Leo Yan <leo.yan at linaro.org>
---
 .../recipes-devtools/opencsd/opencsd_git.bb   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/opencsd/opencsd_git.bb

diff --git a/meta-oe/recipes-devtools/opencsd/opencsd_git.bb b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
new file mode 100644
index 000000000..0c3b4837d
--- /dev/null
+++ b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
@@ -0,0 +1,28 @@
+SUMMARY = "OpenCSD - An open source CoreSight(tm) Trace Decode library"
+HOMEPAGE = "https://github.com/Linaro/OpenCSD"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
+
+SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=http;branch=master"
+SRCREV = "03c194117971e4ad0598df29395757ced2e6e9bd"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_HOST = "(x86_64.*|aarch64.*)-linux"
+
+EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
+                CROSS_COMPILE='${TARGET_SYS}-' \
+                CC='${CC}' \
+                CXX='${CXX}' \
+                LINKER='${CXX}' \
+                LINUX64=1 \
+                DEBUG=1 \
+                "
+
+do_compile() {
+    ( cd ${S}/decoder/build/linux; oe_runmake ${EXTRA_OEMAKE}; cd - )
+}
+
+do_install() {
+    ( cd ${S}/decoder/build/linux; oe_runmake PREFIX=${D}/usr install; cd - )
+}
-- 
2.17.1


From scott.murray at konsulko.com  Wed Mar  4 16:05:58 2020
From: scott.murray at konsulko.com (Scott Murray)
Date: Wed, 4 Mar 2020 11:05:58 -0500 (EST)
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
In-Reply-To: <20200304122811.16655-1-leo.yan@linaro.org>
References: <20200304122811.16655-1-leo.yan@linaro.org>
Message-ID: <alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>

On Wed, 4 Mar 2020, Leo Yan wrote:

> This recipe is to support OpenCSD, which is an open source
> CoreSight trace decode library and utility.

Just a thought, this seems like the kind of thing that might make sense
for the new meta-arm layer that Jon has been working up?

> Signed-off-by: Leo Yan <leo.yan at linaro.org>
> ---
>  .../recipes-devtools/opencsd/opencsd_git.bb   | 28 +++++++++++++++++++
>  1 file changed, 28 insertions(+)
>  create mode 100644 meta-oe/recipes-devtools/opencsd/opencsd_git.bb
>
> diff --git a/meta-oe/recipes-devtools/opencsd/opencsd_git.bb b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
> new file mode 100644
> index 000000000..0c3b4837d
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
> @@ -0,0 +1,28 @@
> +SUMMARY = "OpenCSD - An open source CoreSight(tm) Trace Decode library"
> +HOMEPAGE = "https://github.com/Linaro/OpenCSD"
> +LICENSE = "BSD-3-Clause"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
> +
> +SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=http;branch=master"
> +SRCREV = "03c194117971e4ad0598df29395757ced2e6e9bd"
> +
> +S = "${WORKDIR}/git"
> +
> +COMPATIBLE_HOST = "(x86_64.*|aarch64.*)-linux"
> +
> +EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
> +                CROSS_COMPILE='${TARGET_SYS}-' \
> +                CC='${CC}' \
> +                CXX='${CXX}' \
> +                LINKER='${CXX}' \
> +                LINUX64=1 \
> +                DEBUG=1 \
> +                "
> +
> +do_compile() {
> +    ( cd ${S}/decoder/build/linux; oe_runmake ${EXTRA_OEMAKE}; cd - )
> +}
> +
> +do_install() {
> +    ( cd ${S}/decoder/build/linux; oe_runmake PREFIX=${D}/usr install; cd - )
> +}
>

From sanjeev.nahulanthran at intel.com  Thu Mar  5 00:20:05 2020
From: sanjeev.nahulanthran at intel.com (sanjeev.nahulanthran at intel.com)
Date: Thu,  5 Mar 2020 08:20:05 +0800
Subject: [oe] [zeus][meta-oe][PATCH] ade: Fix install paths in multilib
	builds
Message-ID: <20200305002005.23821-1-sanjeev.nahulanthran@intel.com>

From: Khem Raj <raj.khem at gmail.com>

Fixes
ERROR: ade-0.1.1f-r0 do_package: QA Issue: ade: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libade.a

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Sanjeev Nahulanthran <sanjeev.nahulanthran at intel.com>
---
 ...tallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++++
 meta-oe/recipes-support/opencv/ade_0.1.1f.bb  |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch

diff --git a/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
new file mode 100644
index 000000000..f038b0aa9
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
@@ -0,0 +1,39 @@
+From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Thu, 19 Dec 2019 21:33:46 -0800
+Subject: [PATCH] use GNUInstallDirs for detecting install paths
+
+This helps with multilib builds
+
+Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19]
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ sources/ade/CMakeLists.txt | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt
+index 2d1dd20..46415d1 100644
+--- a/sources/ade/CMakeLists.txt
++++ b/sources/ade/CMakeLists.txt
+@@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION)
+                       VERBATIM)
+ endif()
+ 
++include(GNUInstallDirs)
++
+ install(TARGETS ade COMPONENT dev
+         EXPORT adeTargets
+-        ARCHIVE DESTINATION lib
+-        LIBRARY DESTINATION lib
+-        RUNTIME DESTINATION lib
+-        INCLUDES DESTINATION include)
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev)
+ 
+-- 
+2.24.1
+
diff --git a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb
index 332820d14..386180215 100644
--- a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb
+++ b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb
@@ -5,6 +5,7 @@ organizing data flow processing and execution."
 HOMEPAGE = "https://github.com/opencv/ade"
 
 SRC_URI = "git://github.com/opencv/ade.git \
+           file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \
            "
 
 SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9"
-- 
2.17.1


From philip at balister.org  Wed Mar  4 16:36:38 2020
From: philip at balister.org (Philip Balister)
Date: Wed, 4 Mar 2020 11:36:38 -0500
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
In-Reply-To: <alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
References: <20200304122811.16655-1-leo.yan@linaro.org>
	<alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
Message-ID: <0d9bdfd0-9321-940b-4542-e4ba6505aed1@balister.org>

On 3/4/20 11:05 AM, Scott Murray wrote:
> On Wed, 4 Mar 2020, Leo Yan wrote:
> 
>> This recipe is to support OpenCSD, which is an open source
>> CoreSight trace decode library and utility.
> 
> Just a thought, this seems like the kind of thing that might make sense
> for the new meta-arm layer that Jon has been working up?

I had the exact thought and am really glad I read this before saying the
same thing!

Philip

> 
>> Signed-off-by: Leo Yan <leo.yan at linaro.org>
>> ---
>>  .../recipes-devtools/opencsd/opencsd_git.bb   | 28 +++++++++++++++++++
>>  1 file changed, 28 insertions(+)
>>  create mode 100644 meta-oe/recipes-devtools/opencsd/opencsd_git.bb
>>
>> diff --git a/meta-oe/recipes-devtools/opencsd/opencsd_git.bb b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
>> new file mode 100644
>> index 000000000..0c3b4837d
>> --- /dev/null
>> +++ b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
>> @@ -0,0 +1,28 @@
>> +SUMMARY = "OpenCSD - An open source CoreSight(tm) Trace Decode library"
>> +HOMEPAGE = "https://github.com/Linaro/OpenCSD"
>> +LICENSE = "BSD-3-Clause"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
>> +
>> +SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=http;branch=master"
>> +SRCREV = "03c194117971e4ad0598df29395757ced2e6e9bd"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +COMPATIBLE_HOST = "(x86_64.*|aarch64.*)-linux"
>> +
>> +EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
>> +                CROSS_COMPILE='${TARGET_SYS}-' \
>> +                CC='${CC}' \
>> +                CXX='${CXX}' \
>> +                LINKER='${CXX}' \
>> +                LINUX64=1 \
>> +                DEBUG=1 \
>> +                "
>> +
>> +do_compile() {
>> +    ( cd ${S}/decoder/build/linux; oe_runmake ${EXTRA_OEMAKE}; cd - )
>> +}
>> +
>> +do_install() {
>> +    ( cd ${S}/decoder/build/linux; oe_runmake PREFIX=${D}/usr install; cd - )
>> +}
>>

From holzmayr at rsi-elektrotechnik.de  Wed Mar  4 17:02:01 2020
From: holzmayr at rsi-elektrotechnik.de (Josef Holzmayr)
Date: Wed, 4 Mar 2020 17:02:01 +0000
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
In-Reply-To: <0d9bdfd0-9321-940b-4542-e4ba6505aed1@balister.org>
References: <20200304122811.16655-1-leo.yan@linaro.org>
	<alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
	<0d9bdfd0-9321-940b-4542-e4ba6505aed1@balister.org>
Message-ID: <20200304170201.msozkjkbqf4zf5wt@jh-mailer>

On Wed, Mar 04, 2020 at 11:36:38AM -0500, Philip Balister wrote:
> On 3/4/20 11:05 AM, Scott Murray wrote:
> > On Wed, 4 Mar 2020, Leo Yan wrote:
> > 
> >> This recipe is to support OpenCSD, which is an open source
> >> CoreSight trace decode library and utility.
> > 
> > Just a thought, this seems like the kind of thing that might make sense
> > for the new meta-arm layer that Jon has been working up?
> 
> I had the exact thought and am really glad I read this before saying the
> same thing!

+1

> 
> Philip
> 
> > 
> >> Signed-off-by: Leo Yan <leo.yan at linaro.org>
> >> ---
> >>  .../recipes-devtools/opencsd/opencsd_git.bb   | 28 +++++++++++++++++++
> >>  1 file changed, 28 insertions(+)
> >>  create mode 100644 meta-oe/recipes-devtools/opencsd/opencsd_git.bb
> >>
> >> diff --git a/meta-oe/recipes-devtools/opencsd/opencsd_git.bb b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
> >> new file mode 100644
> >> index 000000000..0c3b4837d
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
> >> @@ -0,0 +1,28 @@
> >> +SUMMARY = "OpenCSD - An open source CoreSight(tm) Trace Decode library"
> >> +HOMEPAGE = "https://github.com/Linaro/OpenCSD"
> >> +LICENSE = "BSD-3-Clause"
> >> +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
> >> +
> >> +SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=http;branch=master"
> >> +SRCREV = "03c194117971e4ad0598df29395757ced2e6e9bd"
> >> +
> >> +S = "${WORKDIR}/git"
> >> +
> >> +COMPATIBLE_HOST = "(x86_64.*|aarch64.*)-linux"
> >> +
> >> +EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
> >> +                CROSS_COMPILE='${TARGET_SYS}-' \
> >> +                CC='${CC}' \
> >> +                CXX='${CXX}' \
> >> +                LINKER='${CXX}' \
> >> +                LINUX64=1 \
> >> +                DEBUG=1 \
> >> +                "
> >> +
> >> +do_compile() {
> >> +    ( cd ${S}/decoder/build/linux; oe_runmake ${EXTRA_OEMAKE}; cd - )
> >> +}
> >> +
> >> +do_install() {
> >> +    ( cd ${S}/decoder/build/linux; oe_runmake PREFIX=${D}/usr install; cd - )
> >> +}
> >>
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
???????????????
Josef Holzmayr
Software Developer Embedded Systems

Tel: +49 8444 9204-48
Fax: +49 8444 9204-50

R-S-I Elektrotechnik GmbH & Co. KG
Woelkestrasse 11
D-85301 Schweitenkirchen
www.rsi-elektrotechnik.de
???????????????
Amtsgericht Ingolstadt ? GmbH: HRB 191328 ? KG: HRA 170393
Gesch?ftsf?hrer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg
Ust-IdNr: DE 128592548 

_____________________________________________________________
Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363
Gesch?ftsf?hrer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg
USt-IdNr.: DE 128592548


From raj.khem at gmail.com  Wed Mar  4 17:19:23 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed,  4 Mar 2020 09:19:23 -0800
Subject: [oe] [meta-multimedia][PATCH 1/5] packagegroup-meta-multimedia:
	Purge gst 0.10 related rdeps
Message-ID: <20200304171927.2068660-1-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../packagegroups/packagegroup-meta-multimedia.bb           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index cef45f9d6d..e0cb415e3b 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -29,9 +29,9 @@ RDEPENDS_packagegroup-meta-multimedia = "\
     rtmpdump libopenmpt schroedinger mpd mpc libmpdclient \
     ncmpc libmpd dcadec libiec61883 \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "", "", d)} \
-    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna gst-fluendo-mpegdemux vlc", "", d)} \
-    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265 gst-openmax", "", d)} \
-    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper gst-plugins-ugly gst-fluendo-mp3 gst-plugins-gl", "", d)} \
+    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna vlc", "", d)} \
+    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265", "", d)} \
+    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper", "", d)} \
     ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "openh264 opencore-amr faac vo-amrwbenc", "", d)} \
     "
 
-- 
2.25.1


From raj.khem at gmail.com  Wed Mar  4 17:19:25 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed,  4 Mar 2020 09:19:25 -0800
Subject: [oe] [meta-multimedia][PATCH 3/5] minidlna: Retarget gettext patch
	to gettex version 0.20
In-Reply-To: <20200304171927.2068660-1-raj.khem@gmail.com>
References: <20200304171927.2068660-1-raj.khem@gmail.com>
Message-ID: <20200304171927.2068660-3-raj.khem@gmail.com>

This fixes
*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../minidlna/minidlna/0001-Update-Gettext-version.patch     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
index c18095d42c..6100da3581 100644
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
@@ -10,8 +10,6 @@ Signed-off-by: Baptiste Durand <baptiste.durand at gmail.com>
  configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index f343d21..a556b33 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -14,7 +14,7 @@
@@ -23,12 +21,12 @@ index f343d21..a556b33 100644
  #LT_INIT
  
  AC_CANONICAL_TARGET
-@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS])
+@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC
  
  AM_ICONV
  AM_GNU_GETTEXT([external])
 -AM_GNU_GETTEXT_VERSION(0.18)
-+AM_GNU_GETTEXT_VERSION(0.19)
++AM_GNU_GETTEXT_VERSION(0.20)
  
  # Checks for programs.
  AC_PROG_AWK
-- 
2.25.1


From raj.khem at gmail.com  Wed Mar  4 17:19:24 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed,  4 Mar 2020 09:19:24 -0800
Subject: [oe] [meta-multimedia][PATCH 2/5] vlc: Depend on gst-1.0 ugly
	plugins instead of 0.10
In-Reply-To: <20200304171927.2068660-1-raj.khem@gmail.com>
References: <20200304171927.2068660-1-raj.khem@gmail.com>
Message-ID: <20200304171927.2068660-2-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb
index 7fadca4399..c15ff9a431 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb
@@ -65,7 +65,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc"
 PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva"
 PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
 PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
-PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad"
+PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx"
 PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg"
 PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
-- 
2.25.1


From raj.khem at gmail.com  Wed Mar  4 17:19:26 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed,  4 Mar 2020 09:19:26 -0800
Subject: [oe] [meta-multimedia][PATCH 4/5] openh264: Upgrade to 2.0.0
In-Reply-To: <20200304171927.2068660-1-raj.khem@gmail.com>
References: <20200304171927.2068660-1-raj.khem@gmail.com>
Message-ID: <20200304171927.2068660-4-raj.khem@gmail.com>

- Fix host-user-contaminated QA issues
- make clean is broken so mark it so
- Enable PIC in asm which fixes textrels issue
- Fix build on mips

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...-poke-at-host-gcc-for-target-options.patch | 25 +++++++
 ...Use-cp-options-to-preserve-file-mode.patch | 32 +++++++++
 .../0001-codec-Disable-asm-for-mips.patch     | 70 +++++++++++++++++++
 .../{openh264_1.7.0.bb => openh264_2.0.0.bb}  | 17 +++--
 4 files changed, 139 insertions(+), 5 deletions(-)
 create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch
 create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch
 create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch
 rename meta-multimedia/recipes-multimedia/openh264/{openh264_1.7.0.bb => openh264_2.0.0.bb} (68%)

diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch
new file mode 100644
index 0000000000..5f590596d9
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch
@@ -0,0 +1,25 @@
+From af9bd9201c755e0b01251021f4e7642d3fec9c1c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Wed, 4 Mar 2020 08:38:46 -0800
+Subject: [PATCH] Makefile: Do not poke at host gcc for target options
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ build/arch.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/build/arch.mk b/build/arch.mk
+index 8ac3e70a..b80cee8c 100644
+--- a/build/arch.mk
++++ b/build/arch.mk
+@@ -35,7 +35,6 @@ ifneq ($(filter mips mips64, $(ARCH)),)
+ ifeq ($(USE_ASM), Yes)
+ ASM_ARCH = mips
+ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/
+-LOONGSON3A = $(shell g++ -dM -E - < /dev/null | grep '_MIPS_TUNE ' | cut -f 3 -d " ")
+ ifeq ($(LOONGSON3A), "loongson3a")
+ CFLAGS += -DHAVE_MMI
+ endif
+-- 
+2.25.1
+
diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch
new file mode 100644
index 0000000000..92f32948b2
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch
@@ -0,0 +1,32 @@
+From 1c3bda45c55d2334af384caf9e7f240b7aaf2eb5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Tue, 3 Mar 2020 22:28:25 -0800
+Subject: [PATCH] Makefile: Use cp options to preserve file mode
+
+This fixes packaging issues e.g.
+openh264: /usr/lib/libopenh264.so is owned by uid 1000, which is the same as the user running bitbake
+
+Upstream-Status: Submitted [https://github.com/cisco/openh264/pull/3245]
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 74ff029d..ac643412 100644
+--- a/Makefile
++++ b/Makefile
+@@ -306,8 +306,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $
+ 	mkdir -p $(DESTDIR)$(SHAREDLIB_DIR)
+ 	install -m 755 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXFULLVER) $(DESTDIR)$(SHAREDLIB_DIR)
+ 	if [ "$(SHAREDLIBSUFFIXFULLVER)" != "$(SHAREDLIBSUFFIX)" ]; then \
+-	  cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \
+-	  cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \
++	  cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \
++	  cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \
+ 	fi
+ 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig
+ 	install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig
+-- 
+2.25.1
+
diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch
new file mode 100644
index 0000000000..60ea69dbc0
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch
@@ -0,0 +1,70 @@
+From edb62d2518d87536290d00a11c78c311e3680914 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Wed, 4 Mar 2020 09:14:57 -0800
+Subject: [PATCH] codec: Disable asm for mips
+
+It needs loongson support which qemumips is not targettin
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ codec/common/targets.mk     | 2 +-
+ codec/decoder/targets.mk    | 2 +-
+ codec/encoder/targets.mk    | 2 +-
+ codec/processing/targets.mk | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/codec/common/targets.mk b/codec/common/targets.mk
+index 96843cd9..e76cb2cb 100644
+--- a/codec/common/targets.mk
++++ b/codec/common/targets.mk
+@@ -74,7 +74,7 @@ COMMON_ASM_MIPS_SRCS=\
+ 	$(COMMON_SRCDIR)/mips/satd_sad_mmi.c\
+ 
+ COMMON_OBJSMIPS += $(COMMON_ASM_MIPS_SRCS:.c=.$(OBJ))
+-ifeq ($(ASM_ARCH), mips)
++ifeq ($(ASM_ARCH), mips64)
+ COMMON_OBJS += $(COMMON_OBJSMIPS)
+ endif
+ OBJS += $(COMMON_OBJSMIPS)
+diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk
+index eaf5d3c0..615d9216 100644
+--- a/codec/decoder/targets.mk
++++ b/codec/decoder/targets.mk
+@@ -60,7 +60,7 @@ DECODER_ASM_MIPS_SRCS=\
+ 	$(DECODER_SRCDIR)/core/mips/dct_mmi.c\
+ 
+ DECODER_OBJSMIPS += $(DECODER_ASM_MIPS_SRCS:.c=.$(OBJ))
+-ifeq ($(ASM_ARCH), mips)
++ifeq ($(ASM_ARCH), mips64)
+ DECODER_OBJS += $(DECODER_OBJSMIPS)
+ endif
+ OBJS += $(DECODER_OBJSMIPS)
+diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk
+index 1f053280..fd49c1fd 100644
+--- a/codec/encoder/targets.mk
++++ b/codec/encoder/targets.mk
+@@ -88,7 +88,7 @@ ENCODER_ASM_MIPS_SRCS=\
+ 	$(ENCODER_SRCDIR)/core/mips/score_mmi.c\
+ 
+ ENCODER_OBJSMIPS += $(ENCODER_ASM_MIPS_SRCS:.c=.$(OBJ))
+-ifeq ($(ASM_ARCH), mips)
++ifeq ($(ASM_ARCH), mips64)
+ ENCODER_OBJS += $(ENCODER_OBJSMIPS)
+ endif
+ OBJS += $(ENCODER_OBJSMIPS)
+diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk
+index 300de2d8..8451d66e 100644
+--- a/codec/processing/targets.mk
++++ b/codec/processing/targets.mk
+@@ -62,7 +62,7 @@ PROCESSING_ASM_MIPS_SRCS=\
+ 	$(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\
+ 
+ PROCESSING_OBJSMIPS += $(PROCESSING_ASM_MIPS_SRCS:.c=.$(OBJ))
+-ifeq ($(ASM_ARCH), mips)
++ifeq ($(ASM_ARCH), mips64)
+ PROCESSING_OBJS += $(PROCESSING_OBJSMIPS)
+ endif
+ OBJS += $(PROCESSING_OBJSMIPS)
+-- 
+2.25.1
+
diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb
similarity index 68%
rename from meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
rename to meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb
index e2f028ac58..31b9da269f 100644
--- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
+++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb
@@ -3,17 +3,21 @@ decoding. It is suitable for use in real time applications such as WebRTC."
 HOMEPAGE = "http://www.openh264.org/"
 SECTION = "libs/multimedia"
 
-DEPENDS_x86 += "nasm-native"
-DEPENDS_x86-64 += "nasm-native"
+DEPENDS_append_x86 = " nasm-native"
+DEPENDS_append_x86-64 = " nasm-native"
 
 LICENSE = "BSD-2-Clause"
 LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf"
 
 S = "${WORKDIR}/git"
-SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb"
-BRANCH = "openh264v1.7"
-SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};"
+SRCREV = "71374015cdf13f7aab4bc2d820f77905b3becfb8"
+BRANCH = "openh264v2.0.0"
+SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \
+           file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \
+           file://0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch \
+           file://0001-codec-Disable-asm-for-mips.patch \
+           "
 
 COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"
@@ -30,6 +34,7 @@ EXTRA_OEMAKE_x86-64 = "ARCH=x86_64"
 EXTRA_OEMAKE_mips = "ARCH=mips"
 EXTRA_OEMAKE_mips64 = "ARCH=mips64"
 
+EXTRA_OEMAKE_append = " ENABLEPIC=Yes"
 do_configure() {
     :
 }
@@ -41,3 +46,5 @@ do_compile() {
 do_install() {
     oe_runmake install DESTDIR=${D} PREFIX=${prefix}
 }
+
+CLEANBROKEN = "1"
-- 
2.25.1


From raj.khem at gmail.com  Wed Mar  4 17:19:27 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed,  4 Mar 2020 09:19:27 -0800
Subject: [oe] [meta-multimedia][PATCH 5/5] x265: Disable assembly on x86
In-Reply-To: <20200304171927.2068660-1-raj.khem@gmail.com>
References: <20200304171927.2068660-1-raj.khem@gmail.com>
Message-ID: <20200304171927.2068660-5-raj.khem@gmail.com>

Fixes
ERROR: QA Issue: x265: ELF binary /usr/lib/libx265.so.179 has relocations in .text [textrel]

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Cc: Scott Branden <scott.branden at broadcom.com>
---
 meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
index 21ae596e05..8c34526cc3 100644
--- a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
+++ b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
@@ -17,6 +17,8 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5
 
 inherit lib_package pkgconfig cmake
 
+EXTRA_OECMAKE_append_x86 = " -DENABLE_ASSEMBLY=OFF"
+
 AS[unexport] = "1"
 
 COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
-- 
2.25.1


From bunk at stusta.de  Wed Mar  4 18:49:42 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Wed, 4 Mar 2020 20:49:42 +0200
Subject: [oe] [meta-multimedia][PATCH 2/5] vlc: Depend on gst-1.0 ugly
 plugins instead of 0.10
In-Reply-To: <20200304171927.2068660-2-raj.khem@gmail.com>
References: <20200304171927.2068660-1-raj.khem@gmail.com>
	<20200304171927.2068660-2-raj.khem@gmail.com>
Message-ID: <20200304184942.GA7858@localhost>

On Wed, Mar 04, 2020 at 09:19:24AM -0800, Khem Raj wrote:
>...
> -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad"
> +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
>...

The subject should say bad, not ugly (ugly is a different set of plugins).

cu
Adrian

From raj.khem at gmail.com  Wed Mar  4 18:59:27 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 4 Mar 2020 10:59:27 -0800
Subject: [oe] [meta-multimedia][PATCH 2/5] vlc: Depend on gst-1.0 ugly
 plugins instead of 0.10
In-Reply-To: <20200304184942.GA7858@localhost>
References: <20200304171927.2068660-1-raj.khem@gmail.com>
	<20200304171927.2068660-2-raj.khem@gmail.com>
	<20200304184942.GA7858@localhost>
Message-ID: <8297d4fe-eb5d-4b54-d117-be221e341c1f@gmail.com>



On 3/4/20 10:49 AM, Adrian Bunk wrote:
> On Wed, Mar 04, 2020 at 09:19:24AM -0800, Khem Raj wrote:
>> ...
>> -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad"
>> +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
>> ...
> 
> The subject should say bad, not ugly (ugly is a different set of plugins).
> 

Thanks, fixed in master-next

> cu
> Adrian
> 

From raj.khem at gmail.com  Wed Mar  4 19:07:35 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 4 Mar 2020 11:07:35 -0800
Subject: [oe] [meta-networking][PATCH] networkmanager: Upgrade 1.18.4 ->
 1.22.8
In-Reply-To: <1c5baebcc371d58c7a12d08b6061f9e410978d56.camel@siemens.com>
References: <b25011d93f8f1ce2c99de352e13cac94c71e2f14.camel@siemens.com>
	<1c5baebcc371d58c7a12d08b6061f9e410978d56.camel@siemens.com>
Message-ID: <70def329-0b03-a390-ea1f-b9cd725af07b@gmail.com>

Hi Adrian

On 3/4/20 12:23 AM, Freihofer, Adrian wrote:
> What's the status with this patch?
>
It does not appear on patchwork for some reason. Moreover
it did not apply cleanly on top of master, Could you rebase it on 
master-next and resend ?


> -----Original Message-----
> From: "[ext] Freihofer, Adrian" <adrian.freihofer at siemens.com>
> To: openembedded-devel at lists.openembedded.org <
> openembedded-devel at lists.openembedded.org>
> Subject: [oe] [meta-networking][PATCH] networkmanager: Upgrade 1.18.4
> -> 1.22.8
> Date: Tue, 25 Feb 2020 08:01:41 +0000
> 
> - rebased patches
> - Option --enable-polkit-agent is not available with current NM,
> removed
> - Option --with-libnm-glib is not available with current NM, removed
> - New package NM-cloud-setup for new experimental cloud setup feature
> - NM tries to re-license from GPL to LGPL, added LGPL to LICENSES
> - Removed empty packages libnmutil libnmglib libnmglib-vpn
> 
> Signed-off-by: Adrian Freihofer <adrian.freihofer at siemens.com>
> ---
>   ...e.ac-Fix-pkgconfig-sysroot-locations.patch |  6 +--
>   ...ttings-settings-property-documentati.patch | 23 +++++-----
>   ...Fix-build-with-musl-systemd-specific.patch | 26 ++++++------
>   .../musl/0002-Fix-build-with-musl.patch       | 30 +++++++------
>   ...ger_1.18.4.bb => networkmanager_1.22.8.bb} | 42 ++++++++++++-------
>   5 files changed, 70 insertions(+), 57 deletions(-)
>   rename meta-networking/recipes-
> connectivity/networkmanager/{networkmanager_1.18.4.bb =>
> networkmanager_1.22.8.bb} (77%)
> 
> diff --git a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
> pkgconfig-sysroot-locations.patch b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
> pkgconfig-sysroot-locations.patch
> index 302c0292b..19c8c7481 100644
> --- a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
> pkgconfig-sysroot-locations.patch
> +++ b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-
> pkgconfig-sysroot-locations.patch
> @@ -1,4 +1,4 @@
> -From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
> +From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001
>   From: Pablo Saavedra <psaavedra at igalia.com>
>   Date: Tue, 13 Mar 2018 17:36:20 +0100
>   Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
> @@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig
> sysroot locations
>    1 file changed, 1 insertion(+), 1 deletion(-)
>   
>   diff --git a/configure.ac b/configure.ac
> -index 967eac0..b914219 100644
> +index 65ceffb..ad4b0fc 100644
>   --- a/configure.ac
>   +++ b/configure.ac
> -@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
> +@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then
>    	AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
>    
>    	AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
> diff --git a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
> settings-property-documentati.patch b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
> settings-property-documentati.patch
> index 5581dd3aa..446637b27 100644
> --- a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
> settings-property-documentati.patch
> +++ b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-
> settings-property-documentati.patch
> @@ -1,4 +1,4 @@
> -From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001
> +From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
>   From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
>   Date: Thu, 22 Mar 2018 11:08:30 +0100
>   Subject: [PATCH] Do not create settings settings/property
> documentation
> @@ -6,23 +6,29 @@ MIME-Version: 1.0
>   Content-Type: text/plain; charset=UTF-8
>   Content-Transfer-Encoding: 8bit
>   
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
>   It was tried to get this work but gi / GirRepository could not be
> found by
>   python. Anyway it is not necessary for us to have the
> settings/property docs.
>   
>   Upstream-Status: Inappropriate [OE specific]
>   
>   Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> +
>   ---
>    Makefile.am  | 11 -----------
>    configure.ac |  5 -----
>    2 files changed, 16 deletions(-)
>   
>   diff --git a/Makefile.am b/Makefile.am
> -index b180466..1ab4658 100644
> +index d5cbcf5..2a1819a 100644
>   --- a/Makefile.am
>   +++ b/Makefile.am
> -@@ -1298,9 +1298,7 @@ EXTRA_DIST += \
> - if HAVE_INTROSPECTION
> +@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
> + INTROSPECTION_GIRS += libnm/NM-1.0.gir
>    
>    libnm_noinst_data = \
>   -	libnm/nm-property-docs.xml \
> @@ -31,7 +37,7 @@ index b180466..1ab4658 100644
>    	libnm/nm-settings-keyfile-docs.xml \
>    	libnm/nm-settings-ifcfg-rh-docs.xml
>    
> -@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS):
> $(libnm_lib_h_pub_mkenums)
> +@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS):
> $(libnm_lib_h_pub_mkenums)
>    $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
>    
>    clients_common_settings_doc_h = clients/common/settings-docs.h
> @@ -51,10 +57,10 @@ index b180466..1ab4658 100644
>    	$(clients_common_settings_doc_h) \
>    	$(clients_common_settings_doc_h).in
>   diff --git a/configure.ac b/configure.ac
> -index b914219..872c292 100644
> +index ad4b0fc..0092092 100644
>   --- a/configure.ac
>   +++ b/configure.ac
> -@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0)
> +@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
>    # check if we can build setting property documentation
>    build_docs=no
>    if test -n "$INTROSPECTION_MAKEFILE"; then
> @@ -66,6 +72,3 @@ index b914219..872c292 100644
>    	AC_PATH_PROG(PERL, perl)
>    	if test -z "$PERL"; then
>    		AC_MSG_ERROR([--enable-introspection requires perl])
> ---
> -2.20.1
> -
> diff --git a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
> musl-systemd-specific.patch b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
> musl-systemd-specific.patch
> index af6f938ce..c23fc308f 100644
> --- a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
> musl-systemd-specific.patch
> +++ b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-
> musl-systemd-specific.patch
> @@ -1,4 +1,4 @@
> -From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001
> +From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001
>   From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
>   Date: Tue, 2 Apr 2019 01:34:35 +0200
>   Subject: [PATCH] Fix build with musl - systemd specific
> @@ -12,6 +12,7 @@ for musl.
>   Upstream-Status: Pending
>   
>   Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> +
>   ---
>    shared/systemd/src/basic/in-addr-util.c |  1 +
>    shared/systemd/src/basic/process-util.c |  9 +++++++++
> @@ -22,10 +23,10 @@ Signed-off-by: Andreas M?ller <
> schnitzeltony at gmail.com>
>    6 files changed, 27 insertions(+), 23 deletions(-)
>   
>   diff --git a/shared/systemd/src/basic/in-addr-util.c
> b/shared/systemd/src/basic/in-addr-util.c
> -index 5899f62..0adb248 100644
> +index 91d687c..8388304 100644
>   --- a/shared/systemd/src/basic/in-addr-util.c
>   +++ b/shared/systemd/src/basic/in-addr-util.c
> -@@ -14,6 +14,7 @@
> +@@ -15,6 +15,7 @@
>    #include "in-addr-util.h"
>    #include "macro.h"
>    #include "parse-util.h"
> @@ -34,10 +35,10 @@ index 5899f62..0adb248 100644
>    #include "strxcpyx.h"
>    #include "util.h"
>   diff --git a/shared/systemd/src/basic/process-util.c
> b/shared/systemd/src/basic/process-util.c
> -index 7431be3..189060a 100644
> +index 1456167..42f51a0 100644
>   --- a/shared/systemd/src/basic/process-util.c
>   +++ b/shared/systemd/src/basic/process-util.c
> -@@ -21,6 +21,9 @@
> +@@ -17,6 +17,9 @@
>    #include <sys/wait.h>
>    #include <syslog.h>
>    #include <unistd.h>
> @@ -47,7 +48,7 @@ index 7431be3..189060a 100644
>    #if 0 /* NM_IGNORED */
>    #if HAVE_VALGRIND_VALGRIND_H
>    #include <valgrind/valgrind.h>
> -@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) {
> +@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
>            cached_pid = CACHED_PID_UNSET;
>    }
>    
> @@ -61,7 +62,7 @@ index 7431be3..189060a 100644
>    
>    pid_t getpid_cached(void) {
>            static bool installed = false;
> -@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) {
> +@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) {
>                             * only half-documented (glibc doesn't
> document it but LSB does ? though only superficially)
>                             * we'll check for errors only in the most
> generic fashion possible. */
>    
> @@ -74,10 +75,10 @@ index 7431be3..189060a 100644
>                                    cached_pid = CACHED_PID_UNSET;
>                                    return new_pid;
>   diff --git a/shared/systemd/src/basic/socket-util.h
> b/shared/systemd/src/basic/socket-util.h
> -index 15443f1..4807198 100644
> +index a0886e0..da47d14 100644
>   --- a/shared/systemd/src/basic/socket-util.h
>   +++ b/shared/systemd/src/basic/socket-util.h
> -@@ -13,6 +13,12 @@
> +@@ -14,6 +14,12 @@
>    #include <sys/types.h>
>    #include <sys/un.h>
>    
> @@ -147,10 +148,10 @@ index c3b9448..e80a938 100644
>    #include <stdio.h>
>    #include <sys/types.h>
>   diff --git a/shared/systemd/src/basic/string-util.h
> b/shared/systemd/src/basic/string-util.h
> -index b23f4c8..8f2f6e0 100644
> +index 04cc82b..2cf589a 100644
>   --- a/shared/systemd/src/basic/string-util.h
>   +++ b/shared/systemd/src/basic/string-util.h
> -@@ -27,6 +27,11 @@
> +@@ -26,6 +26,11 @@
>    #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
>    #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
>    
> @@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644
>    int strcmp_ptr(const char *a, const char *b) _pure_;
>    
>    static inline bool streq_ptr(const char *a, const char *b) {
> ---
> -2.17.1
> -
> diff --git a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
> musl.patch b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
> musl.patch
> index e0973af1e..196a3358d 100644
> --- a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
> musl.patch
> +++ b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-
> musl.patch
> @@ -1,7 +1,7 @@
> -From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001
> +From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001
>   From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
>   Date: Mon, 8 Apr 2019 23:10:43 +0200
> -Subject: [PATCH 2/2] Fix build with musl
> +Subject: [PATCH] Fix build with musl
>   MIME-Version: 1.0
>   Content-Type: text/plain; charset=UTF-8
>   Content-Transfer-Encoding: 8bit
> @@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace'
> [2] (search for
>   Upstream-Status: Pending
>   
>   Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> +
>   ---
>    clients/tui/nmt-device-entry.c   | 1 -
>    libnm-core/nm-utils.h            | 4 ++++
> @@ -41,10 +42,10 @@ Signed-off-by: Andreas M?ller <
> schnitzeltony at gmail.com>
>    5 files changed, 8 insertions(+), 3 deletions(-)
>   
>   diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-
> entry.c
> -index 43fbbc1..3eae286 100644
> +index 4ab5932..915248c 100644
>   --- a/clients/tui/nmt-device-entry.c
>   +++ b/clients/tui/nmt-device-entry.c
> -@@ -39,7 +39,6 @@
> +@@ -26,7 +26,6 @@
>    #include "nmt-device-entry.h"
>    
>    #include <sys/socket.h>
> @@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644
>    #include "nmtui.h"
>    
>   diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
> -index 2b5baba..f7abab6 100644
> +index 5418a1e..f492da6 100644
>   --- a/libnm-core/nm-utils.h
>   +++ b/libnm-core/nm-utils.h
> -@@ -25,6 +25,10 @@
> +@@ -10,6 +10,10 @@
>    #error "Only <NetworkManager.h> can be included directly."
>    #endif
>    
> @@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644
>    
>    #include <netinet/in.h>
>   diff --git a/shared/nm-default.h b/shared/nm-default.h
> -index 54e9916..26e9f4e 100644
> +index ace6ede..25357da 100644
>   --- a/shared/nm-default.h
>   +++ b/shared/nm-default.h
> -@@ -211,6 +211,9 @@
> +@@ -182,6 +182,9 @@
>    #endif
>    
>    #include <stdlib.h>
> @@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644
>   
> /**********************************************************************
> *******/
>    
>   diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
> -index bd4fbcc..f70b309 100644
> +index 3bbc975..4e8a3f6 100644
>   --- a/src/devices/nm-device.c
>   +++ b/src/devices/nm-device.c
> -@@ -24,6 +24,7 @@
> +@@ -9,6 +9,7 @@
>    #include "nm-device.h"
>    
>    #include <netinet/in.h>
> @@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644
>    #include <unistd.h>
>    #include <sys/ioctl.h>
>    #include <signal.h>
> -@@ -32,7 +33,6 @@
> +@@ -17,7 +18,6 @@
>    #include <arpa/inet.h>
>    #include <fcntl.h>
>    #include <linux/if_addr.h>
> @@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644
>    #include <linux/pkt_sched.h>
>    
>   diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-
> platform.c
> -index d4b0115..22a3a90 100644
> +index 7abe4df..9f53147 100644
>   --- a/src/platform/nm-linux-platform.c
>   +++ b/src/platform/nm-linux-platform.c
> -@@ -28,7 +28,6 @@
> +@@ -14,7 +14,6 @@
>    #include <libudev.h>
>    #include <linux/fib_rules.h>
>    #include <linux/ip.h>
> @@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644
>    #include <linux/if_bridge.h>
>    #include <linux/if_link.h>
>    #include <linux/if_tun.h>
> ---
> -2.17.1
> -
> diff --git a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-
> networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
> similarity index 77%
> rename from meta-networking/recipes-
> connectivity/networkmanager/networkmanager_1.18.4.bb
> rename to meta-networking/recipes-
> connectivity/networkmanager/networkmanager_1.22.8.bb
> index 27508c4d9..b26a5ce06 100644
> --- a/meta-networking/recipes-
> connectivity/networkmanager/networkmanager_1.18.4.bb
> +++ b/meta-networking/recipes-
> connectivity/networkmanager/networkmanager_1.22.8.bb
> @@ -2,9 +2,9 @@ SUMMARY = "NetworkManager"
>   HOMEPAGE = "
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwiki.gnome.org%2FProjects%2FNetworkManager&amp;data=02%7C01%7Cadrian.freihofer%40siemens.com%7C8de3b1ae8ae9457543af08d7b9c8fd91%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C1%7C637182145207584028&amp;sdata=5npYqRQeaw0I7VUPrDIPcEx47%2FLsqsvge5NFQt2XVt8%3D&amp;reserved=0
> "
>   SECTION = "net/misc"
>   
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM =
> "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
> -                    file://libnm-
> util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
> +LICENSE = "GPLv2+ & LGPLv2.1+"
> +LIC_FILES_CHKSUM =
> "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +                    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b3
> 64516c \
>   "
>   
>   DEPENDS = " \
> @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \
>       file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
>       file://musl/0002-Fix-build-with-musl.patch \
>   "
> -SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
> -SRC_URI[sha256sum] =
> "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
> +SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284"
> +SRC_URI[sha256sum] =
> "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f"
>   
>   S = "${WORKDIR}/NetworkManager-${PV}"
>   
> @@ -65,7 +65,7 @@ PACKAGECONFIG[systemd] = " \
>       --with-systemdsystemunitdir=${systemd_unitdir}/system --with-
> session-tracking=systemd, \
>       --without-systemdsystemunitdir, \
>   "
> -PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,
> --disable-polkit --disable-polkit-agent,polkit"
> +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
>   PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-
> dun,bluez5"
>   # consolekit is not picked by shlibs, so add it to RDEPENDS too
>   PACKAGECONFIG[consolekit] = "--with-session-
> tracking=consolekit,,consolekit,consolekit"
> @@ -75,33 +75,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-
> ppp,ppp,ppp"
>   PACKAGECONFIG[dhclient] = "--with-
> dhclient=${base_sbindir}/dhclient,,,dhcp-client"
>   PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
>   PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
> -PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib"
>   PACKAGECONFIG[resolvconf] = "--with-
> resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
>   PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
>   PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-
> supplicant"
>   PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
>   PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
> +PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-
> cloud-setup=no"
>   
> -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
> +PACKAGES =+ " \
>     ${PN}-nmtui ${PN}-nmtui-doc \
> -  ${PN}-adsl \
> +  ${PN}-adsl ${PN}-cloud-setup \
>   "
>   
> -FILES_libnmutil += "${libdir}/libnm-util.so.*"
> -FILES_libnmglib += "${libdir}/libnm-glib.so.*"
> -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
> +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup"
>   
>   FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-
> plugin-adsl.so"
>   
> +FILES_${PN}-cloud-setup = " \
> +    ${libexecdir}/nm-cloud-setup \
> +    ${systemd_system_unitdir}/nm-cloud-setup.service \
> +    ${systemd_system_unitdir}/nm-cloud-setup.timer \
> +    ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \
> +    ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-
> setup.sh \
> +"
> +ALLOW_EMPTY_${PN}-cloud-setup = "1"
> +SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONF
> IG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '',
> d)}"
> +
>   FILES_${PN} += " \
>       ${libexecdir} \
>       ${libdir}/NetworkManager/${PV}/*.so \
> -    ${nonarch_libdir}/NetworkManager/VPN \
> +    ${libdir}/NetworkManager \
>       ${nonarch_libdir}/NetworkManager/conf.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \
> +    ${nonarch_libdir}/NetworkManager/VPN \
> +    ${nonarch_libdir}/NetworkManager/system-connections \
>       ${datadir}/polkit-1 \
>       ${datadir}/dbus-1 \
>       ${nonarch_base_libdir}/udev/* \
> -    ${systemd_unitdir}/system \
> +    ${systemd_system_unitdir} \
>       ${libdir}/pppd \
>   "
> 

From raj.khem at gmail.com  Wed Mar  4 19:19:37 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 4 Mar 2020 11:19:37 -0800
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
In-Reply-To: <alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
References: <20200304122811.16655-1-leo.yan@linaro.org>
	<alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
Message-ID: <a7ae7094-c8b4-f0cc-357f-c6cce1231e49@gmail.com>



On 3/4/20 8:05 AM, Scott Murray wrote:
> On Wed, 4 Mar 2020, Leo Yan wrote:
> 
>> This recipe is to support OpenCSD, which is an open source
>> CoreSight trace decode library and utility.
> 
> Just a thought, this seems like the kind of thing that might make sense
> for the new meta-arm layer that Jon has been working up?
> 

it also says x86_64 in COMPATIBLE_HOST, while coresight seems to be arm
specific is this not supposed to be so ?

>> Signed-off-by: Leo Yan <leo.yan at linaro.org>
>> ---
>>   .../recipes-devtools/opencsd/opencsd_git.bb   | 28 +++++++++++++++++++
>>   1 file changed, 28 insertions(+)
>>   create mode 100644 meta-oe/recipes-devtools/opencsd/opencsd_git.bb
>>
>> diff --git a/meta-oe/recipes-devtools/opencsd/opencsd_git.bb b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
>> new file mode 100644
>> index 000000000..0c3b4837d
>> --- /dev/null
>> +++ b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb
>> @@ -0,0 +1,28 @@
>> +SUMMARY = "OpenCSD - An open source CoreSight(tm) Trace Decode library"
>> +HOMEPAGE = "https://github.com/Linaro/OpenCSD"
>> +LICENSE = "BSD-3-Clause"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
>> +
>> +SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=http;branch=master"
>> +SRCREV = "03c194117971e4ad0598df29395757ced2e6e9bd"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +COMPATIBLE_HOST = "(x86_64.*|aarch64.*)-linux"
>> +
>> +EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
>> +                CROSS_COMPILE='${TARGET_SYS}-' \
>> +                CC='${CC}' \
>> +                CXX='${CXX}' \
>> +                LINKER='${CXX}' \
>> +                LINUX64=1 \
>> +                DEBUG=1 \
>> +                "
>> +
>> +do_compile() {
>> +    ( cd ${S}/decoder/build/linux; oe_runmake ${EXTRA_OEMAKE}; cd - )
>> +}
>> +
>> +do_install() {
>> +    ( cd ${S}/decoder/build/linux; oe_runmake PREFIX=${D}/usr install; cd - )
>> +}
>>

From scott.branden at broadcom.com  Thu Mar  5 01:33:50 2020
From: scott.branden at broadcom.com (Scott Branden)
Date: Wed, 4 Mar 2020 17:33:50 -0800
Subject: [oe] [meta-multimedia][PATCH v2] x265: add x265 recipe
In-Reply-To: <CAMKF1sr92Rmpv_ix7zLSLsm_XrZD2CjdaPNn+Pcbp4A2kLS0wg@mail.gmail.com>
References: <20200215005402.18661-1-scott.branden@broadcom.com>
	<CAMKF1srJLkYmt=uH7QWDW_-TpeS0FcrVjU3f1Ec_+1_rc4vtwA@mail.gmail.com>
	<CAMKF1sr92Rmpv_ix7zLSLsm_XrZD2CjdaPNn+Pcbp4A2kLS0wg@mail.gmail.com>
Message-ID: <65fc29ea-ef37-9b1e-5dd3-316379f0b7eb@broadcom.com>

Hi Khem,

On 2020-03-03 11:33 p.m., Khem Raj wrote:
> On Tue, Mar 3, 2020 at 10:42 PM Khem Raj <raj.khem at gmail.com> wrote:
>> Hi Scott
>>
>> I am getting a textrel issue reported on musl builds see
>> https://errors.yoctoproject.org/Errors/Details/393681/
>>
>> this recipe is already applied but would be good to root cause this issue
>> and find appropriate fix
>>
>> https://errors.yoctoproject.org/Errors/Details/393681/
> disabling asm helps on 32bit x86
>
> EXTRA_OECMAKE_append_i686 = " -DENABLE_ASSEMBLY=OFF"
>
> can you test this fix and see if this will be ok ?
I'm sorry, I am unable to test this week.
I am ok with you pushing this for 32bit x86 now though - we only test on 
64bit.
>
>> On Fri, Feb 14, 2020 at 4:54 PM Scott Branden via Openembedded-devel
>> <openembedded-devel at lists.openembedded.org> wrote:
>>> Add x265 recipe for latest tag of Release_3.2 branch (3.2.1).
>>>
>>> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
>>> ---
>>>   .../recipes-multimedia/x265/x265_3.2.1.bb     | 22 +++++++++++++++++++
>>>   1 file changed, 22 insertions(+)
>>>   create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
>>>
>>> diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
>>> new file mode 100644
>>> index 0000000000..21ae596e05
>>> --- /dev/null
>>> +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
>>> @@ -0,0 +1,22 @@
>>> +SUMMARY = "H.265/HEVC video encoder"
>>> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format."
>>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html"
>>> +
>>> +LICENSE = "GPLv2"
>>> +LICENSE_FLAGS = "commercial"
>>> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091"
>>> +
>>> +DEPENDS = "nasm-native gnutls zlib libpcre"
>>> +
>>> +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz"
>>> +
>>> +S = "${WORKDIR}/x265_${PV}/source"
>>> +
>>> +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca"
>>> +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc"
>>> +
>>> +inherit lib_package pkgconfig cmake
>>> +
>>> +AS[unexport] = "1"
>>> +
>>> +COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
>>> --
>>> 2.17.1
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


From leo.yan at linaro.org  Thu Mar  5 01:43:47 2020
From: leo.yan at linaro.org (Leo Yan)
Date: Thu, 5 Mar 2020 09:43:47 +0800
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
In-Reply-To: <a7ae7094-c8b4-f0cc-357f-c6cce1231e49@gmail.com>
References: <20200304122811.16655-1-leo.yan@linaro.org>
	<alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
	<a7ae7094-c8b4-f0cc-357f-c6cce1231e49@gmail.com>
Message-ID: <20200305014347.GA5761@leoy-ThinkPad-X240s>

Hi all,

On Wed, Mar 04, 2020 at 11:19:37AM -0800, Khem Raj wrote:
> 
> 
> On 3/4/20 8:05 AM, Scott Murray wrote:
> > On Wed, 4 Mar 2020, Leo Yan wrote:
> > 
> > > This recipe is to support OpenCSD, which is an open source
> > > CoreSight trace decode library and utility.
> > 
> > Just a thought, this seems like the kind of thing that might make sense
> > for the new meta-arm layer that Jon has been working up?

Thanks for the suggestion, Scott.

To be honest, I didn't know meta-arm layer before; seems to me it makes
sense to integrate this recipe into meta-arm rather than
meta-openembedded.  Will explain more for Khem's question.

> it also says x86_64 in COMPATIBLE_HOST, while coresight seems to be arm
> specific is this not supposed to be so ?

OpenCSD lib is dedicated to be used for Arm CoreSight IP, but it can
be built both for x86_64's and Arm64's distro.

The main usage case is to enable OpenCSD lib for Arm64 building, and the
users can decode the trace data with Perf/OpenCSD in the same distro.
Though I set COMPATIBLE_HOST for x86_64, it would be seldom to do cross
analysis (e.g. capture trace data in OE/Arm64 and copy the perf data to
OE/x86_64 for analysis).

For this reason, it's good to maintain this recipe in meta-arm.  If no
objection, I will prepare patch for meta-arm.

Thanks,
Leo

From raj.khem at gmail.com  Thu Mar  5 01:49:37 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 4 Mar 2020 17:49:37 -0800
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
In-Reply-To: <20200305014347.GA5761@leoy-ThinkPad-X240s>
References: <20200304122811.16655-1-leo.yan@linaro.org>
	<alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
	<a7ae7094-c8b4-f0cc-357f-c6cce1231e49@gmail.com>
	<20200305014347.GA5761@leoy-ThinkPad-X240s>
Message-ID: <CAMKF1sqP3hVvMdi-itWH6VmHQX6Ri5Cj-=0nQyyacDW2tCFBWg@mail.gmail.com>

On Wed, Mar 4, 2020 at 5:43 PM Leo Yan <leo.yan at linaro.org> wrote:
>
> Hi all,
>
> On Wed, Mar 04, 2020 at 11:19:37AM -0800, Khem Raj wrote:
> >
> >
> > On 3/4/20 8:05 AM, Scott Murray wrote:
> > > On Wed, 4 Mar 2020, Leo Yan wrote:
> > >
> > > > This recipe is to support OpenCSD, which is an open source
> > > > CoreSight trace decode library and utility.
> > >
> > > Just a thought, this seems like the kind of thing that might make sense
> > > for the new meta-arm layer that Jon has been working up?
>
> Thanks for the suggestion, Scott.
>
> To be honest, I didn't know meta-arm layer before; seems to me it makes
> sense to integrate this recipe into meta-arm rather than
> meta-openembedded.  Will explain more for Khem's question.
>
> > it also says x86_64 in COMPATIBLE_HOST, while coresight seems to be arm
> > specific is this not supposed to be so ?
>
> OpenCSD lib is dedicated to be used for Arm CoreSight IP, but it can
> be built both for x86_64's and Arm64's distro.
>
> The main usage case is to enable OpenCSD lib for Arm64 building, and the
> users can decode the trace data with Perf/OpenCSD in the same distro.
> Though I set COMPATIBLE_HOST for x86_64, it would be seldom to do cross
> analysis (e.g. capture trace data in OE/Arm64 and copy the perf data to
> OE/x86_64 for analysis).
>
> For this reason, it's good to maintain this recipe in meta-arm.  If no
> objection, I will prepare patch for meta-arm.

Makes sense in meta-arm

>
> Thanks,
> Leo

From raj.khem at gmail.com  Thu Mar  5 01:52:27 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 4 Mar 2020 17:52:27 -0800
Subject: [oe] [meta-multimedia][PATCH v2] x265: add x265 recipe
In-Reply-To: <65fc29ea-ef37-9b1e-5dd3-316379f0b7eb@broadcom.com>
References: <20200215005402.18661-1-scott.branden@broadcom.com>
	<CAMKF1srJLkYmt=uH7QWDW_-TpeS0FcrVjU3f1Ec_+1_rc4vtwA@mail.gmail.com>
	<CAMKF1sr92Rmpv_ix7zLSLsm_XrZD2CjdaPNn+Pcbp4A2kLS0wg@mail.gmail.com>
	<65fc29ea-ef37-9b1e-5dd3-316379f0b7eb@broadcom.com>
Message-ID: <CAMKF1spgbxCxHaDtE2P2XrawxN7Bc+DuOtmdEu2rWn7c+0fa3A@mail.gmail.com>

On Wed, Mar 4, 2020 at 5:33 PM Scott Branden <scott.branden at broadcom.com> wrote:
>
> Hi Khem,
>
> On 2020-03-03 11:33 p.m., Khem Raj wrote:
> > On Tue, Mar 3, 2020 at 10:42 PM Khem Raj <raj.khem at gmail.com> wrote:
> >> Hi Scott
> >>
> >> I am getting a textrel issue reported on musl builds see
> >> https://errors.yoctoproject.org/Errors/Details/393681/
> >>
> >> this recipe is already applied but would be good to root cause this issue
> >> and find appropriate fix
> >>
> >> https://errors.yoctoproject.org/Errors/Details/393681/
> > disabling asm helps on 32bit x86
> >
> > EXTRA_OECMAKE_append_i686 = " -DENABLE_ASSEMBLY=OFF"
> >
> > can you test this fix and see if this will be ok ?
> I'm sorry, I am unable to test this week.
> I am ok with you pushing this for 32bit x86 now though - we only test on
> 64bit.

OK thanks for the confirmation, I have pushed the fix for x86

> >
> >> On Fri, Feb 14, 2020 at 4:54 PM Scott Branden via Openembedded-devel
> >> <openembedded-devel at lists.openembedded.org> wrote:
> >>> Add x265 recipe for latest tag of Release_3.2 branch (3.2.1).
> >>>
> >>> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
> >>> ---
> >>>   .../recipes-multimedia/x265/x265_3.2.1.bb     | 22 +++++++++++++++++++
> >>>   1 file changed, 22 insertions(+)
> >>>   create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> >>>
> >>> diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> >>> new file mode 100644
> >>> index 0000000000..21ae596e05
> >>> --- /dev/null
> >>> +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> >>> @@ -0,0 +1,22 @@
> >>> +SUMMARY = "H.265/HEVC video encoder"
> >>> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format."
> >>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html"
> >>> +
> >>> +LICENSE = "GPLv2"
> >>> +LICENSE_FLAGS = "commercial"
> >>> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091"
> >>> +
> >>> +DEPENDS = "nasm-native gnutls zlib libpcre"
> >>> +
> >>> +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz"
> >>> +
> >>> +S = "${WORKDIR}/x265_${PV}/source"
> >>> +
> >>> +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca"
> >>> +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc"
> >>> +
> >>> +inherit lib_package pkgconfig cmake
> >>> +
> >>> +AS[unexport] = "1"
> >>> +
> >>> +COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
> >>> --
> >>> 2.17.1
> >>>
> >>> --
> >>> _______________________________________________
> >>> Openembedded-devel mailing list
> >>> Openembedded-devel at lists.openembedded.org
> >>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From leo.yan at linaro.org  Thu Mar  5 02:00:20 2020
From: leo.yan at linaro.org (Leo Yan)
Date: Thu, 5 Mar 2020 10:00:20 +0800
Subject: [oe] [PATCH v1] OpenCSD: Support for Arm CoreSight decode lib
In-Reply-To: <CAMKF1sqP3hVvMdi-itWH6VmHQX6Ri5Cj-=0nQyyacDW2tCFBWg@mail.gmail.com>
References: <20200304122811.16655-1-leo.yan@linaro.org>
	<alpine.LFD.2.21.2003041103340.29352@godzilla.spiteful.org>
	<a7ae7094-c8b4-f0cc-357f-c6cce1231e49@gmail.com>
	<20200305014347.GA5761@leoy-ThinkPad-X240s>
	<CAMKF1sqP3hVvMdi-itWH6VmHQX6Ri5Cj-=0nQyyacDW2tCFBWg@mail.gmail.com>
Message-ID: <20200305020020.GC5761@leoy-ThinkPad-X240s>

On Wed, Mar 04, 2020 at 05:49:37PM -0800, Khem Raj wrote:
> On Wed, Mar 4, 2020 at 5:43 PM Leo Yan <leo.yan at linaro.org> wrote:
> >
> > Hi all,
> >
> > On Wed, Mar 04, 2020 at 11:19:37AM -0800, Khem Raj wrote:
> > >
> > >
> > > On 3/4/20 8:05 AM, Scott Murray wrote:
> > > > On Wed, 4 Mar 2020, Leo Yan wrote:
> > > >
> > > > > This recipe is to support OpenCSD, which is an open source
> > > > > CoreSight trace decode library and utility.
> > > >
> > > > Just a thought, this seems like the kind of thing that might make sense
> > > > for the new meta-arm layer that Jon has been working up?
> >
> > Thanks for the suggestion, Scott.
> >
> > To be honest, I didn't know meta-arm layer before; seems to me it makes
> > sense to integrate this recipe into meta-arm rather than
> > meta-openembedded.  Will explain more for Khem's question.
> >
> > > it also says x86_64 in COMPATIBLE_HOST, while coresight seems to be arm
> > > specific is this not supposed to be so ?
> >
> > OpenCSD lib is dedicated to be used for Arm CoreSight IP, but it can
> > be built both for x86_64's and Arm64's distro.
> >
> > The main usage case is to enable OpenCSD lib for Arm64 building, and the
> > users can decode the trace data with Perf/OpenCSD in the same distro.
> > Though I set COMPATIBLE_HOST for x86_64, it would be seldom to do cross
> > analysis (e.g. capture trace data in OE/Arm64 and copy the perf data to
> > OE/x86_64 for analysis).
> >
> > For this reason, it's good to maintain this recipe in meta-arm.  If no
> > objection, I will prepare patch for meta-arm.
> 
> Makes sense in meta-arm

Thanks for confirmation, Khem. And thanks all :)  Will do it.

Leo

From changqing.li at windriver.com  Thu Mar  5 08:27:59 2020
From: changqing.li at windriver.com (changqing.li at windriver.com)
Date: Thu, 5 Mar 2020 16:27:59 +0800
Subject: [oe] [meta-filesystems][PATCH] xfsdump: fix do patch error
Message-ID: <1583396879-334238-1-git-send-email-changqing.li@windriver.com>

From: Changqing Li <changqing.li at windriver.com>

update patch to fix do_patch error

Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
 .../files/0001-xfsdump-support-usrmerge.patch      | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
index 04ec7b3..bfb25e8 100644
--- a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
+++ b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
@@ -1,44 +1,48 @@
-From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001
+From fea8c4634469784c16211e2597411c18c72dfa4a Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li at windriver.com>
-Date: Thu, 5 Sep 2019 11:17:15 +0800
+Date: Thu, 5 Mar 2020 14:36:14 +0800
 Subject: [PATCH] xfsdump: support usrmerge
 
 Upstream-Status: Inappropriate [oe-specific]
 
 Signed-off-by: Changqing Li <changqing.li at windriver.com>
 ---
- dump/Makefile    | 4 +---
- restore/Makefile | 4 +---
- 2 files changed, 2 insertions(+), 6 deletions(-)
+ dump/Makefile    | 6 +-----
+ restore/Makefile | 6 +-----
+ 2 files changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/dump/Makefile b/dump/Makefile
-index 97879fa..14da664 100644
+index 66f00d3..cc2d973 100644
 --- a/dump/Makefile
 +++ b/dump/Makefile
-@@ -97,10 +97,8 @@ default: depend $(LTCOMMAND)
+@@ -97,12 +97,8 @@ default: depend $(LTCOMMAND)
  include $(BUILDRULES)
  
  install: default
 -	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
 -	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
  	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
--	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+-	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+-	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+-		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
 +	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
  install-dev:
  
  .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
 diff --git a/restore/Makefile b/restore/Makefile
-index c6f3f25..7835ecc 100644
+index ac3f8c8..3c46394 100644
 --- a/restore/Makefile
 +++ b/restore/Makefile
-@@ -107,10 +107,8 @@ default: depend $(LTCOMMAND)
+@@ -111,12 +111,8 @@ default: depend $(LTCOMMAND)
  include $(BUILDRULES)
  
  install: default
 -	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
 -	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
  	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
--	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+-	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+-	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+-		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
 +	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
  install-dev:
  
-- 
2.7.4


From offougajoris at gmail.com  Thu Mar  5 15:08:09 2020
From: offougajoris at gmail.com (Joris Offouga)
Date: Thu,  5 Mar 2020 16:08:09 +0100
Subject: [oe] [meta-oe][PATCH] monit: new package
Message-ID: <20200305150809.6991-1-offougajoris@gmail.com>

Signed-off-by: Joris Offouga <offougajoris at gmail.com>
---
 meta-oe/recipes-support/monit/monit/monit     | 42 +++++++++++++++
 meta-oe/recipes-support/monit/monit/monitrc   | 44 +++++++++++++++
 meta-oe/recipes-support/monit/monit_5.26.0.bb | 53 +++++++++++++++++++
 3 files changed, 139 insertions(+)
 create mode 100644 meta-oe/recipes-support/monit/monit/monit
 create mode 100644 meta-oe/recipes-support/monit/monit/monitrc
 create mode 100644 meta-oe/recipes-support/monit/monit_5.26.0.bb

diff --git a/meta-oe/recipes-support/monit/monit/monit b/meta-oe/recipes-support/monit/monit/monit
new file mode 100644
index 000000000..394704e06
--- /dev/null
+++ b/meta-oe/recipes-support/monit/monit/monit
@@ -0,0 +1,42 @@
+#! /bin/sh 
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/monit and type
+# > update-rc.d monit defaults 89
+#
+monit=/usr/bin/monit
+pidfile=/var/run/monit.pid
+monit_args="-c /etc/monitrc"
+
+test -x "$monit" || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting Monit"
+    start-stop-daemon --start --quiet --exec $monit -- $monit_args
+    RETVAL=$?
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping Monit"
+    start-stop-daemon --stop --quiet --pidfile $pidfile
+    RETVAL=$?
+    echo "."
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    RETVAL=$?
+    ;;
+  status)
+    $monit $monit_args status
+    RETVAL=$?
+    echo "."
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|status}"
+    exit 1
+esac
+
+exit $RETVAL
+
diff --git a/meta-oe/recipes-support/monit/monit/monitrc b/meta-oe/recipes-support/monit/monit/monitrc
new file mode 100644
index 000000000..f8d6a4388
--- /dev/null
+++ b/meta-oe/recipes-support/monit/monit/monitrc
@@ -0,0 +1,44 @@
+###############################################################################
+## Monit control file
+###############################################################################
+##
+## Comments begin with a '#' and extend through the end of the line. Keywords
+## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'.
+##
+## Below you will find examples of some frequently used statements. For
+## information about the control file and a complete list of statements and
+## options, please have a look in the Monit manual.
+##
+##
+###############################################################################
+## Global section
+###############################################################################
+##
+## Start Monit in the background (run as a daemon):
+#
+set daemon  30              # check services at 30 seconds intervals
+#   with start delay 240    # optional: delay the first check by 4-minutes (by
+#                           # default Monit check immediately after Monit start)
+#
+#
+## Set syslog logging. If you want to log to a standalone log file instead,
+## specify the full path to the log file
+#
+set log syslog
+
+set httpd port 2812
+    allow 0.0.0.0/0        # allow localhost to connect to the server and
+    allow admin:monit      # require user 'admin' with password 'monit'
+    #with ssl {            # enable SSL/TLS and set path to server certificate
+    #    pemfile: /etc/ssl/certs/monit.pem
+    #}
+
+###############################################################################
+## Includes
+###############################################################################
+##
+## It is possible to include additional configuration parts from other files or
+## directories.
+#
+include /etc/monit.d/*
+
diff --git a/meta-oe/recipes-support/monit/monit_5.26.0.bb b/meta-oe/recipes-support/monit/monit_5.26.0.bb
new file mode 100644
index 000000000..a954682d6
--- /dev/null
+++ b/meta-oe/recipes-support/monit/monit_5.26.0.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \
+processes, programs, files, directories and filesystems on a UNIX system. \
+Monit conducts automatic maintenance and repair and can execute meaningful \
+causal actions in error situations."
+
+HOMEPAGE = "http://mmonit.com/monit/"
+
+LICENSE = "AGPL-3.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \
+                    file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92"
+
+SRC_URI = " \
+	https://mmonit.com/monit/dist/monit-${PV}.tar.gz \
+	file://monit \
+	file://monitrc \
+"
+
+SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df"
+SRC_URI[sha256sum] = "87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2"
+
+DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt"
+
+inherit autotools-brokensep systemd update-rc.d
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
+PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
+
+EXTRA_OECONF = "\
+    libmonit_cv_setjmp_available=no \
+    libmonit_cv_vsnprintf_c99_conformant=no \
+    --with-ssl-lib-dir=${STAGING_LIBDIR} \
+    --with-ssl-incl-dir=${STAGING_INCDIR} \
+"
+
+SYSTEMD_SERVICE_${PN} = "monit.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
+INITSCRIPT_PACKAGES = "${PN}"
+INITSCRIPT_NAME_${PN} = "monit"
+INITSCRIPT_PARAMS_${PN} = "defaults 89"
+
+do_install_append() {
+
+    # Configuration file
+    install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc
+
+    # SystemD
+    install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service
+    sed -i -e 's, at prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service
+
+    # SysV
+    install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit
+}
-- 
2.20.1


From robert.berger.oe.devel at gmail.com  Thu Mar  5 15:33:00 2020
From: robert.berger.oe.devel at gmail.com (robert.berger.oe.devel)
Date: Thu, 5 Mar 2020 17:33:00 +0200
Subject: [oe] issue with -Wno-unknown-warning
Message-ID: <4c466104-c2f3-0ad6-447a-f6bc3496c25a@gmail.com>

Hi Richard,

Sorry for coming back after such a long time, but I am pretty busy;)

Anyhow, I tried what you suggested in some off-list e-mail:

 >> 1.2) You need 2 patches [2][3]
 >>
 >> [2] 
https://github.com/RobertBerger/meta-java/commit/898a0ae33c9102387aae2e3427a007e3935e663e
 >
 > That's basically fine, but in case of icedtea7-native this restricts the
 > host compilers to >= gcc9. Therefore you should also add
 > "-Wno-unknown-warning".
 >
 > Furthermore please remove the "old" line instead of adding it as a 
comment.

Here is what I did as per your suggestion:

https://github.com/RobertBerger/meta-java/commit/3d8ae5afb639ec7abcc48f15c74b42b373863c57

 >
 >
 >>
 >> [3] 
https://github.com/RobertBerger/meta-java/commit/213b40c25602d23d00366149a778d2e53779b018
 >
 > Looks good.


... but it does not build:

https://pastebin.com/B1nxHcPH

cc1plus: error: unrecognized command line option ?-Wno-unknown-warning? 
[-Werror]

That's my host gcc:

pokyuser at 3a469e7032d9:/workdir$ gcc --version
gcc (Ubuntu 9.2.1-17ubuntu1~16.04) 9.2.1 20191102
Copyright (C) 2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

pokyuser at 3a469e7032d9:/workdir$

Please advise.

Regards,

Robert




From adrian.freihofer at gmail.com  Thu Mar  5 21:10:44 2020
From: adrian.freihofer at gmail.com (Adrian Freihofer)
Date: Thu,  5 Mar 2020 22:10:44 +0100
Subject: [oe] [meta-networking][PATCH v2] networkmanager: Upgrade 1.18.4 ->
	1.22.8
Message-ID: <20200305211044.799921-1-adrian.freihofer@siemens.com>

- rebased patches
- Option --enable-polkit-agent is not available with current NM, removed
- Option --with-libnm-glib is not available with current NM, removed
- New package NM-cloud-setup for new experimental cloud setup feature
- NM tries to re-license from GPL to LGPL, added LGPL to LICENSES
- Removed empty packages libnmutil libnmglib libnmglib-vpn

Signed-off-by: Adrian Freihofer <adrian.freihofer at siemens.com>
---
 ...e.ac-Fix-pkgconfig-sysroot-locations.patch |  6 +--
 ...ttings-settings-property-documentati.patch | 23 +++++-----
 ...Fix-build-with-musl-systemd-specific.patch | 26 ++++++------
 .../musl/0002-Fix-build-with-musl.patch       | 30 +++++++------
 ...ger_1.18.4.bb => networkmanager_1.22.8.bb} | 42 ++++++++++++-------
 5 files changed, 70 insertions(+), 57 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.4.bb => networkmanager_1.22.8.bb} (77%)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
index 302c0292b..19c8c7481 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
@@ -1,4 +1,4 @@
-From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
+From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001
 From: Pablo Saavedra <psaavedra at igalia.com>
 Date: Tue, 13 Mar 2018 17:36:20 +0100
 Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
@@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 967eac0..b914219 100644
+index 65ceffb..ad4b0fc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
+@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then
  	AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
  
  	AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
index 5581dd3aa..446637b27 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
@@ -1,4 +1,4 @@
-From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001
+From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Thu, 22 Mar 2018 11:08:30 +0100
 Subject: [PATCH] Do not create settings settings/property documentation
@@ -6,23 +6,29 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 It was tried to get this work but gi / GirRepository could not be found by
 python. Anyway it is not necessary for us to have the settings/property docs.
 
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  Makefile.am  | 11 -----------
  configure.ac |  5 -----
  2 files changed, 16 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index b180466..1ab4658 100644
+index d5cbcf5..2a1819a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1298,9 +1298,7 @@ EXTRA_DIST += \
- if HAVE_INTROSPECTION
+@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
+ INTROSPECTION_GIRS += libnm/NM-1.0.gir
  
  libnm_noinst_data = \
 -	libnm/nm-property-docs.xml \
@@ -31,7 +37,7 @@ index b180466..1ab4658 100644
  	libnm/nm-settings-keyfile-docs.xml \
  	libnm/nm-settings-ifcfg-rh-docs.xml
  
-@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
+@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
  $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
  
  clients_common_settings_doc_h = clients/common/settings-docs.h
@@ -51,10 +57,10 @@ index b180466..1ab4658 100644
  	$(clients_common_settings_doc_h) \
  	$(clients_common_settings_doc_h).in
 diff --git a/configure.ac b/configure.ac
-index b914219..872c292 100644
+index ad4b0fc..0092092 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0)
+@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
  # check if we can build setting property documentation
  build_docs=no
  if test -n "$INTROSPECTION_MAKEFILE"; then
@@ -66,6 +72,3 @@ index b914219..872c292 100644
  	AC_PATH_PROG(PERL, perl)
  	if test -z "$PERL"; then
  		AC_MSG_ERROR([--enable-introspection requires perl])
--- 
-2.20.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
index af6f938ce..c23fc308f 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
@@ -1,4 +1,4 @@
-From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001
+From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Tue, 2 Apr 2019 01:34:35 +0200
 Subject: [PATCH] Fix build with musl - systemd specific
@@ -12,6 +12,7 @@ for musl.
 Upstream-Status: Pending
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  shared/systemd/src/basic/in-addr-util.c |  1 +
  shared/systemd/src/basic/process-util.c |  9 +++++++++
@@ -22,10 +23,10 @@ Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
  6 files changed, 27 insertions(+), 23 deletions(-)
 
 diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
-index 5899f62..0adb248 100644
+index 91d687c..8388304 100644
 --- a/shared/systemd/src/basic/in-addr-util.c
 +++ b/shared/systemd/src/basic/in-addr-util.c
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
  #include "in-addr-util.h"
  #include "macro.h"
  #include "parse-util.h"
@@ -34,10 +35,10 @@ index 5899f62..0adb248 100644
  #include "strxcpyx.h"
  #include "util.h"
 diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
-index 7431be3..189060a 100644
+index 1456167..42f51a0 100644
 --- a/shared/systemd/src/basic/process-util.c
 +++ b/shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
+@@ -17,6 +17,9 @@
  #include <sys/wait.h>
  #include <syslog.h>
  #include <unistd.h>
@@ -47,7 +48,7 @@ index 7431be3..189060a 100644
  #if 0 /* NM_IGNORED */
  #if HAVE_VALGRIND_VALGRIND_H
  #include <valgrind/valgrind.h>
-@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) {
+@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
          cached_pid = CACHED_PID_UNSET;
  }
  
@@ -61,7 +62,7 @@ index 7431be3..189060a 100644
  
  pid_t getpid_cached(void) {
          static bool installed = false;
-@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) {
+@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) {
                           * only half-documented (glibc doesn't document it but LSB does ? though only superficially)
                           * we'll check for errors only in the most generic fashion possible. */
  
@@ -74,10 +75,10 @@ index 7431be3..189060a 100644
                                  cached_pid = CACHED_PID_UNSET;
                                  return new_pid;
 diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
-index 15443f1..4807198 100644
+index a0886e0..da47d14 100644
 --- a/shared/systemd/src/basic/socket-util.h
 +++ b/shared/systemd/src/basic/socket-util.h
-@@ -13,6 +13,12 @@
+@@ -14,6 +14,12 @@
  #include <sys/types.h>
  #include <sys/un.h>
  
@@ -147,10 +148,10 @@ index c3b9448..e80a938 100644
  #include <stdio.h>
  #include <sys/types.h>
 diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
-index b23f4c8..8f2f6e0 100644
+index 04cc82b..2cf589a 100644
 --- a/shared/systemd/src/basic/string-util.h
 +++ b/shared/systemd/src/basic/string-util.h
-@@ -27,6 +27,11 @@
+@@ -26,6 +26,11 @@
  #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
  #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
  
@@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644
  int strcmp_ptr(const char *a, const char *b) _pure_;
  
  static inline bool streq_ptr(const char *a, const char *b) {
--- 
-2.17.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
index e0973af1e..196a3358d 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
@@ -1,7 +1,7 @@
-From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001
+From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Mon, 8 Apr 2019 23:10:43 +0200
-Subject: [PATCH 2/2] Fix build with musl
+Subject: [PATCH] Fix build with musl
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace' [2] (search for
 Upstream-Status: Pending
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  clients/tui/nmt-device-entry.c   | 1 -
  libnm-core/nm-utils.h            | 4 ++++
@@ -41,10 +42,10 @@ Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
  5 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
-index 43fbbc1..3eae286 100644
+index 4ab5932..915248c 100644
 --- a/clients/tui/nmt-device-entry.c
 +++ b/clients/tui/nmt-device-entry.c
-@@ -39,7 +39,6 @@
+@@ -26,7 +26,6 @@
  #include "nmt-device-entry.h"
  
  #include <sys/socket.h>
@@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644
  #include "nmtui.h"
  
 diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 2b5baba..f7abab6 100644
+index 5418a1e..f492da6 100644
 --- a/libnm-core/nm-utils.h
 +++ b/libnm-core/nm-utils.h
-@@ -25,6 +25,10 @@
+@@ -10,6 +10,10 @@
  #error "Only <NetworkManager.h> can be included directly."
  #endif
  
@@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644
  
  #include <netinet/in.h>
 diff --git a/shared/nm-default.h b/shared/nm-default.h
-index 54e9916..26e9f4e 100644
+index ace6ede..25357da 100644
 --- a/shared/nm-default.h
 +++ b/shared/nm-default.h
-@@ -211,6 +211,9 @@
+@@ -182,6 +182,9 @@
  #endif
  
  #include <stdlib.h>
@@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644
  /*****************************************************************************/
  
 diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index bd4fbcc..f70b309 100644
+index 3bbc975..4e8a3f6 100644
 --- a/src/devices/nm-device.c
 +++ b/src/devices/nm-device.c
-@@ -24,6 +24,7 @@
+@@ -9,6 +9,7 @@
  #include "nm-device.h"
  
  #include <netinet/in.h>
@@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644
  #include <unistd.h>
  #include <sys/ioctl.h>
  #include <signal.h>
-@@ -32,7 +33,6 @@
+@@ -17,7 +18,6 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644
  #include <linux/pkt_sched.h>
  
 diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index d4b0115..22a3a90 100644
+index 7abe4df..9f53147 100644
 --- a/src/platform/nm-linux-platform.c
 +++ b/src/platform/nm-linux-platform.c
-@@ -28,7 +28,6 @@
+@@ -14,7 +14,6 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644
  #include <linux/if_bridge.h>
  #include <linux/if_link.h>
  #include <linux/if_tun.h>
--- 
-2.17.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
similarity index 77%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
index 27508c4d9..b26a5ce06 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
@@ -2,9 +2,9 @@ SUMMARY = "NetworkManager"
 HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager"
 SECTION = "net/misc"
 
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
-                    file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
 "
 
 DEPENDS = " \
@@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \
     file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
     file://musl/0002-Fix-build-with-musl.patch \
 "
-SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
-SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
+SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284"
+SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
@@ -65,7 +65,7 @@ PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
     --without-systemdsystemunitdir, \
 "
-PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit"
+PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
 PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
 # consolekit is not picked by shlibs, so add it to RDEPENDS too
 PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
@@ -75,33 +75,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
 PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
 PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
-PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib"
 PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
 PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant"
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
 PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
+PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no"
 
-PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
+PACKAGES =+ " \
   ${PN}-nmtui ${PN}-nmtui-doc \
-  ${PN}-adsl \
+  ${PN}-adsl ${PN}-cloud-setup \
 "
 
-FILES_libnmutil += "${libdir}/libnm-util.so.*"
-FILES_libnmglib += "${libdir}/libnm-glib.so.*"
-FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
+SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup"
 
 FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so"
 
+FILES_${PN}-cloud-setup = " \
+    ${libexecdir}/nm-cloud-setup \
+    ${systemd_system_unitdir}/nm-cloud-setup.service \
+    ${systemd_system_unitdir}/nm-cloud-setup.timer \
+    ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \
+    ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \
+"
+ALLOW_EMPTY_${PN}-cloud-setup = "1"
+SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}"
+
 FILES_${PN} += " \
     ${libexecdir} \
     ${libdir}/NetworkManager/${PV}/*.so \
-    ${nonarch_libdir}/NetworkManager/VPN \
+    ${libdir}/NetworkManager \
     ${nonarch_libdir}/NetworkManager/conf.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \
+    ${nonarch_libdir}/NetworkManager/VPN \
+    ${nonarch_libdir}/NetworkManager/system-connections \
     ${datadir}/polkit-1 \
     ${datadir}/dbus-1 \
     ${nonarch_base_libdir}/udev/* \
-    ${systemd_unitdir}/system \
+    ${systemd_system_unitdir} \
     ${libdir}/pppd \
 "
 
-- 
2.24.1


From raj.khem at gmail.com  Thu Mar  5 21:21:48 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Thu,  5 Mar 2020 13:21:48 -0800
Subject: [oe] [meta-oe][PATCH] tcsh: Update SRC_URI
Message-ID: <20200305212148.1210753-1-raj.khem@gmail.com>

the ftp site seems to be intermittent

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb
index 79ab67ab75..b30c3434e4 100644
--- a/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb
+++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5"
 SECTION = "base"
 DEPENDS = "ncurses virtual/crypt gettext-native"
 SRC_URI = " \
-    http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${BP}.tar.gz \
+    https://astron.com/pub/${BPN}/${BP}.tar.gz \
     file://0001-Enable-system-malloc-on-all-linux.patch \
     file://0002-Add-debian-csh-scripts.patch \
 "
-- 
2.25.1


From jpuhlman at mvista.com  Thu Mar  5 22:39:31 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Thu,  5 Mar 2020 14:39:31 -0800
Subject: [oe] [meta-networking][PATCH 1/7] quagga: fix reproducibily issue.
Message-ID: <20200305223937.12418-1-jpuhlman@mvista.com>

From: Jeremy Puhlman <jpuhlman at mvista.com>

version.h contains the options passed to configure, which includes
the path to the recipe-sysroot on the build host.

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta-networking/recipes-protocols/quagga/quagga.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 310bc7eef..3494a4398 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -106,6 +106,7 @@ do_install () {
     sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
     sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
     sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
+    sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
 
     # For PAM
     for feature in ${DISTRO_FEATURES}; do
-- 
2.20.1


From jpuhlman at mvista.com  Thu Mar  5 22:39:32 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Thu,  5 Mar 2020 14:39:32 -0800
Subject: [oe] [meta-networking][PATCH 2/7] quagga: make version.h a multilib
	header
In-Reply-To: <20200305223937.12418-1-jpuhlman@mvista.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
Message-ID: <20200305223937.12418-2-jpuhlman@mvista.com>

From: Jeremy Puhlman <jpuhlman at mvista.com>

version.h contains the configure options passed during the build
which differs between multilibs

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta-networking/recipes-protocols/quagga/quagga.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 3494a4398..134a33d47 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -40,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
 PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap"
 PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam"
 
-inherit autotools update-rc.d useradd systemd pkgconfig
+inherit autotools update-rc.d useradd systemd pkgconfig multilib_header
 
 SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd"
 SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service"
@@ -108,6 +108,8 @@ do_install () {
     sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
     sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
 
+    oe_multilib_header quagga/version.h
+
     # For PAM
     for feature in ${DISTRO_FEATURES}; do
         if [ "$feature" = "pam" ]; then
-- 
2.20.1


From jpuhlman at mvista.com  Thu Mar  5 22:39:34 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Thu,  5 Mar 2020 14:39:34 -0800
Subject: [oe] [meta-networking][PATCH 4/7] net-snmp: fix reproducibilty
	issues in net-snmp-config
In-Reply-To: <20200305223937.12418-1-jpuhlman@mvista.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
Message-ID: <20200305223937.12418-4-jpuhlman@mvista.com>

From: Jeremy Puhlman <jpuhlman at mvista.com>

Both STAGING_HOST_DIR and -fmacro-prefix-map path to WORKDIR were
encoded in the config.

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
index 317350e94..91c50c4e3 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
@@ -124,11 +124,13 @@ do_install_append() {
         -i ${D}${bindir}/net-snmp-create-v3-user
     sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g' \
         -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
+        -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
         -e 's@[^ ]*--sysroot=[^ "]*@@g' \
         -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \
         -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \
         -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \
         -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \
+        -e 's@${STAGING_DIR_HOST}@@g' \
         -i ${D}${bindir}/net-snmp-config
 
     if [ "${HAS_PERL}" = "1" ]; then
-- 
2.20.1


From jpuhlman at mvista.com  Thu Mar  5 22:39:33 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Thu,  5 Mar 2020 14:39:33 -0800
Subject: [oe] [meta-networking][PATCH 3/7] libdnet: make dnet-config a
	multilib_script
In-Reply-To: <20200305223937.12418-1-jpuhlman@mvista.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
Message-ID: <20200305223937.12418-3-jpuhlman@mvista.com>

From: Jeremy Puhlman <jpuhlman at mvista.com>

Script encodes library paths.

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
index 5b6e45c7b..5b27cfe15 100644
--- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
+++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
@@ -11,8 +11,10 @@ UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools multilib_script
 
 acpaths = "-I ./config/"
 
 BBCLASSEXTEND = "native"
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config"
-- 
2.20.1


From jpuhlman at mvista.com  Thu Mar  5 22:39:35 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Thu,  5 Mar 2020 14:39:35 -0800
Subject: [oe] [meta-networking][PATCH 5/7] net-snmp: multilib fixes
In-Reply-To: <20200305223937.12418-1-jpuhlman@mvista.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
Message-ID: <20200305223937.12418-5-jpuhlman@mvista.com>

From: Jeremy Puhlman <jpuhlman at mvista.com>

net-snmp/net-snmp-config.h:
- encodes type sizes
- encodes pathing into the libdir
net-snmp-config:
- encodes build configuration data and lib pathing.

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
index 91c50c4e3..762dec48c 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
@@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/"
 UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"
 
-inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest
+inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest multilib_script multilib_header
 
 EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'"
 
@@ -138,6 +138,8 @@ do_install_append() {
             -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \
             -i ${D}${bindir}/net-snmp-config
     fi
+
+    oe_multilib_header net-snmp/net-snmp-config.h
 }
 
 do_install_ptest() {
@@ -270,3 +272,5 @@ RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
 RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
 
 LEAD_SONAME = "libnetsnmp.so"
+
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/net-snmp-config"
-- 
2.20.1


From jpuhlman at mvista.com  Thu Mar  5 22:39:36 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Thu,  5 Mar 2020 14:39:36 -0800
Subject: [oe] [meta-networking][PATCH 6/7] proftpd: remove macro-prefix-map
	from prxs
In-Reply-To: <20200305223937.12418-1-jpuhlman@mvista.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
Message-ID: <20200305223937.12418-6-jpuhlman@mvista.com>

From: Jeremy Puhlman <jpuhlman at mvista.com>

macro-prefix-map points to build WORKDIR which will
cause reproducibilty failures.

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
index 409947265..a080bec81 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
@@ -110,6 +110,7 @@ do_install () {
     sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \
         -e 's|${STAGING_DIR_NATIVE}||g' \
         -e 's|-fdebug-prefix-map=[^ ]*||g' \
+        -e 's|-fmacro-prefix-map=[^ ]*||g' \
         -i ${D}/${bindir}/prxs
 
     # ftpmail perl script, which reads the proftpd log file and sends
-- 
2.20.1


From jpuhlman at mvista.com  Thu Mar  5 22:39:37 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Thu,  5 Mar 2020 14:39:37 -0800
Subject: [oe] [meta-networking][PATCH 7/7] proftpd: make prxs a mulitlib
	script
In-Reply-To: <20200305223937.12418-1-jpuhlman@mvista.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
Message-ID: <20200305223937.12418-7-jpuhlman@mvista.com>

From: Jeremy Puhlman <jpuhlman at mvista.com>

Script encodes compiler settings and compiler name.

my $compiler = q(x86_64-poky-linux-gcc  -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 );

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
index a080bec81..d5bbdd374 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
@@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
 iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b"
 SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf"
 
-inherit autotools-brokensep useradd update-rc.d systemd
+inherit autotools-brokensep useradd update-rc.d systemd multilib_script
 
 PACKAGECONFIG ??= "shadow \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
@@ -134,6 +134,8 @@ GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}"
 USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \
                        --shell /bin/false ${FTPUSER}"
 
+MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs"
+
 FILES_${PN} += "/home/${FTPUSER}"
 
 RDEPENDS_${PN} += "perl"
-- 
2.20.1


From changqing.li at windriver.com  Fri Mar  6 04:34:35 2020
From: changqing.li at windriver.com (changqing.li at windriver.com)
Date: Fri, 6 Mar 2020 12:34:35 +0800
Subject: [oe] [meta-oe][PATCH] python3-pygobject: remove this recipe
Message-ID: <1583469275-310604-1-git-send-email-changqing.li@windriver.com>

From: Changqing Li <changqing.li at windriver.com>

python3-pygobject already in oe-core, previously,
we have python-pygobject in meta-oe, but recently, in order
to drop python2, we transfer python-pygobject to
python3-pygobject, so duplicated with oe-core, meantime,
this will cause test_signature failure when do yocto-check-layer
for layer meta-oe.

Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
 .../0001-python-pyobject-fix-install-dir.patch     | 121 ---------------------
 .../python/python3-pygobject_3.34.0.bb             |  33 ------
 2 files changed, 154 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch
 delete mode 100644 meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb

diff --git a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch b/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch
deleted file mode 100644
index 848cda5..0000000
--- a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 8b4648d5bc50cb1c14961ed38bf97d5a693f5237 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li at windriver.com>
-Date: Mon, 24 Jun 2019 14:51:52 +0800
-Subject: [PATCH] python-pyobject: fix the wrong install dir for python2
-
-* after upgrade to 3.32.1, pygobject switch to build with meson, and
-  default python option is python3, switch to python2
-
-* default install dir get by python.install_sources and 
-python.get_install_dir is get from python's sysconfig info,
-not like python3, for python2, the install dir include the basedir of
-recipe-sysroot-native, add stagedir option for user to config
-correct install dir.
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Changqing Li <changqing.li at windriver.com>
----
- gi/meson.build            | 7 +++----
- gi/overrides/meson.build  | 4 ++--
- gi/repository/meson.build | 4 ++--
- meson.build               | 4 +++-
- meson_options.txt         | 1 +
- pygtkcompat/meson.build   | 4 ++--
- 6 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/gi/meson.build b/gi/meson.build
-index c1afd68..249c23d 100644
---- a/gi/meson.build
-+++ b/gi/meson.build
-@@ -60,9 +60,8 @@ python_sources = [
-   'types.py',
- ]
- 
--python.install_sources(python_sources,
--  pure : false,
--  subdir : 'gi'
-+install_data(python_sources,
-+  install_dir: join_paths(stagedir, 'gi')
- )
- 
- # https://github.com/mesonbuild/meson/issues/4117
-@@ -76,7 +75,7 @@ giext = python.extension_module('_gi', sources,
-   dependencies : [python_ext_dep, glib_dep, gi_dep, ffi_dep],
-   include_directories: include_directories('..'),
-   install: true,
--  subdir : 'gi',
-+  install_dir: join_paths(stagedir, 'gi'),
-   c_args: pyext_c_args + main_c_args
- )
-
-diff --git a/gi/overrides/meson.build b/gi/overrides/meson.build
-index 6ff073f..964fef1 100644
---- a/gi/overrides/meson.build
-+++ b/gi/overrides/meson.build
-@@ -10,6 +10,6 @@ python_sources = [
-   'keysyms.py',
-   '__init__.py']
- 
--python.install_sources(python_sources,
--  subdir : join_paths('gi', 'overrides')
-+install_data(python_sources,
-+  install_dir: join_paths(stagedir, 'gi', 'overrides')
- )
-diff --git a/gi/repository/meson.build b/gi/repository/meson.build
-index fdc136b..fc88adf 100644
---- a/gi/repository/meson.build
-+++ b/gi/repository/meson.build
-@@ -1,5 +1,5 @@
- python_sources = ['__init__.py']
- 
--python.install_sources(python_sources,
--  subdir : join_paths('gi', 'repository')
-+install_data(python_sources,
-+  install_dir: join_paths(stagedir, 'gi', 'repository')
- )
-diff --git a/meson.build b/meson.build
-index d27a005..ecd55d5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -165,12 +165,14 @@ else
-   py_version = pygobject_version
- endif
- 
-+stagedir = get_option('stagedir')
-+
- pkginfo_conf = configuration_data()
- pkginfo_conf.set('VERSION', py_version)
- configure_file(input : 'PKG-INFO.in',
-   output : 'PyGObject- at 0@.egg-info'.format(py_version),
-   configuration : pkginfo_conf,
--  install_dir : python.get_install_dir(pure : false))
-+  install_dir : stagedir)
- 
- subdir('gi')
- subdir('pygtkcompat')
-diff --git a/meson_options.txt b/meson_options.txt
-index 5dd4cbc..21def16 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('python', type : 'string', value : 'python3')
- option('pycairo', type : 'boolean', value : true, description : 'build with pycairo integration')
- option('tests', type : 'boolean', value : true, description : 'build unit tests')
-+option('stagedir', type : 'string', value : '')
-diff --git a/pygtkcompat/meson.build b/pygtkcompat/meson.build
-index 9e43c44..ef3322d 100644
---- a/pygtkcompat/meson.build
-+++ b/pygtkcompat/meson.build
-@@ -3,6 +3,6 @@ python_sources = [
-   'generictreemodel.py',
-   'pygtkcompat.py']
- 
--python.install_sources(python_sources,
--  subdir : 'pygtkcompat'
-+install_data(python_sources,
-+  install_dir: join_paths(stagedir, 'pygtkcompat')
- )
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb b/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb
deleted file mode 100644
index e06f4dc..0000000
--- a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Python GObject bindings"
-HOMEPAGE = "http://www.pygtk.org/"
-SECTION = "devel/python"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
-
-GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase gobject-introspection distutils3-base upstream-version-is-even
-
-DEPENDS += "python3 glib-2.0"
-
-SRCNAME = "pygobject"
-SRC_URI = " \
-    http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \
-"
-
-SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6"
-SRC_URI[sha256sum] = "87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-UNKNOWN_CONFIGURE_WHITELIST = "introspection"
-
-PACKAGECONFIG ??= ""
-
-PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python-pycairo, python-pycairo"
-PACKAGECONFIG[tests] = "-Dtests=true, -Dtests=false, , "
-
-EXTRA_OEMESON_append = " -Dpython=python3"
-
-BBCLASSEXTEND = "native"
-RDEPENDS_${PN} = "python3-pkgutil"
-RDEPENDS_${PN}_class-native = ""
-- 
2.7.4


From changqing.li at windriver.com  Fri Mar  6 05:37:56 2020
From: changqing.li at windriver.com (changqing.li at windriver.com)
Date: Fri, 6 Mar 2020 13:37:56 +0800
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to LAYERDEPENDS
Message-ID: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>

From: Changqing Li <changqing.li at windriver.com>

yocto-check-layer/test_world failed since error:
ERROR: test_world (common.CommonCheckLayer)
ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
DEPENDS on or otherwise requires it). Close matches:
  python3-numpy-native
  python3-pycairo-native
  python3-rpm-native
ERROR: Required build target 'meta-world-pkgdata' has no buildable
providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
'mozjs', 'python3-pytoml-native']

mozjs depend on recipe under meta-python, but meta-python
isn't in LAYERDEPENDS, so error occurred. Fix by add
it into LAYERDEPENDS.

Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
 meta-oe/conf/layer.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index c537736..0ce0ad2 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
 # cause compatibility issues with other layers
 LAYERVERSION_openembedded-layer = "1"
 
-LAYERDEPENDS_openembedded-layer = "core"
+LAYERDEPENDS_openembedded-layer = " \
+    core \
+    meta-python \
+"
 
 LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
 
-- 
2.7.4


From martin.jansa at gmail.com  Fri Mar  6 07:54:37 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Fri, 6 Mar 2020 08:54:37 +0100
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
Message-ID: <CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>

Can we fix mozjs instead?

On Fri, Mar 6, 2020 at 6:38 AM <changqing.li at windriver.com> wrote:

> From: Changqing Li <changqing.li at windriver.com>
>
> yocto-check-layer/test_world failed since error:
> ERROR: test_world (common.CommonCheckLayer)
> ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
> /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
> DEPENDS on or otherwise requires it). Close matches:
>   python3-numpy-native
>   python3-pycairo-native
>   python3-rpm-native
> ERROR: Required build target 'meta-world-pkgdata' has no buildable
> providers.
> Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
> 'mozjs', 'python3-pytoml-native']
>
> mozjs depend on recipe under meta-python, but meta-python
> isn't in LAYERDEPENDS, so error occurred. Fix by add
> it into LAYERDEPENDS.
>
> Signed-off-by: Changqing Li <changqing.li at windriver.com>
> ---
>  meta-oe/conf/layer.conf | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
> index c537736..0ce0ad2 100644
> --- a/meta-oe/conf/layer.conf
> +++ b/meta-oe/conf/layer.conf
> @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
>  # cause compatibility issues with other layers
>  LAYERVERSION_openembedded-layer = "1"
>
> -LAYERDEPENDS_openembedded-layer = "core"
> +LAYERDEPENDS_openembedded-layer = " \
> +    core \
> +    meta-python \
> +"
>
>  LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From changqing.li at windriver.com  Fri Mar  6 08:18:21 2020
From: changqing.li at windriver.com (Changqing Li)
Date: Fri, 6 Mar 2020 16:18:21 +0800
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
	<CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
Message-ID: <571c8ebf-853a-a9d4-2e99-197860564d2e@windriver.com>

yes,? this fix is not right,? just find that meta-python depend on 
meta-oe,? so this will cause a loop.

I will find another solution for this.

On 3/6/20 3:54 PM, Martin Jansa wrote:
> Can we fix mozjs instead?
>
> On Fri, Mar 6, 2020 at 6:38 AM <changqing.li at windriver.com 
> <mailto:changqing.li at windriver.com>> wrote:
>
>     From: Changqing Li <changqing.li at windriver.com
>     <mailto:changqing.li at windriver.com>>
>
>     yocto-check-layer/test_world failed since error:
>     ERROR: test_world (common.CommonCheckLayer)
>     ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
>     /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
>     <http://mozjs_60.9.0.bb>
>     DEPENDS on or otherwise requires it). Close matches:
>     ? python3-numpy-native
>     ? python3-pycairo-native
>     ? python3-rpm-native
>     ERROR: Required build target 'meta-world-pkgdata' has no buildable
>     providers.
>     Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
>     'mozjs', 'python3-pytoml-native']
>
>     mozjs depend on recipe under meta-python, but meta-python
>     isn't in LAYERDEPENDS, so error occurred. Fix by add
>     it into LAYERDEPENDS.
>
>     Signed-off-by: Changqing Li <changqing.li at windriver.com
>     <mailto:changqing.li at windriver.com>>
>     ---
>     ?meta-oe/conf/layer.conf | 5 ++++-
>     ?1 file changed, 4 insertions(+), 1 deletion(-)
>
>     diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
>     index c537736..0ce0ad2 100644
>     --- a/meta-oe/conf/layer.conf
>     +++ b/meta-oe/conf/layer.conf
>     @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
>     ?# cause compatibility issues with other layers
>     ?LAYERVERSION_openembedded-layer = "1"
>
>     -LAYERDEPENDS_openembedded-layer = "core"
>     +LAYERDEPENDS_openembedded-layer = " \
>     +? ? core \
>     +? ? meta-python \
>     +"
>
>     ?LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
>
>     -- 
>     2.7.4
>
>     -- 
>     _______________________________________________
>     Openembedded-devel mailing list
>     Openembedded-devel at lists.openembedded.org
>     <mailto:Openembedded-devel at lists.openembedded.org>
>     http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From raj.khem at gmail.com  Fri Mar  6 16:12:51 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Fri, 6 Mar 2020 08:12:51 -0800
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
	<CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
Message-ID: <CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>

On Thu, Mar 5, 2020 at 11:55 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>
> Can we fix mozjs instead?

perhaps thats better fix, maybe it can made optional via packageconfig ?
or marked incompatible if meta-python is not included
>
> On Fri, Mar 6, 2020 at 6:38 AM <changqing.li at windriver.com> wrote:
>
> > From: Changqing Li <changqing.li at windriver.com>
> >
> > yocto-check-layer/test_world failed since error:
> > ERROR: test_world (common.CommonCheckLayer)
> > ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
> > /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
> > DEPENDS on or otherwise requires it). Close matches:
> >   python3-numpy-native
> >   python3-pycairo-native
> >   python3-rpm-native
> > ERROR: Required build target 'meta-world-pkgdata' has no buildable
> > providers.
> > Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
> > 'mozjs', 'python3-pytoml-native']
> >
> > mozjs depend on recipe under meta-python, but meta-python
> > isn't in LAYERDEPENDS, so error occurred. Fix by add
> > it into LAYERDEPENDS.
> >
> > Signed-off-by: Changqing Li <changqing.li at windriver.com>
> > ---
> >  meta-oe/conf/layer.conf | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
> > index c537736..0ce0ad2 100644
> > --- a/meta-oe/conf/layer.conf
> > +++ b/meta-oe/conf/layer.conf
> > @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
> >  # cause compatibility issues with other layers
> >  LAYERVERSION_openembedded-layer = "1"
> >
> > -LAYERDEPENDS_openembedded-layer = "core"
> > +LAYERDEPENDS_openembedded-layer = " \
> > +    core \
> > +    meta-python \
> > +"
> >
> >  LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
> >
> > --
> > 2.7.4
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From raj.khem at gmail.com  Fri Mar  6 17:36:23 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Fri, 6 Mar 2020 09:36:23 -0800
Subject: [oe] [meta-networking][PATCH v2] networkmanager: Upgrade 1.18.4
 -> 1.22.8
In-Reply-To: <20200305211044.799921-1-adrian.freihofer@siemens.com>
References: <20200305211044.799921-1-adrian.freihofer@siemens.com>
Message-ID: <CAMKF1srzK6Xo-mZ8MY7uXS9=rPVbBBHV+hf+83_fGvW9S4iE9A@mail.gmail.com>

Hi Adrian

There is build failure on musl

https://errors.yoctoproject.org/Errors/Details/393810/

It seems to be using drand48_r which is non-portable. We might need
something like
https://github.com/tpm2-software/tpm2-abrmd/pull/503/commits/4d652c679ab687e0253a65c2677f73661af76725

On Thu, Mar 5, 2020 at 1:11 PM Adrian Freihofer
<adrian.freihofer at gmail.com> wrote:
>
> - rebased patches
> - Option --enable-polkit-agent is not available with current NM, removed
> - Option --with-libnm-glib is not available with current NM, removed
> - New package NM-cloud-setup for new experimental cloud setup feature
> - NM tries to re-license from GPL to LGPL, added LGPL to LICENSES
> - Removed empty packages libnmutil libnmglib libnmglib-vpn
>
> Signed-off-by: Adrian Freihofer <adrian.freihofer at siemens.com>
> ---
>  ...e.ac-Fix-pkgconfig-sysroot-locations.patch |  6 +--
>  ...ttings-settings-property-documentati.patch | 23 +++++-----
>  ...Fix-build-with-musl-systemd-specific.patch | 26 ++++++------
>  .../musl/0002-Fix-build-with-musl.patch       | 30 +++++++------
>  ...ger_1.18.4.bb => networkmanager_1.22.8.bb} | 42 ++++++++++++-------
>  5 files changed, 70 insertions(+), 57 deletions(-)
>  rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.4.bb => networkmanager_1.22.8.bb} (77%)
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> index 302c0292b..19c8c7481 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> @@ -1,4 +1,4 @@
> -From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
> +From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001
>  From: Pablo Saavedra <psaavedra at igalia.com>
>  Date: Tue, 13 Mar 2018 17:36:20 +0100
>  Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
> @@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/configure.ac b/configure.ac
> -index 967eac0..b914219 100644
> +index 65ceffb..ad4b0fc 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
> +@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then
>         AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
>
>         AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
> index 5581dd3aa..446637b27 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
> @@ -1,4 +1,4 @@
> -From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001
> +From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
>  Date: Thu, 22 Mar 2018 11:08:30 +0100
>  Subject: [PATCH] Do not create settings settings/property documentation
> @@ -6,23 +6,29 @@ MIME-Version: 1.0
>  Content-Type: text/plain; charset=UTF-8
>  Content-Transfer-Encoding: 8bit
>
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
>  It was tried to get this work but gi / GirRepository could not be found by
>  python. Anyway it is not necessary for us to have the settings/property docs.
>
>  Upstream-Status: Inappropriate [OE specific]
>
>  Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> +
>  ---
>   Makefile.am  | 11 -----------
>   configure.ac |  5 -----
>   2 files changed, 16 deletions(-)
>
>  diff --git a/Makefile.am b/Makefile.am
> -index b180466..1ab4658 100644
> +index d5cbcf5..2a1819a 100644
>  --- a/Makefile.am
>  +++ b/Makefile.am
> -@@ -1298,9 +1298,7 @@ EXTRA_DIST += \
> - if HAVE_INTROSPECTION
> +@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
> + INTROSPECTION_GIRS += libnm/NM-1.0.gir
>
>   libnm_noinst_data = \
>  -      libnm/nm-property-docs.xml \
> @@ -31,7 +37,7 @@ index b180466..1ab4658 100644
>         libnm/nm-settings-keyfile-docs.xml \
>         libnm/nm-settings-ifcfg-rh-docs.xml
>
> -@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
> +@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
>   $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
>
>   clients_common_settings_doc_h = clients/common/settings-docs.h
> @@ -51,10 +57,10 @@ index b180466..1ab4658 100644
>         $(clients_common_settings_doc_h) \
>         $(clients_common_settings_doc_h).in
>  diff --git a/configure.ac b/configure.ac
> -index b914219..872c292 100644
> +index ad4b0fc..0092092 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0)
> +@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
>   # check if we can build setting property documentation
>   build_docs=no
>   if test -n "$INTROSPECTION_MAKEFILE"; then
> @@ -66,6 +72,3 @@ index b914219..872c292 100644
>         AC_PATH_PROG(PERL, perl)
>         if test -z "$PERL"; then
>                 AC_MSG_ERROR([--enable-introspection requires perl])
> ---
> -2.20.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
> index af6f938ce..c23fc308f 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
> @@ -1,4 +1,4 @@
> -From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001
> +From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
>  Date: Tue, 2 Apr 2019 01:34:35 +0200
>  Subject: [PATCH] Fix build with musl - systemd specific
> @@ -12,6 +12,7 @@ for musl.
>  Upstream-Status: Pending
>
>  Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> +
>  ---
>   shared/systemd/src/basic/in-addr-util.c |  1 +
>   shared/systemd/src/basic/process-util.c |  9 +++++++++
> @@ -22,10 +23,10 @@ Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
>   6 files changed, 27 insertions(+), 23 deletions(-)
>
>  diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
> -index 5899f62..0adb248 100644
> +index 91d687c..8388304 100644
>  --- a/shared/systemd/src/basic/in-addr-util.c
>  +++ b/shared/systemd/src/basic/in-addr-util.c
> -@@ -14,6 +14,7 @@
> +@@ -15,6 +15,7 @@
>   #include "in-addr-util.h"
>   #include "macro.h"
>   #include "parse-util.h"
> @@ -34,10 +35,10 @@ index 5899f62..0adb248 100644
>   #include "strxcpyx.h"
>   #include "util.h"
>  diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
> -index 7431be3..189060a 100644
> +index 1456167..42f51a0 100644
>  --- a/shared/systemd/src/basic/process-util.c
>  +++ b/shared/systemd/src/basic/process-util.c
> -@@ -21,6 +21,9 @@
> +@@ -17,6 +17,9 @@
>   #include <sys/wait.h>
>   #include <syslog.h>
>   #include <unistd.h>
> @@ -47,7 +48,7 @@ index 7431be3..189060a 100644
>   #if 0 /* NM_IGNORED */
>   #if HAVE_VALGRIND_VALGRIND_H
>   #include <valgrind/valgrind.h>
> -@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) {
> +@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
>           cached_pid = CACHED_PID_UNSET;
>   }
>
> @@ -61,7 +62,7 @@ index 7431be3..189060a 100644
>
>   pid_t getpid_cached(void) {
>           static bool installed = false;
> -@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) {
> +@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) {
>                            * only half-documented (glibc doesn't document it but LSB does ? though only superficially)
>                            * we'll check for errors only in the most generic fashion possible. */
>
> @@ -74,10 +75,10 @@ index 7431be3..189060a 100644
>                                   cached_pid = CACHED_PID_UNSET;
>                                   return new_pid;
>  diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
> -index 15443f1..4807198 100644
> +index a0886e0..da47d14 100644
>  --- a/shared/systemd/src/basic/socket-util.h
>  +++ b/shared/systemd/src/basic/socket-util.h
> -@@ -13,6 +13,12 @@
> +@@ -14,6 +14,12 @@
>   #include <sys/types.h>
>   #include <sys/un.h>
>
> @@ -147,10 +148,10 @@ index c3b9448..e80a938 100644
>   #include <stdio.h>
>   #include <sys/types.h>
>  diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
> -index b23f4c8..8f2f6e0 100644
> +index 04cc82b..2cf589a 100644
>  --- a/shared/systemd/src/basic/string-util.h
>  +++ b/shared/systemd/src/basic/string-util.h
> -@@ -27,6 +27,11 @@
> +@@ -26,6 +26,11 @@
>   #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
>   #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
>
> @@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644
>   int strcmp_ptr(const char *a, const char *b) _pure_;
>
>   static inline bool streq_ptr(const char *a, const char *b) {
> ---
> -2.17.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
> index e0973af1e..196a3358d 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
> @@ -1,7 +1,7 @@
> -From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001
> +From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
>  Date: Mon, 8 Apr 2019 23:10:43 +0200
> -Subject: [PATCH 2/2] Fix build with musl
> +Subject: [PATCH] Fix build with musl
>  MIME-Version: 1.0
>  Content-Type: text/plain; charset=UTF-8
>  Content-Transfer-Encoding: 8bit
> @@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace' [2] (search for
>  Upstream-Status: Pending
>
>  Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> +
>  ---
>   clients/tui/nmt-device-entry.c   | 1 -
>   libnm-core/nm-utils.h            | 4 ++++
> @@ -41,10 +42,10 @@ Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
>   5 files changed, 8 insertions(+), 3 deletions(-)
>
>  diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
> -index 43fbbc1..3eae286 100644
> +index 4ab5932..915248c 100644
>  --- a/clients/tui/nmt-device-entry.c
>  +++ b/clients/tui/nmt-device-entry.c
> -@@ -39,7 +39,6 @@
> +@@ -26,7 +26,6 @@
>   #include "nmt-device-entry.h"
>
>   #include <sys/socket.h>
> @@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644
>   #include "nmtui.h"
>
>  diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
> -index 2b5baba..f7abab6 100644
> +index 5418a1e..f492da6 100644
>  --- a/libnm-core/nm-utils.h
>  +++ b/libnm-core/nm-utils.h
> -@@ -25,6 +25,10 @@
> +@@ -10,6 +10,10 @@
>   #error "Only <NetworkManager.h> can be included directly."
>   #endif
>
> @@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644
>
>   #include <netinet/in.h>
>  diff --git a/shared/nm-default.h b/shared/nm-default.h
> -index 54e9916..26e9f4e 100644
> +index ace6ede..25357da 100644
>  --- a/shared/nm-default.h
>  +++ b/shared/nm-default.h
> -@@ -211,6 +211,9 @@
> +@@ -182,6 +182,9 @@
>   #endif
>
>   #include <stdlib.h>
> @@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644
>   /*****************************************************************************/
>
>  diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
> -index bd4fbcc..f70b309 100644
> +index 3bbc975..4e8a3f6 100644
>  --- a/src/devices/nm-device.c
>  +++ b/src/devices/nm-device.c
> -@@ -24,6 +24,7 @@
> +@@ -9,6 +9,7 @@
>   #include "nm-device.h"
>
>   #include <netinet/in.h>
> @@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644
>   #include <unistd.h>
>   #include <sys/ioctl.h>
>   #include <signal.h>
> -@@ -32,7 +33,6 @@
> +@@ -17,7 +18,6 @@
>   #include <arpa/inet.h>
>   #include <fcntl.h>
>   #include <linux/if_addr.h>
> @@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644
>   #include <linux/pkt_sched.h>
>
>  diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
> -index d4b0115..22a3a90 100644
> +index 7abe4df..9f53147 100644
>  --- a/src/platform/nm-linux-platform.c
>  +++ b/src/platform/nm-linux-platform.c
> -@@ -28,7 +28,6 @@
> +@@ -14,7 +14,6 @@
>   #include <libudev.h>
>   #include <linux/fib_rules.h>
>   #include <linux/ip.h>
> @@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644
>   #include <linux/if_bridge.h>
>   #include <linux/if_link.h>
>   #include <linux/if_tun.h>
> ---
> -2.17.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
> similarity index 77%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
> index 27508c4d9..b26a5ce06 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
> @@ -2,9 +2,9 @@ SUMMARY = "NetworkManager"
>  HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager"
>  SECTION = "net/misc"
>
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
> -                    file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
> +LICENSE = "GPLv2+ & LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +                    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
>  "
>
>  DEPENDS = " \
> @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \
>      file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
>      file://musl/0002-Fix-build-with-musl.patch \
>  "
> -SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
> -SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
> +SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284"
> +SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f"
>
>  S = "${WORKDIR}/NetworkManager-${PV}"
>
> @@ -65,7 +65,7 @@ PACKAGECONFIG[systemd] = " \
>      --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
>      --without-systemdsystemunitdir, \
>  "
> -PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit"
> +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
>  PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
>  # consolekit is not picked by shlibs, so add it to RDEPENDS too
>  PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
> @@ -75,33 +75,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
>  PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
>  PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
>  PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
> -PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib"
>  PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
>  PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
>  PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant"
>  PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
>  PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
> +PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no"
>
> -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
> +PACKAGES =+ " \
>    ${PN}-nmtui ${PN}-nmtui-doc \
> -  ${PN}-adsl \
> +  ${PN}-adsl ${PN}-cloud-setup \
>  "
>
> -FILES_libnmutil += "${libdir}/libnm-util.so.*"
> -FILES_libnmglib += "${libdir}/libnm-glib.so.*"
> -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
> +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup"
>
>  FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so"
>
> +FILES_${PN}-cloud-setup = " \
> +    ${libexecdir}/nm-cloud-setup \
> +    ${systemd_system_unitdir}/nm-cloud-setup.service \
> +    ${systemd_system_unitdir}/nm-cloud-setup.timer \
> +    ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \
> +    ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \
> +"
> +ALLOW_EMPTY_${PN}-cloud-setup = "1"
> +SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}"
> +
>  FILES_${PN} += " \
>      ${libexecdir} \
>      ${libdir}/NetworkManager/${PV}/*.so \
> -    ${nonarch_libdir}/NetworkManager/VPN \
> +    ${libdir}/NetworkManager \
>      ${nonarch_libdir}/NetworkManager/conf.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \
> +    ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \
> +    ${nonarch_libdir}/NetworkManager/VPN \
> +    ${nonarch_libdir}/NetworkManager/system-connections \
>      ${datadir}/polkit-1 \
>      ${datadir}/dbus-1 \
>      ${nonarch_base_libdir}/udev/* \
> -    ${systemd_unitdir}/system \
> +    ${systemd_system_unitdir} \
>      ${libdir}/pppd \
>  "
>
> --
> 2.24.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From martin.jansa at gmail.com  Fri Mar  6 17:36:46 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Fri,  6 Mar 2020 18:36:46 +0100
Subject: [oe] [meta-oe][PATCH] daemontools: remove native BBCLASSEXTEND
Message-ID: <20200306173646.29207-1-Martin.Jansa@gmail.com>

* it was used only to provide chkshsgr which is now replaced with no-op call
  since
  commit 50d526d06a742fa69ff698d7c2eefffb56e13afa
  Author: Khem Raj <raj.khem at gmail.com>
  Date:   Tue Jan 28 11:28:52 2020 -0800

    daemontools: Disable the chkshsgr tests

    Running the chkhsgr test during cross compile fails

    ./chkshsgr || ( cat warn-shsgr; exit 1 )
    Oops. Your getgroups() returned 0, and setgroups() failed; this means
    that I can't reliably do my shsgr test. Please either ``make'' as root
    or ``make'' while you're in one or more supplementary groups.

    All OE based targets have working getgroups()/setgroups()
    implementation, so its a safe assumption and therefore make the test
    to be a dummy

* the native chkshsgr from daemontools-native was actually being
  called only because of this chunk of cross-compile.patch:
  -       ./chkshsgr || ( cat warn-shsgr; exit 1 )
  +       chkshsgr || ( cat warn-shsgr; exit 1 )
  but all chkshsgr does is:
    short x[4];
    x[0] = x[1] = 0;
    if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
    _exit(0);
  which running on host system, doesn't say anything useful about the
  cross compile target, so it's easier to just remove the call in
  cross-compile.patch and simplify all this nonsense

* I came across this because daemontools-native was failing for me
  in "bitbake world" with zeus, which might be the same case as what
  Khem was seeing - just the final commit message doesn't reflect that

* daemontools-native fails to build without the above commit in
  zeus as well, when building inside docker container where my
  build user is in fewer groups (just 1) so the
  getgroups(1,x) call doesn't fail, but on more average OS the
  user will be in more than 4 groups and
  getgroups(1,x) would fail with errno 22 EINVAL
    - so setgroups isn't even called to return 1 error when chkshsgr is called
  http://man7.org/linux/man-pages/man2/setgroups.2.html
    If the calling process is a member of more than size
    supplementary groups, then an error results.
  if I increase the size of x enough for x to hold all groups, then setgroups
  will fail with errno 1 EPERM, which is the same error as shown
  under docker container where getgroups doesn't fail, because
  in both cases I'm using unprivileged user for builds

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 ...001-daemontools-native-Fix-a-warning.patch | 26 -------------------
 .../daemontools/cross-compile.patch           |  4 +--
 .../daemontools/daemontools_0.76.bb           | 24 +++++------------
 3 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch

diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch
deleted file mode 100644
index 8d9577d5ff..0000000000
--- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a43a3327ccd4b06a3bcf0c87d518a97c6b39ac02 Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui at cn.fujitsu.com>
-Date: Sat, 6 Aug 2016 02:09:53 +0900
-Subject: [PATCH] daemontools: Fix a warning
-
-To fix the warning as following:
-
-WARNING: daemontools-native-0.76-r0 do_populate_sysroot: File '/build-poky/tmp/sysroots/x86_64-linux/usr/bin/chkshsgr' from daemontools-native was already stripped, this will prevent future debugging!
-
-Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
----
- src/conf-ld | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/conf-ld b/src/conf-ld
-index 59a0de7..1d0518a 100644
---- a/src/conf-ld
-+++ b/src/conf-ld
-@@ -1,3 +1,3 @@
--gcc -s
-+gcc
- 
- This will be used to link .o files into an executable.
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch
index f164c2d10d..9c07d758ae 100644
--- a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch
+++ b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch
@@ -30,7 +30,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile
  hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \
  tryshsgr.c warn-shsgr
 -	./chkshsgr || ( cat warn-shsgr; exit 1 )
-+	chkshsgr || ( cat warn-shsgr; exit 1 )
++	echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )"
  	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
  
  haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
@@ -39,7 +39,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile
  readproctitle rts.tests setlock setuidgid softlimit supervise svc \
  svok svscan svscanboot svstat tai64n tai64nlocal
 -	env - /bin/sh rts.tests 2>&1 | cat -v > rts
-+	echo "Warning: We can not run test on cross target."
++	echo "Warning: We can not run test on cross target. - ignoring env - /bin/sh rts.tests 2>&1 | cat -v > rts"
  
  scan_ulong.o: compile scan.h scan_ulong.c
  	./compile scan_ulong.c
diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
index d674e03781..b99116da70 100644
--- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
+++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
@@ -16,24 +16,18 @@ LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c
 LICENSE = "PD"
 
 SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \
-           file://0001-error.h-include-errno.h-instead-of-extern-int.diff \
-           file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff "
-
-SRC_URI_append_class-target = "file://cross-compile.patch \
-                               file://0001-daemontools-Fix-QA-Issue.patch "
-
-SRC_URI_append_class-native = "file://0001-daemontools-native-Fix-a-warning.patch "
+    file://0001-error.h-include-errno.h-instead-of-extern-int.diff \
+    file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \
+    file://cross-compile.patch \
+    file://0001-daemontools-Fix-QA-Issue.patch \
+"
 
 SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc"
 SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f"
 
-S = "${WORKDIR}/admin/${BPN}-${PV}"
-
-DEPENDS += "daemontools-native"
-DEPENDS_class-native = ""
+S = "${WORKDIR}/admin/${BP}"
 
 do_compile() {
-    echo "int main() { return 0; }" >${S}/src/chkshsgr.c
     ./package/compile
 }
 
@@ -41,12 +35,6 @@ do_install() {
     install -d ${D}/${bindir}
 }
 
-do_install_append_class-native() {
-    install -m 755 ${S}/compile/chkshsgr ${D}/${bindir}
-}
-
 do_install_append_class-target() {
     install -m755 ${S}/command/* ${D}/${bindir}
 }
-
-BBCLASSEXTEND = "native"
-- 
2.20.1


From jpuhlman at mvista.com  Fri Mar  6 17:48:44 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Fri, 6 Mar 2020 09:48:44 -0800
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
	<CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
	<CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
Message-ID: <8fe016ad-faf5-32d7-bf5b-61758fcc2b66@mvista.com>



On 3/6/2020 8:12 AM, Khem Raj wrote:
> On Thu, Mar 5, 2020 at 11:55 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>> Can we fix mozjs instead?
> perhaps thats better fix, maybe it can made optional via packageconfig ?
> or marked incompatible if meta-python is not included

So that would be the logical thing, but wont that fail the 
yocto-layer-check, which
was the original reason for the change request in the first place?

One of the checks is that the configuration of packages is the same 
before and
after you add the new layer. If configuration changes in mozjs when you 
add the
meta-networking layer, that should trigger a fail. In this instance the 
change
is instituted by the original mozjs recipe so it should be legal, but I 
don't think
the checker is able to validate that is it?

>> On Fri, Mar 6, 2020 at 6:38 AM <changqing.li at windriver.com> wrote:
>>
>>> From: Changqing Li <changqing.li at windriver.com>
>>>
>>> yocto-check-layer/test_world failed since error:
>>> ERROR: test_world (common.CommonCheckLayer)
>>> ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
>>> /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
>>> DEPENDS on or otherwise requires it). Close matches:
>>>    python3-numpy-native
>>>    python3-pycairo-native
>>>    python3-rpm-native
>>> ERROR: Required build target 'meta-world-pkgdata' has no buildable
>>> providers.
>>> Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
>>> 'mozjs', 'python3-pytoml-native']
>>>
>>> mozjs depend on recipe under meta-python, but meta-python
>>> isn't in LAYERDEPENDS, so error occurred. Fix by add
>>> it into LAYERDEPENDS.
>>>
>>> Signed-off-by: Changqing Li <changqing.li at windriver.com>
>>> ---
>>>   meta-oe/conf/layer.conf | 5 ++++-
>>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
>>> index c537736..0ce0ad2 100644
>>> --- a/meta-oe/conf/layer.conf
>>> +++ b/meta-oe/conf/layer.conf
>>> @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
>>>   # cause compatibility issues with other layers
>>>   LAYERVERSION_openembedded-layer = "1"
>>>
>>> -LAYERDEPENDS_openembedded-layer = "core"
>>> +LAYERDEPENDS_openembedded-layer = " \
>>> +    core \
>>> +    meta-python \
>>> +"
>>>
>>>   LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
>>>
>>> --
>>> 2.7.4
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Jeremy A. Puhlman
jpuhlman at mvista.com


From raj.khem at gmail.com  Sat Mar  7 01:36:19 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Fri, 6 Mar 2020 17:36:19 -0800
Subject: [oe] [meta-networking][PATCH 4/7] net-snmp: fix reproducibilty
 issues in net-snmp-config
In-Reply-To: <20200305223937.12418-4-jpuhlman@mvista.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
	<20200305223937.12418-4-jpuhlman@mvista.com>
Message-ID: <74c7eed5-4a2b-aeb2-2c4f-b89f335897a0@gmail.com>

Hi Jeremy

On 3/5/20 2:39 PM, Jeremy A. Puhlman wrote:
> From: Jeremy Puhlman <jpuhlman at mvista.com>
> 
> Both STAGING_HOST_DIR and -fmacro-prefix-map path to WORKDIR were
> encoded in the config.
> 
> Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
> ---
>   meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
> index 317350e94..91c50c4e3 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
> @@ -124,11 +124,13 @@ do_install_append() {
>           -i ${D}${bindir}/net-snmp-create-v3-user
>       sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g' \
>           -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
> +        -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
>           -e 's@[^ ]*--sysroot=[^ "]*@@g' \
>           -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \
>           -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \
>           -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \
>           -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \
> +        -e 's@${STAGING_DIR_HOST}@@g' \

This is causing problems, indirectly like

https://errors.yoctoproject.org/Errors/Details/393851/
https://errors.yoctoproject.org/Errors/Details/393852/
https://errors.yoctoproject.org/Errors/Details/393853/

Since its editing out the paths, whats left is just /usr/lib
and that gets added to compiler commandline as -L/usr/lib which
thankfully gets caught by Build QA

perhaps this regexp can be made less greedy

From jpuhlman at mvista.com  Sat Mar  7 02:56:51 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Fri, 6 Mar 2020 18:56:51 -0800
Subject: [oe] [meta-networking][PATCH 4/7] net-snmp: fix reproducibilty
 issues in net-snmp-config
In-Reply-To: <74c7eed5-4a2b-aeb2-2c4f-b89f335897a0@gmail.com>
References: <20200305223937.12418-1-jpuhlman@mvista.com>
	<20200305223937.12418-4-jpuhlman@mvista.com>
	<74c7eed5-4a2b-aeb2-2c4f-b89f335897a0@gmail.com>
Message-ID: <ff31c97e-c802-278b-05b6-858b8e3212a9@mvista.com>



On 3/6/2020 5:36 PM, Khem Raj wrote:
> Hi Jeremy
>
> On 3/5/20 2:39 PM, Jeremy A. Puhlman wrote:
>> From: Jeremy Puhlman <jpuhlman at mvista.com>
>>
>> Both STAGING_HOST_DIR and -fmacro-prefix-map path to WORKDIR were
>> encoded in the config.
>>
>> Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
>> ---
>> ? meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 2 ++
>> ? 1 file changed, 2 insertions(+)
>>
>> diff --git 
>> a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb 
>> b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
>> index 317350e94..91c50c4e3 100644
>> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
>> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
>> @@ -124,11 +124,13 @@ do_install_append() {
>> ????????? -i ${D}${bindir}/net-snmp-create-v3-user
>> ????? sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g' \
>> ????????? -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
>> +??????? -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
>> ????????? -e 's@[^ ]*--sysroot=[^ "]*@@g' \
>> ????????? -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \
>> ????????? -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \
>> ????????? -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \
>> ????????? -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \
>> +??????? -e 's@${STAGING_DIR_HOST}@@g' \
>
> This is causing problems, indirectly like
>
> https://errors.yoctoproject.org/Errors/Details/393851/
> https://errors.yoctoproject.org/Errors/Details/393852/
> https://errors.yoctoproject.org/Errors/Details/393853/
>
> Since its editing out the paths, whats left is just /usr/lib
> and that gets added to compiler commandline as -L/usr/lib which
> thankfully gets caught by Build QA
>
> perhaps this regexp can be made less greedy
Okay, no problem, I have some builds running locally to check.


-- 
Jeremy A. Puhlman
jpuhlman at mvista.com


From jpuhlman at mvista.com  Sat Mar  7 04:06:07 2020
From: jpuhlman at mvista.com (Jeremy A. Puhlman)
Date: Fri,  6 Mar 2020 20:06:07 -0800
Subject: [oe] [meta-networking][PATCH v2] net-snmp: fix reproducibilty
	issues in net-snmp-config
Message-ID: <20200307040607.23866-1-jpuhlman@mvista.com>

Both STAGING_HOST_DIR and -fmacro-prefix-map path to WORKDIR were
encoded in the config.
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
index 9c2ffb2c7..5466649a8 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
@@ -124,11 +124,14 @@ do_install_append() {
         -i ${D}${bindir}/net-snmp-create-v3-user
     sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g' \
         -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
+        -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
         -e 's@[^ ]*--sysroot=[^ "]*@@g' \
         -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \
         -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \
         -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \
         -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \
+        -e 's at -L${STAGING_DIR_HOST}${libdir}@@g' \
+        -e 's at -I${STAGING_DIR_HOST}${includedir}@@g' \
         -i ${D}${bindir}/net-snmp-config
 
     if [ "${HAS_PERL}" = "1" ]; then
-- 
2.13.3


From adrian.freihofer at gmail.com  Sat Mar  7 15:20:10 2020
From: adrian.freihofer at gmail.com (Adrian Freihofer)
Date: Sat,  7 Mar 2020 16:20:10 +0100
Subject: [oe] [meta-networking][PATCH v3 0/1] networkmanager: Upgrade 1.18.4
	-> 1.22.8
Message-ID: <20200307152011.3104080-1-adrian.freihofer@siemens.com>

v3 adds two small patches. NetworkManager compiles now also with poky-tiny.
Thank you for the hint.

Adrian Freihofer (1):
  networkmanager: Upgrade 1.18.4 -> 1.22.8

 ...e.ac-Fix-pkgconfig-sysroot-locations.patch |  6 +-
 ...ttings-settings-property-documentati.patch | 23 ++++---
 ...Fix-build-with-musl-systemd-specific.patch | 26 ++++----
 .../musl/0002-Fix-build-with-musl.patch       | 30 +++++----
 ...0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 +++++++++++++++++++
 ...Fix-build-with-musl-systemd-specific.patch | 26 ++++++++
 ...ger_1.18.4.bb => networkmanager_1.22.8.bb} | 44 ++++++++-----
 7 files changed, 159 insertions(+), 57 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
 create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.4.bb => networkmanager_1.22.8.bb} (76%)

-- 
2.24.1


From adrian.freihofer at gmail.com  Sat Mar  7 15:20:11 2020
From: adrian.freihofer at gmail.com (Adrian Freihofer)
Date: Sat,  7 Mar 2020 16:20:11 +0100
Subject: [oe] [meta-networking][PATCH v3 1/1] networkmanager: Upgrade 1.18.4
	-> 1.22.8
In-Reply-To: <20200307152011.3104080-1-adrian.freihofer@siemens.com>
References: <20200307152011.3104080-1-adrian.freihofer@siemens.com>
Message-ID: <20200307152011.3104080-2-adrian.freihofer@siemens.com>

- rebased patches
- added two more small patches
- Option --enable-polkit-agent is not available with current NM, removed
- Option --with-libnm-glib is not available with current NM, removed
- New package NM-cloud-setup for new experimental cloud setup feature
- NM tries to re-license from GPL to LGPL, added LGPL to LICENSES
- Removed empty packages libnmutil libnmglib libnmglib-vpn

Signed-off-by: Adrian Freihofer <adrian.freihofer at siemens.com>
---
 ...e.ac-Fix-pkgconfig-sysroot-locations.patch |  6 +-
 ...ttings-settings-property-documentati.patch | 23 ++++---
 ...Fix-build-with-musl-systemd-specific.patch | 26 ++++----
 .../musl/0002-Fix-build-with-musl.patch       | 30 +++++----
 ...0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 +++++++++++++++++++
 ...Fix-build-with-musl-systemd-specific.patch | 26 ++++++++
 ...ger_1.18.4.bb => networkmanager_1.22.8.bb} | 44 ++++++++-----
 7 files changed, 159 insertions(+), 57 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
 create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.4.bb => networkmanager_1.22.8.bb} (76%)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
index 302c0292b..19c8c7481 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
@@ -1,4 +1,4 @@
-From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
+From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001
 From: Pablo Saavedra <psaavedra at igalia.com>
 Date: Tue, 13 Mar 2018 17:36:20 +0100
 Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
@@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 967eac0..b914219 100644
+index 65ceffb..ad4b0fc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
+@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then
  	AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
  
  	AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
index 5581dd3aa..446637b27 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
@@ -1,4 +1,4 @@
-From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001
+From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Thu, 22 Mar 2018 11:08:30 +0100
 Subject: [PATCH] Do not create settings settings/property documentation
@@ -6,23 +6,29 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 It was tried to get this work but gi / GirRepository could not be found by
 python. Anyway it is not necessary for us to have the settings/property docs.
 
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  Makefile.am  | 11 -----------
  configure.ac |  5 -----
  2 files changed, 16 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index b180466..1ab4658 100644
+index d5cbcf5..2a1819a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1298,9 +1298,7 @@ EXTRA_DIST += \
- if HAVE_INTROSPECTION
+@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
+ INTROSPECTION_GIRS += libnm/NM-1.0.gir
  
  libnm_noinst_data = \
 -	libnm/nm-property-docs.xml \
@@ -31,7 +37,7 @@ index b180466..1ab4658 100644
  	libnm/nm-settings-keyfile-docs.xml \
  	libnm/nm-settings-ifcfg-rh-docs.xml
  
-@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
+@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
  $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
  
  clients_common_settings_doc_h = clients/common/settings-docs.h
@@ -51,10 +57,10 @@ index b180466..1ab4658 100644
  	$(clients_common_settings_doc_h) \
  	$(clients_common_settings_doc_h).in
 diff --git a/configure.ac b/configure.ac
-index b914219..872c292 100644
+index ad4b0fc..0092092 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0)
+@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
  # check if we can build setting property documentation
  build_docs=no
  if test -n "$INTROSPECTION_MAKEFILE"; then
@@ -66,6 +72,3 @@ index b914219..872c292 100644
  	AC_PATH_PROG(PERL, perl)
  	if test -z "$PERL"; then
  		AC_MSG_ERROR([--enable-introspection requires perl])
--- 
-2.20.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
index af6f938ce..c23fc308f 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
@@ -1,4 +1,4 @@
-From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001
+From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Tue, 2 Apr 2019 01:34:35 +0200
 Subject: [PATCH] Fix build with musl - systemd specific
@@ -12,6 +12,7 @@ for musl.
 Upstream-Status: Pending
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  shared/systemd/src/basic/in-addr-util.c |  1 +
  shared/systemd/src/basic/process-util.c |  9 +++++++++
@@ -22,10 +23,10 @@ Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
  6 files changed, 27 insertions(+), 23 deletions(-)
 
 diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
-index 5899f62..0adb248 100644
+index 91d687c..8388304 100644
 --- a/shared/systemd/src/basic/in-addr-util.c
 +++ b/shared/systemd/src/basic/in-addr-util.c
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
  #include "in-addr-util.h"
  #include "macro.h"
  #include "parse-util.h"
@@ -34,10 +35,10 @@ index 5899f62..0adb248 100644
  #include "strxcpyx.h"
  #include "util.h"
 diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
-index 7431be3..189060a 100644
+index 1456167..42f51a0 100644
 --- a/shared/systemd/src/basic/process-util.c
 +++ b/shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
+@@ -17,6 +17,9 @@
  #include <sys/wait.h>
  #include <syslog.h>
  #include <unistd.h>
@@ -47,7 +48,7 @@ index 7431be3..189060a 100644
  #if 0 /* NM_IGNORED */
  #if HAVE_VALGRIND_VALGRIND_H
  #include <valgrind/valgrind.h>
-@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) {
+@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
          cached_pid = CACHED_PID_UNSET;
  }
  
@@ -61,7 +62,7 @@ index 7431be3..189060a 100644
  
  pid_t getpid_cached(void) {
          static bool installed = false;
-@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) {
+@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) {
                           * only half-documented (glibc doesn't document it but LSB does ? though only superficially)
                           * we'll check for errors only in the most generic fashion possible. */
  
@@ -74,10 +75,10 @@ index 7431be3..189060a 100644
                                  cached_pid = CACHED_PID_UNSET;
                                  return new_pid;
 diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
-index 15443f1..4807198 100644
+index a0886e0..da47d14 100644
 --- a/shared/systemd/src/basic/socket-util.h
 +++ b/shared/systemd/src/basic/socket-util.h
-@@ -13,6 +13,12 @@
+@@ -14,6 +14,12 @@
  #include <sys/types.h>
  #include <sys/un.h>
  
@@ -147,10 +148,10 @@ index c3b9448..e80a938 100644
  #include <stdio.h>
  #include <sys/types.h>
 diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
-index b23f4c8..8f2f6e0 100644
+index 04cc82b..2cf589a 100644
 --- a/shared/systemd/src/basic/string-util.h
 +++ b/shared/systemd/src/basic/string-util.h
-@@ -27,6 +27,11 @@
+@@ -26,6 +26,11 @@
  #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
  #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
  
@@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644
  int strcmp_ptr(const char *a, const char *b) _pure_;
  
  static inline bool streq_ptr(const char *a, const char *b) {
--- 
-2.17.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
index e0973af1e..196a3358d 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
@@ -1,7 +1,7 @@
-From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001
+From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
 Date: Mon, 8 Apr 2019 23:10:43 +0200
-Subject: [PATCH 2/2] Fix build with musl
+Subject: [PATCH] Fix build with musl
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace' [2] (search for
 Upstream-Status: Pending
 
 Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
+
 ---
  clients/tui/nmt-device-entry.c   | 1 -
  libnm-core/nm-utils.h            | 4 ++++
@@ -41,10 +42,10 @@ Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
  5 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
-index 43fbbc1..3eae286 100644
+index 4ab5932..915248c 100644
 --- a/clients/tui/nmt-device-entry.c
 +++ b/clients/tui/nmt-device-entry.c
-@@ -39,7 +39,6 @@
+@@ -26,7 +26,6 @@
  #include "nmt-device-entry.h"
  
  #include <sys/socket.h>
@@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644
  #include "nmtui.h"
  
 diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 2b5baba..f7abab6 100644
+index 5418a1e..f492da6 100644
 --- a/libnm-core/nm-utils.h
 +++ b/libnm-core/nm-utils.h
-@@ -25,6 +25,10 @@
+@@ -10,6 +10,10 @@
  #error "Only <NetworkManager.h> can be included directly."
  #endif
  
@@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644
  
  #include <netinet/in.h>
 diff --git a/shared/nm-default.h b/shared/nm-default.h
-index 54e9916..26e9f4e 100644
+index ace6ede..25357da 100644
 --- a/shared/nm-default.h
 +++ b/shared/nm-default.h
-@@ -211,6 +211,9 @@
+@@ -182,6 +182,9 @@
  #endif
  
  #include <stdlib.h>
@@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644
  /*****************************************************************************/
  
 diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index bd4fbcc..f70b309 100644
+index 3bbc975..4e8a3f6 100644
 --- a/src/devices/nm-device.c
 +++ b/src/devices/nm-device.c
-@@ -24,6 +24,7 @@
+@@ -9,6 +9,7 @@
  #include "nm-device.h"
  
  #include <netinet/in.h>
@@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644
  #include <unistd.h>
  #include <sys/ioctl.h>
  #include <signal.h>
-@@ -32,7 +33,6 @@
+@@ -17,7 +18,6 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644
  #include <linux/pkt_sched.h>
  
 diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index d4b0115..22a3a90 100644
+index 7abe4df..9f53147 100644
 --- a/src/platform/nm-linux-platform.c
 +++ b/src/platform/nm-linux-platform.c
-@@ -28,7 +28,6 @@
+@@ -14,7 +14,6 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644
  #include <linux/if_bridge.h>
  #include <linux/if_link.h>
  #include <linux/if_tun.h>
--- 
-2.17.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
new file mode 100644
index 000000000..62252826e
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
@@ -0,0 +1,61 @@
+From aff5cded8847f3eee59f5cec22afb8630d401a85 Mon Sep 17 00:00:00 2001
+From: Adrian Freihofer <adrian.freihofer at siemens.com>
+Date: Sat, 7 Mar 2020 14:22:36 +0100
+Subject: [PATCH 3/4] Fix build with musl for n-dhcp4
+
+---
+ shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++
+ shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
+index e4477a7..75713c8 100644
+--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c
++++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
+@@ -360,8 +360,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
+         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
+         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
+ 
++#ifdef __GLIBC__
+         r = seed48_r(seed16v, &config->entropy);
+         c_assert(!r);
++#else
++        memcpy(config->entropy, seed16v, sizeof seed16v);
++#endif
+ }
+ 
+ /**
+@@ -375,10 +379,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
+  */
+ uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) {
+         long int result;
++#ifdef __GLIBC__
+         int r;
+ 
+         r = mrand48_r(&config->entropy, &result);
+         c_assert(!r);
++#else
++        result = jrand48(config->entropy);
++#endif
+ 
+         return result;
+ };
+diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h
+index 436ee80..ffcb4b2 100644
+--- a/shared/n-dhcp4/src/n-dhcp4-private.h
++++ b/shared/n-dhcp4/src/n-dhcp4-private.h
+@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig {
+         bool inform_only;
+         bool init_reboot;
+         struct in_addr requested_ip;
++#ifdef __GLIBC__
+         struct drand48_data entropy;    /* entropy pool */
++#else
++        unsigned short entropy[3];      /* entropy pool */
++#endif
+         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
+         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
+         int8_t request_parameters[UINT8_MAX + 1];
+-- 
+2.24.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
new file mode 100644
index 000000000..55aa4d265
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
@@ -0,0 +1,26 @@
+From 80c7d3391510993cba1a7499bf33a5b2b115280d Mon Sep 17 00:00:00 2001
+From: Adrian Freihofer <adrian.freihofer at siemens.com>
+Date: Sat, 7 Mar 2020 14:24:01 +0100
+Subject: [PATCH 4/4] Fix build with musl - systemd specific
+
+---
+ src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+index e1150f9..2c63bac 100644
+--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
++++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@@ -7,7 +7,9 @@
+ 
+ #include <errno.h>
+ #include <sys/ioctl.h>
++#ifdef __GLIBC__  /* musl supplies full set of userspace headers */
+ #include <linux/if_arp.h>
++#endif
+ #include <linux/if_infiniband.h>
+ 
+ #include "sd-dhcp6-client.h"
+-- 
+2.24.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
similarity index 76%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
index 27508c4d9..297f05618 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
@@ -2,9 +2,9 @@ SUMMARY = "NetworkManager"
 HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager"
 SECTION = "net/misc"
 
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
-                    file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
 "
 
 DEPENDS = " \
@@ -30,9 +30,11 @@ SRC_URI = " \
 SRC_URI_append_libc-musl = " \
     file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
     file://musl/0002-Fix-build-with-musl.patch \
+    file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \
+    file://musl/0004-Fix-build-with-musl-systemd-specific.patch \
 "
-SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
-SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
+SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284"
+SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
@@ -65,7 +67,7 @@ PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
     --without-systemdsystemunitdir, \
 "
-PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit"
+PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
 PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
 # consolekit is not picked by shlibs, so add it to RDEPENDS too
 PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
@@ -75,33 +77,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
 PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
 PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
-PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib"
 PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
 PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant"
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
 PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
+PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no"
 
-PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
+PACKAGES =+ " \
   ${PN}-nmtui ${PN}-nmtui-doc \
-  ${PN}-adsl \
+  ${PN}-adsl ${PN}-cloud-setup \
 "
 
-FILES_libnmutil += "${libdir}/libnm-util.so.*"
-FILES_libnmglib += "${libdir}/libnm-glib.so.*"
-FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
+SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup"
 
 FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so"
 
+FILES_${PN}-cloud-setup = " \
+    ${libexecdir}/nm-cloud-setup \
+    ${systemd_system_unitdir}/nm-cloud-setup.service \
+    ${systemd_system_unitdir}/nm-cloud-setup.timer \
+    ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \
+    ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \
+"
+ALLOW_EMPTY_${PN}-cloud-setup = "1"
+SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}"
+
 FILES_${PN} += " \
     ${libexecdir} \
     ${libdir}/NetworkManager/${PV}/*.so \
-    ${nonarch_libdir}/NetworkManager/VPN \
+    ${libdir}/NetworkManager \
     ${nonarch_libdir}/NetworkManager/conf.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \
+    ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \
+    ${nonarch_libdir}/NetworkManager/VPN \
+    ${nonarch_libdir}/NetworkManager/system-connections \
     ${datadir}/polkit-1 \
     ${datadir}/dbus-1 \
     ${nonarch_base_libdir}/udev/* \
-    ${systemd_unitdir}/system \
+    ${systemd_system_unitdir} \
     ${libdir}/pppd \
 "
 
-- 
2.24.1


From costamagna.gianfranco at gmail.com  Sun Mar  8 08:00:06 2020
From: costamagna.gianfranco at gmail.com (Gianfranco Costamagna)
Date: Sun,  8 Mar 2020 09:00:06 +0100
Subject: [oe] [meta-oe][PATCH 1/2] mosquitto: refresh patches and sync with
	Debian packaging
Message-ID: <20200308080007.21944-1-costamagnagianfranco@yahoo.it>

 Also add patch from debian to mqtt_protocol.h header file

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg at debian.org>
---
 .../mosquitto/files/1571.patch                     |  4 +---
 .../mosquitto/files/install-protocol.patch         | 14 ++++++++++++++
 .../mosquitto/mosquitto_1.6.9.bb                   |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch

diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
index 2cfa48457..93ff6bcfa 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
+++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
@@ -9,11 +9,9 @@ Signed-off-by: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
  lib/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index e1521f12a..14ba12739 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -88,6 +88,8 @@ set_target_properties(libmosquitto PROPERTIES
+@@ -89,6 +89,8 @@
  	OUTPUT_NAME mosquitto
  	VERSION ${VERSION}
  	SOVERSION 1
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
new file mode 100644
index 000000000..1397fc6a2
--- /dev/null
+++ b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
@@ -0,0 +1,14 @@
+Description: Also install mqtt_protocol.h, as is done in Makefile
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+Bug-Debian: https://bugs.debian.org/951116
+Forwarded: https://github.com/eclipse/mosquitto/pull/1599
+Last-Update: 2020-02-15
+
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -114,4 +114,4 @@
+ 	install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ endif (WITH_STATIC_LIBRARIES)
+ 
+-install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
++install(FILES mqtt_protocol.h mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
index 0d840e938..a0321a36f 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
@@ -17,6 +17,7 @@ DEPENDS = "uthash"
 SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
            file://mosquitto.init \
            file://1571.patch \
+           file://install-protocol.patch \
 "
 
 SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b"
-- 
2.17.1


From costamagna.gianfranco at gmail.com  Sun Mar  8 08:00:07 2020
From: costamagna.gianfranco at gmail.com (Gianfranco Costamagna)
Date: Sun,  8 Mar 2020 09:00:07 +0100
Subject: [oe] [meta-oe][PATCH 2/2] mosquitto: do not enable srv by default
In-Reply-To: <20200308080007.21944-1-costamagnagianfranco@yahoo.it>
References: <20200308080007.21944-1-costamagnagianfranco@yahoo.it>
Message-ID: <20200308080007.21944-2-costamagnagianfranco@yahoo.it>

Rationale can be found in the Debian packaging (debian/changelog):
Revert change enabling SRV functionality, it is disabled by default
upstream and of little benefit to any end user, but adds reasonable
complexity to the code.

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg at debian.org>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.6.9.bb           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
index a0321a36f..de43aae73 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
@@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f
 
 inherit systemd update-rc.d useradd cmake
 
-PACKAGECONFIG ??= "ssl dlt websockets dns-srv\
+PACKAGECONFIG ??= "ssl dlt websockets \
                   ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \
                   "
 
-- 
2.17.1


From alistair at alistair23.me  Sun Mar  8 08:07:26 2020
From: alistair at alistair23.me (Alistair Francis)
Date: Sun,  8 Mar 2020 00:07:26 -0800
Subject: [oe] [PATCH] python3-obd: Consolidate into a single file
Message-ID: <20200308080726.6318-1-alistair@alistair23.me>

Signed-off-by: Alistair Francis <alistair at alistair23.me>
---
 meta-python/recipes-devtools/python/python-obd.inc   | 11 -----------
 .../recipes-devtools/python/python3-obd_0.7.1.bb     | 12 ++++++++++--
 2 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-obd.inc

diff --git a/meta-python/recipes-devtools/python/python-obd.inc b/meta-python/recipes-devtools/python/python-obd.inc
deleted file mode 100644
index 51e663b51..000000000
--- a/meta-python/recipes-devtools/python/python-obd.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "A python module for handling realtime sensor data from OBD-II vehicle ports"
-HOMEPAGE = "https://github.com/brendan-w/python-OBD"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://README.md;md5=58ba896fa086c96ad23317cebfeab277"
-
-SRC_URI[md5sum] = "305efcb6c650db7b9583532355ebeb7c"
-SRC_URI[sha256sum] = "8b81ea5896157b6e861af12e173c10b001cb6cca6ebb04db2c01d326812ad77b"
-
-inherit pypi
-
-RDEPENDS_${PN} = "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint"
diff --git a/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb b/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb
index 578e38d3a..55131b333 100644
--- a/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb
+++ b/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb
@@ -1,2 +1,10 @@
-inherit setuptools3
-require python-obd.inc
+DESCRIPTION = "A python module for handling realtime sensor data from OBD-II vehicle ports"HOMEPAGE = "https://github.com/brendan-w/python-OBD"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://README.md;md5=58ba896fa086c96ad23317cebfeab277"
+
+SRC_URI[md5sum] = "305efcb6c650db7b9583532355ebeb7c"
+SRC_URI[sha256sum] = "8b81ea5896157b6e861af12e173c10b001cb6cca6ebb04db2c01d326812ad77b"
+
+inherit setuptools3 pypi
+
+RDEPENDS_${PN} = "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint"
-- 
2.25.0


From raj.khem at gmail.com  Sun Mar  8 15:15:06 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun,  8 Mar 2020 08:15:06 -0700
Subject: [oe] [meta-networking][PATCH 1/4] kronosnet: Add recipe
Message-ID: <20200308151509.1573831-1-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../kronosnet/kronosnet_1.15.bb                 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb

diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb
new file mode 100644
index 0000000000..24aa27a87b
--- /dev/null
+++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb
@@ -0,0 +1,17 @@
+# Copyright (C) 2020 Khem Raj <raj.khem at gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = " Kronosnet, often referred to as knet, is a network abstraction layer designed for High Availability use cases, where redundancy, security, fault tolerance and fast fail-over are the core requirements of your application."
+HOMEPAGE = "https://kronosnet.org/"
+LICENSE = "GPL-2.0+ & LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \
+                    file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1"
+SECTION = "libs"
+DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd"
+
+SRCREV = "0ba5985c3ddec8429b989f0e7bd3324f53e0a9b0"
+SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1"
+
+inherit autotools
+
+S = "${WORKDIR}/git"
-- 
2.25.1


From raj.khem at gmail.com  Sun Mar  8 15:15:07 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun,  8 Mar 2020 08:15:07 -0700
Subject: [oe] [meta-networking][PATCH 2/4] corosync: Update to 3.0.3
In-Reply-To: <20200308151509.1573831-1-raj.khem@gmail.com>
References: <20200308151509.1573831-1-raj.khem@gmail.com>
Message-ID: <20200308151509.1573831-2-raj.khem@gmail.com>

- Add dependency on kronosnet
- Remove obsolete options and packageconfigs
- Drop upstreamed patch

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...igure.ac-fix-pkgconfig-issue-of-rdma.patch | 32 -------------------
 .../{corosync_2.4.5.bb => corosync_3.0.3.bb}  | 23 +++++--------
 2 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch
 rename meta-networking/recipes-extended/corosync/{corosync_2.4.5.bb => corosync_3.0.3.bb} (82%)

diff --git a/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch b/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch
deleted file mode 100644
index bdc7645ce6..0000000000
--- a/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: [PATCH] configure.ac: fix pkgconfig issue of rdma
-
-pkgconfig files from rdma-core(https://github.com/linux-rdma/rdma-core)
-are named start with lib, such as librdmacm.pc and libibverbs.pc. When
-rdma support is enabled, it fails to find rdma related libraries. Update
-configure.ac to the issue.
-
-Upstream-Status: Submitted [https://github.com/corosync/corosync/pull/515]
-
-Signed-off-by: Kai Kang <kai.kang at windriver.com>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ac513e93..240cfed4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -459,8 +459,8 @@ if test "x${enable_testagents}" = xyes; then
- fi
- 
- if test "x${enable_rdma}" = xyes; then
--	PKG_CHECK_MODULES([rdmacm],[rdmacm])
--	PKG_CHECK_MODULES([ibverbs],[ibverbs])
-+	PKG_CHECK_MODULES([rdmacm],[librdmacm])
-+	PKG_CHECK_MODULES([ibverbs],[libibverbs])
- 	AC_DEFINE_UNQUOTED([HAVE_RDMA], 1, [have rdmacm])
- 	PACKAGE_FEATURES="$PACKAGE_FEATURES rdma"
- 	WITH_LIST="$WITH_LIST --with rdma"
--- 
-2.20.1
-
diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb b/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb
similarity index 82%
rename from meta-networking/recipes-extended/corosync/corosync_2.4.5.bb
rename to meta-networking/recipes-extended/corosync/corosync_3.0.3.bb
index eefbcca8a1..c0531d3866 100644
--- a/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb
+++ b/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb
@@ -7,20 +7,16 @@ SECTION = "base"
 
 inherit autotools pkgconfig systemd useradd
 
-SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
            file://corosync.conf \
-           file://0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch \
           "
-
-SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd"
-SRC_URI[sha256sum] = "ab6eafdb8f43a23794fc15d4c5198bbd6759060cb13c8d2d1e78a6c8360aba5f"
-
+SRC_URI[sha256sum] = "20eb903eb984f6a728282c199825e442e8bba869acefd22390076ef3a33a4ded"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d"
 
-DEPENDS = "groff-native nss libqb"
+DEPENDS = "groff-native nss libqb kronosnet"
 
 SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \
                          ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \
@@ -31,23 +27,20 @@ SYSTEMD_AUTO_ENABLE = "disable"
 INITSCRIPT_NAME = "corosync-daemon"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
-                   dbus qdevice qnetd snmp \
+                   dbus snmp \
 "
 
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
-PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices"
-PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd"
-PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,rdma-core"
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
 PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"
 
 EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no"
 EXTRA_OEMAKE = "tmpfilesdir_DATA="
 
-do_configure_prepend() {
-    ( cd ${S}
-    ${S}/autogen.sh )
-}
+#do_configure_prepend() {
+#    ( cd ${S}
+#    ${S}/autogen.sh )
+#}
 
 do_install_append() {
     install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example
-- 
2.25.1


From raj.khem at gmail.com  Sun Mar  8 15:15:08 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun,  8 Mar 2020 08:15:08 -0700
Subject: [oe] [meta-oe][PATCH 3/4] libqb: Build native version as well
In-Reply-To: <20200308151509.1573831-1-raj.khem@gmail.com>
References: <20200308151509.1573831-1-raj.khem@gmail.com>
Message-ID: <20200308151509.1573831-3-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb
index 82503a168b..cd4019666d 100644
--- a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb
+++ b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb
@@ -33,3 +33,5 @@ do_configure_prepend() {
     ( cd ${S}
     ${S}/autogen.sh )
 }
+
+BBCLASSEXTEND = "native"
-- 
2.25.1


From raj.khem at gmail.com  Sun Mar  8 15:15:09 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun,  8 Mar 2020 08:15:09 -0700
Subject: [oe] [meta-oe][PATCH 4/4] nss,nspr: Add recipes
In-Reply-To: <20200308151509.1573831-1-raj.khem@gmail.com>
References: <20200308151509.1573831-1-raj.khem@gmail.com>
Message-ID: <20200308151509.1573831-4-raj.khem@gmail.com>

oe-core has punted them, but they are still needed by many packages e.g.
mozjs

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../nspr/0001-md-Fix-build-with-musl.patch    |  31 ++
 .../nspr/nspr/0002-Add-nios2-support.patch    | 102 +++++++
 ...remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 +++++++
 .../nspr/nspr/fix-build-on-x86_64.patch       |  52 ++++
 meta-oe/recipes-support/nspr/nspr/nspr.pc.in  |  11 +
 .../nspr/nspr/remove-rpath-from-tests.patch   |  26 ++
 .../remove-srcdir-from-configure-in.patch     |  19 ++
 meta-oe/recipes-support/nspr/nspr_4.25.bb     | 197 +++++++++++++
 ...figure-option-to-disable-ARM-HW-cryp.patch |  52 ++++
 ...0001-nss-fix-support-cross-compiling.patch |  48 +++
 .../recipes-support/nss/nss/blank-cert9.db    | Bin 0 -> 28672 bytes
 meta-oe/recipes-support/nss/nss/blank-key4.db | Bin 0 -> 36864 bytes
 .../nss/nss/disable-Wvarargs-with-clang.patch |  33 +++
 .../nss-fix-incorrect-shebang-of-perl.patch   | 110 +++++++
 .../nss/nss/nss-fix-nsinstall-build.patch     |  36 +++
 .../nss-no-rpath-for-cross-compiling.patch    |  26 ++
 meta-oe/recipes-support/nss/nss/nss.pc.in     |  11 +
 .../nss/nss/pqg.c-ULL_addend.patch            |  23 ++
 meta-oe/recipes-support/nss/nss/signlibs.sh   |  20 ++
 .../recipes-support/nss/nss/system-pkcs11.txt |   5 +
 meta-oe/recipes-support/nss/nss_3.50.bb       | 273 ++++++++++++++++++
 21 files changed, 1178 insertions(+)
 create mode 100644 meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
 create mode 100644 meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
 create mode 100644 meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
 create mode 100644 meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
 create mode 100644 meta-oe/recipes-support/nspr/nspr/nspr.pc.in
 create mode 100644 meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
 create mode 100644 meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
 create mode 100644 meta-oe/recipes-support/nspr/nspr_4.25.bb
 create mode 100644 meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
 create mode 100644 meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
 create mode 100644 meta-oe/recipes-support/nss/nss/blank-cert9.db
 create mode 100644 meta-oe/recipes-support/nss/nss/blank-key4.db
 create mode 100644 meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
 create mode 100644 meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
 create mode 100644 meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
 create mode 100644 meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
 create mode 100644 meta-oe/recipes-support/nss/nss/nss.pc.in
 create mode 100644 meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch
 create mode 100644 meta-oe/recipes-support/nss/nss/signlibs.sh
 create mode 100644 meta-oe/recipes-support/nss/nss/system-pkcs11.txt
 create mode 100644 meta-oe/recipes-support/nss/nss_3.50.bb

diff --git a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
new file mode 100644
index 0000000000..f3cd670026
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
@@ -0,0 +1,31 @@
+From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Mon, 18 Sep 2017 17:22:43 -0700
+Subject: [PATCH] md: Fix build with musl
+
+The MIPS specific header <sgidefs.h> is not provided by musl
+linux kernel headers provide <asm/sgidefs.h> which has same definitions
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+Upstream-Status: Pending
+
+ pr/include/md/_linux.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
+index 640b19c..31296a8 100644
+--- a/pr/include/md/_linux.cfg
++++ b/pr/include/md/_linux.cfg
+@@ -499,7 +499,7 @@
+ #elif defined(__mips__)
+ 
+ /* For _ABI64 */
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ 
+ #ifdef __MIPSEB__
+ #define IS_BIG_ENDIAN 1
+-- 
+2.14.1
+
diff --git a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
new file mode 100644
index 0000000000..3a04d426a8
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
@@ -0,0 +1,102 @@
+From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex at denx.de>
+Date: Sat, 30 Jan 2016 07:18:02 +0100
+Subject: [PATCH] Add nios2 support
+
+Add support for the nios2 CPU.
+
+Signed-off-by: Marek Vasut <marex at denx.de>
+Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ]
+---
+ nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++
+ nspr/pr/include/md/_linux.h   | 14 ++++++++++++++
+ 2 files changed, 59 insertions(+)
+
+Index: nspr/pr/include/md/_linux.cfg
+===================================================================
+--- nspr.orig/pr/include/md/_linux.cfg
++++ nspr/pr/include/md/_linux.cfg
+@@ -975,6 +975,51 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+ 
++#elif defined(__nios2__)
++
++#define IS_LITTLE_ENDIAN    1
++#undef  IS_BIG_ENDIAN
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   4
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
+ #elif defined(__or1k__)
+ 
+ #undef  IS_LITTLE_ENDIAN
+Index: nspr/pr/include/md/_linux.h
+===================================================================
+--- nspr.orig/pr/include/md/_linux.h
++++ nspr/pr/include/md/_linux.h
+@@ -55,6 +55,8 @@
+ #define _PR_SI_ARCHITECTURE "avr32"
+ #elif defined(__m32r__)
+ #define _PR_SI_ARCHITECTURE "m32r"
++#elif defined(__nios2__)
++#define _PR_SI_ARCHITECTURE "nios2"
+ #elif defined(__or1k__)
+ #define _PR_SI_ARCHITECTURE "or1k"
+ #elif defined(__riscv) && (__riscv_xlen == 32)
+@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn
+ #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
+ #endif
+ 
++#if defined(__nios2__)
++#if defined(__GNUC__)
++/* Use GCC built-in functions */
++#define _PR_HAVE_ATOMIC_OPS
++#define _MD_INIT_ATOMIC()
++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
++#endif
++#endif
++
+ #if defined(__or1k__)
+ #if defined(__GNUC__)
+ /* Use GCC built-in functions */
diff --git a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
new file mode 100644
index 0000000000..90fe45f34d
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
@@ -0,0 +1,103 @@
+From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <Mingli.Yu at windriver.com>
+Date: Fri, 16 Nov 2018 13:52:49 +0800
+Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
+
+Remove _BUILD_STRING and _BUILD_TIME to avoid
+adding timestamp to _pl_bld.h which can result
+in adding timestamp in library file such as
+libnspr4.so.
+ $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so
+ [snip]
+  0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49
+ [snip]
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
+---
+ lib/ds/Makefile.in        | 8 +-------
+ lib/libc/src/Makefile.in  | 8 +-------
+ lib/prstreams/Makefile.in | 8 +-------
+ pr/src/Makefile.in        | 8 +-------
+ 4 files changed, 4 insertions(+), 28 deletions(-)
+
+diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
+index e737791..b578476 100644
+--- a/lib/ds/Makefile.in
++++ b/lib/ds/Makefile.in
+@@ -114,13 +114,7 @@ GARBAGE += $(TINC)
+ 
+ $(TINC):
+ 	@$(MAKE_OBJDIR)
+-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+-	@if test ! -z "$(SH_NOW)"; then \
+-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+-	else \
+-	    true; \
+-	fi
+-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++	@$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+ 
+ 
+ $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
+diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
+index e8a6d9f..978ed28 100644
+--- a/lib/libc/src/Makefile.in
++++ b/lib/libc/src/Makefile.in
+@@ -116,13 +116,7 @@ GARBAGE += $(TINC)
+ 
+ $(TINC):
+ 	@$(MAKE_OBJDIR)
+-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+-	@if test ! -z "$(SH_NOW)"; then \
+-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+-	else \
+-	    true; \
+-	fi
+-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++	@$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+ 
+ 
+ $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
+diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
+index aeb2944..f318097 100644
+--- a/lib/prstreams/Makefile.in
++++ b/lib/prstreams/Makefile.in
+@@ -116,13 +116,7 @@ endif
+ 
+ $(TINC):
+ 	@$(MAKE_OBJDIR)
+-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+-	@if test ! -z "$(SH_NOW)"; then \
+-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+-	else \
+-	    true; \
+-	fi
+-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++	@$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+ 
+ 
+ $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
+diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
+index 19c5a69..b4ac31c 100644
+--- a/pr/src/Makefile.in
++++ b/pr/src/Makefile.in
+@@ -326,13 +326,7 @@ GARBAGE += $(TINC)
+ 
+ $(TINC):
+ 	@$(MAKE_OBJDIR)
+-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+-	@if test ! -z "$(SH_NOW)"; then \
+-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+-	else \
+-	    true; \
+-	fi
+-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++	@$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+ 
+ 
+ $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
+-- 
+2.7.4
+
diff --git a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
new file mode 100644
index 0000000000..f12acc8548
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
@@ -0,0 +1,52 @@
+Fix build failure on x86_64
+
+When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
+only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
+opposite logic before.
+
+Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
+
+Upstream-Status: Pending
+---
+ configure.in |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+Index: nspr/configure.in
+===================================================================
+--- nspr.orig/configure.in
++++ nspr/configure.in
+@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve
+         PR_MD_ASFILES=os_Linux_ia64.s
+         ;;
+     x86_64)
+-        if test -n "$USE_64"; then
+-            PR_MD_ASFILES=os_Linux_x86_64.s
+-        elif test -n "$USE_X32"; then
++        if test -n "$USE_X32"; then
++            AC_DEFINE(i386)
+             PR_MD_ASFILES=os_Linux_x86_64.s
+             CC="$CC -mx32"
+             CXX="$CXX -mx32"
+         else
+-            AC_DEFINE(i386)
+-            PR_MD_ASFILES=os_Linux_x86.s
+-            CC="$CC -m32"
+-            CXX="$CXX -m32"
++            PR_MD_ASFILES=os_Linux_x86_64.s
+         fi
+         ;;
+     ppc|powerpc)
+         PR_MD_ASFILES=os_Linux_ppc.s
+         ;;
+     powerpc64)
+-        if test -n "$USE_64"; then
++        if test -n "$USE_N32"; then
++            PR_MD_ASFILES=os_Linux_ppc.s
++        else
+             CC="$CC -m64"
+             CXX="$CXX -m64"
+-        else
+-            PR_MD_ASFILES=os_Linux_ppc.s
+         fi
+         ;;
+     esac    
diff --git a/meta-oe/recipes-support/nspr/nspr/nspr.pc.in b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in
new file mode 100644
index 0000000000..1f15d19cfa
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in
@@ -0,0 +1,11 @@
+os_libs=-lpthread -ldl
+prefix=OEPREFIX
+exec_prefix=OEEXECPREFIX
+libdir=OELIBDIR
+includedir=OEINCDIR
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: NSPRVERSION
+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+Cflags: -I${includedir}/nspr
diff --git a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
new file mode 100644
index 0000000000..7ba59ed644
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
@@ -0,0 +1,26 @@
+Author: Andrei Gherzan <andrei at gherzan.ro>
+Date:   Thu Feb 9 00:03:38 2012 +0200
+
+Avoid QA warnings by removing hardcoded rpath from binaries.
+
+[...]
+WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib
+in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait
+[...]
+
+Signed-off-by: Andrei Gherzan <andrei at gherzan.ro>
+Upstream-Status: Pending
+
+Index: nspr/pr/tests/Makefile.in
+===================================================================
+--- nspr.orig/pr/tests/Makefile.in
++++ nspr/pr/tests/Makefile.in
+@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS)
+ endif # SunOS
+ 
+ ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
+-    LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
++    LDOPTS += -Xlinker
+     ifeq ($(USE_PTHREADS),1)
+         EXTRA_LIBS = -lpthread
+     endif
diff --git a/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
new file mode 100644
index 0000000000..bde715c5dc
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
@@ -0,0 +1,19 @@
+the $srcdir is not defined at the time of gnu-configurize.
+
+Upstream-Status: Inappropriate [OE-Core specific]
+
+Signed-off-by: Saul Wold <sgw at linux.intel.com>
+
+Index: nspr/configure.in
+===================================================================
+--- nspr.orig/configure.in
++++ nspr/configure.in
+@@ -8,7 +8,7 @@ AC_PREREQ(2.61)
+ AC_INIT
+ AC_CONFIG_SRCDIR([pr/include/nspr.h])
+ 
+-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
++AC_CONFIG_AUX_DIR(build/autoconf)
+ AC_CANONICAL_TARGET
+ 
+ dnl ========================================================
diff --git a/meta-oe/recipes-support/nspr/nspr_4.25.bb b/meta-oe/recipes-support/nspr/nspr_4.25.bb
new file mode 100644
index 0000000000..1de26e1eed
--- /dev/null
+++ b/meta-oe/recipes-support/nspr/nspr_4.25.bb
@@ -0,0 +1,197 @@
+SUMMARY = "Netscape Portable Runtime Library"
+HOMEPAGE =  "http://www.mozilla.org/projects/nspr/"
+LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1"
+LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \
+                    file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99"
+SECTION = "libs/network"
+
+SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
+           file://remove-rpath-from-tests.patch \
+           file://fix-build-on-x86_64.patch \
+           file://remove-srcdir-from-configure-in.patch \
+           file://0002-Add-nios2-support.patch \
+           file://0001-md-Fix-build-with-musl.patch \
+           file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
+           file://nspr.pc.in \
+"
+
+CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \
+                                          -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \
+                                          -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \
+                                          -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'"
+
+UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
+UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
+
+SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17"
+SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256"
+
+CVE_PRODUCT = "netscape_portable_runtime"
+
+S = "${WORKDIR}/nspr-${PV}/nspr"
+
+RDEPENDS_${PN}-dev += "perl"
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+TESTS = " \
+    accept \
+    acceptread \
+    acceptreademu \
+    affinity \
+    alarm \
+    anonfm \
+    atomic \
+    attach \
+    bigfile \
+    cleanup \
+    cltsrv  \
+    concur \
+    cvar \
+    cvar2 \
+    dlltest \
+    dtoa \
+    errcodes \
+    exit \
+    fdcach \
+    fileio \
+    foreign \
+    formattm \
+    fsync \
+    gethost \
+    getproto \
+    i2l \
+    initclk \
+    inrval \
+    instrumt \
+    intrio \
+    intrupt \
+    io_timeout \
+    ioconthr \
+    join \
+    joinkk \
+    joinku \
+    joinuk \
+    joinuu \
+    layer \
+    lazyinit \
+    libfilename \
+    lltest \
+    lock \
+    lockfile \
+    logfile \
+    logger \
+    many_cv \
+    multiwait \
+    nameshm1 \
+    nblayer \
+    nonblock \
+    ntioto \
+    ntoh \
+    op_2long \
+    op_excl \
+    op_filnf \
+    op_filok \
+    op_nofil \
+    parent \
+    parsetm \
+    peek \
+    perf \
+    pipeping \
+    pipeping2 \
+    pipeself \
+    poll_nm \
+    poll_to \
+    pollable \
+    prftest \
+    primblok \
+    provider \
+    prpollml \
+    ranfile \
+    randseed \
+    reinit \
+    rwlocktest \
+    sel_spd \
+    selct_er \
+    selct_nm \
+    selct_to \
+    selintr \
+    sema \
+    semaerr \
+    semaping \
+    sendzlf \
+    server_test \
+    servr_kk \
+    servr_uk \
+    servr_ku \
+    servr_uu \
+    short_thread \
+    sigpipe \
+    socket \
+    sockopt \
+    sockping \
+    sprintf \
+    stack \
+    stdio \
+    str2addr \
+    strod \
+    switch \
+    system \
+    testbit \
+    testfile \
+    threads \
+    timemac \
+    timetest \
+    tpd \
+    udpsrv \
+    vercheck \
+    version \
+    writev \
+    xnotify \
+    zerolen"
+
+inherit autotools multilib_script
+
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+
+# Do not install nspr in usr/include, but in usr/include/nspr, the
+# preferred path upstream.
+EXTRA_OECONF += "--includedir=${includedir}/nspr"
+
+do_compile_prepend() {
+	oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export
+}
+
+do_compile_append() {
+	oe_runmake -C pr/tests
+}
+
+do_install_append() {
+    install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
+    sed -i  \
+    -e 's:NSPRVERSION:${PV}:g' \
+    -e 's:OEPREFIX:${prefix}:g' \
+    -e 's:OELIBDIR:${libdir}:g' \
+    -e 's:OEINCDIR:${includedir}:g' \
+    -e 's:OEEXECPREFIX:${exec_prefix}:g' \
+    ${D}${libdir}/pkgconfig/nspr.pc
+
+    mkdir -p ${D}${libdir}/nspr/tests
+    install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests
+    install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests
+    cd ${B}/pr/tests
+    install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
+
+    # delete compile-et.pl and perr.properties from ${bindir} because these are
+    # only used to generate prerr.c and prerr.h files from prerr.et at compile
+    # time
+    rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties
+}
+
+FILES_${PN} = "${libdir}/lib*.so"
+FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \
+                ${includedir}/* ${datadir}/aclocal/* "
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
new file mode 100644
index 0000000000..c380c14491
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -0,0 +1,52 @@
+From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin at gmail.com>
+Date: Wed, 18 Dec 2019 12:29:50 +0100
+Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
+
+Not all current hardware supports it, particularly anything
+prior to armv8 does not.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
+---
+ nss/lib/freebl/Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/nss/lib/freebl/Makefile
++++ b/nss/lib/freebl/Makefile
+@@ -125,6 +125,9 @@ else
+         DEFINES += -DNSS_X86
+ endif
+ endif
++
++ifdef NSS_USE_ARM_HW_CRYPTO
++    DEFINES += -DNSS_USE_ARM_HW_CRYPTO
+ ifeq ($(CPU_ARCH),aarch64)
+     DEFINES += -DUSE_HW_AES
+     EXTRA_SRCS += aes-armv8.c gcm-aarch64.c
+@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm)
+         endif
+     endif
+ endif
++endif
+ 
+ ifeq ($(OS_TARGET),OSF1)
+     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
+--- a/nss/lib/freebl/gcm.c
++++ b/nss/lib/freebl/gcm.c
+@@ -17,6 +17,7 @@
+ 
+ #include <limits.h>
+ 
++#ifdef NSS_USE_ARM_HW_CRYPTO
+ /* old gcc doesn't support some poly64x2_t intrinsic */
+ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
+     (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
+@@ -25,6 +26,7 @@
+ /* We don't test on big endian platform, so disable this on big endian. */
+ #define USE_ARM_GCM
+ #endif
++#endif
+ 
+ /* Forward declarations */
+ SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
new file mode 100644
index 0000000000..d5403397e7
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
@@ -0,0 +1,48 @@
+From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin at gmail.com>
+Date: Wed, 22 Feb 2017 11:36:11 +0200
+Subject: [PATCH] nss: fix support cross compiling
+
+Let some make variables be assigned from outside makefile.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
+Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
+---
+ nss/coreconf/arch.mk    | 2 +-
+ nss/lib/freebl/Makefile | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
+index 06c276f..9c1eb51 100644
+--- a/nss/coreconf/arch.mk
++++ b/nss/coreconf/arch.mk
+@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m)
+ ifeq ($(OS_TEST),i86pc)
+     OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+ else
+-    OS_RELEASE := $(shell uname -r)
++    OS_RELEASE ?= $(shell uname -r)
+ endif
+ 
+ #
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index 0ce1425..ebeb411 100644
+--- a/nss/lib/freebl/Makefile
++++ b/nss/lib/freebl/Makefile
+@@ -36,6 +36,12 @@ ifdef USE_64
+ 	DEFINES += -DNSS_USE_64
+ endif
+ 
++ifeq ($(OS_TEST),mips)
++ifndef USE_64
++       DEFINES += -DNS_PTR_LE_32
++endif
++endif
++
+ ifdef USE_ABI32_FPU
+ 	DEFINES += -DNSS_USE_ABI32_FPU
+ endif
+-- 
+2.11.0
+
diff --git a/meta-oe/recipes-support/nss/nss/blank-cert9.db b/meta-oe/recipes-support/nss/nss/blank-cert9.db
new file mode 100644
index 0000000000000000000000000000000000000000..7d4bcf2582d510f7b51d4306706746178c41fbbc
GIT binary patch
literal 28672
zcmeH~OK;Oa6ou_RTxhB2E<!9aOCljO58HJ%sA+4Yh?2G;mFNOhcH&Bb(26FJSh8cs
zo*x9ii4|h*_1I~<VaFmmmVA3=?%XpopQn-L?dj2YR*1{%n@`zH7;ne(eQ!?)&+~ly
zZrHba)~#5p8ul;c|MmFZ3-M$7 at oz8K{Np`(`1t46udT0Jd$xfG1V8`;KmY_l00ck)
z1pYgLy&z~bn*RCtYE*m~e$2+BtLgM)o=?WZje~yL8Kk1yJ51jR&WYomsPp1krlfAY
zTxW+fc9>*&F{wuccN{o(-@&vF*Mi2=rvIMnr}O+nF`U&7>vtSn_P&Rbs?}Ky8c(Wy
zjHlCiaZ{VD-7zVX_dOET`quV08qKEvy)(=5Nl};AV#WCkI{QcIZ4Tp+IO%uabo%Gw
zb$Tw&dfn5rlx8?M?!7wd9t=ch|F}PRE;4CfWnXPyLz+9NM^RTo&4ii>H)%)`Qiv$T
z6m}^j6xtLr3b_q!wvuIJM at b$^mh+H{l4PSK`6x+7N|KY3WThl|DM at BZ4k^0jmFr_?
zU21mL?5x>Yv$JMr&CZ&g4ObbiGF)Z2%5YW8*_g92XJgLBWtKf-_T1%>%ttXG%{$eS
zYBldv^J+tBAFZg{N%A#3+VE(@qivFhlmlr@$fQC^bB9bSWKto|8uF|mf0u}BBX*0}
zE#lf?5t-0LWa%XNI!POIl4fv{w&*17(@6s8BvC9SLveCZ#&}%sqAae;;>B{Ttd?VC
zwHzy}<ycwyT3Ic}%F5TuTfTH=Xkyz-2ggY|Jx<aQa&okg#X?@zk`F>THeW0!r{#>I
zOpbCUp3t|IjGe}YCgyXi+by*cG}5N;l|Le%C-z2vk<Dk<+`g#)gD+GqSM5*j1Nyn$
zrm#Z+4+ww&2!H?xfB*=900 at 8p2!H?xfWWd6*rbi&{=clB7yAMM5C8!X009sH0T2KI
z5C8!X00Aa|`#%l>2!H?xfB*=900 at 8p2!H?xfB*<AKLOnTm;W1Mhadm~AOHd&00JNY
z0w4eaAOHd&fcrnr00 at 8p2!H?xfB*=900 at 8p2!H?xEI$F<|Cj$8V}~FB0w4eaAOHd&
O00JNY0w4eaAn+IM<WtiC

literal 0
HcmV?d00001

diff --git a/meta-oe/recipes-support/nss/nss/blank-key4.db b/meta-oe/recipes-support/nss/nss/blank-key4.db
new file mode 100644
index 0000000000000000000000000000000000000000..d47f08d04fe82197bc6a39ef9bf216b61c3dc77a
GIT binary patch
literal 36864
zcmeI)Pj3 at P7zXfN$JsbGQBr~AB4lZNXcZIG&g?%N!~w at RZQ3*mZcvLjSnGHJQ-_q;
zfnEyAB}g2&RFzt!s;9Q+svn?82vt4w)Lub+1tcV(r_THCZkH&E#0_CRt9bl+XXe at 2
z-!3E at BtAW}*d2u8!p7!$Fc6M0WtgUMN(jR+GWs>HU&&_aBAa~B at 8(POer3jZPkcWy
z`P|6mo5q3c<o&|$h3f?`|0Lhc-`j5z_Co*y5P$##AOHafyh#GRv9V&QWNyz4f_5)l
z4+p{NU=Sqlxq7ovTWyHd+T3D8Bzwhlw<A`X3!l`Q=fua2bK>mM!kM!TvAiVe%S-c%
z3-wjeY^*HS>WyPU|Gc`cqBpzpe$Fb^OQzAi(h0xnU+wA6R<JeL;Loijzon9De9p3p
z#j<&x2dsS&bURo2{gut`wO|mA#fw{5I^FnOa3?Jx9U!IyCGE<oQO@{`GkQTg?4?7j
zT^ZcDC&Q`CXRYFqve}B3z16-Pt_{+R(Ont+sC!R}lB!Z4v5JS2v+4HxTj6FJlid{)
z_3lZjs>-dC=2)>@Ht*E=lBEG at m5HOG%a-ncl?zv!TW+o%6M at t(ecb|EzZ|N02klX`
zt4bfM^s&kxX-L(j#-qlk<~TJ~YG$bksA=nFmZN0Ua-yURC8Og|ijowgB;_bcK}u4R
zk`$#RWhqHvO0H2GFE3gjC)-iY$u=k3oNRNl&B-<=+nnt1EQe<~Jj>x(4$tzr*XLfJ
zdwuTpqh8MRIrBJ=WFN&qHlL|2X|By at YV&GcsW)5E?zp5}heta++Tqc<lZQkDX^hKK
zuB2nTEakG4%SUzjs4ia at kLP-v=5d<GbJs%8aUG8$<C1dYl1?lx=?HO2rx=%Xo^eTl
zaY>3%$tZD|PGg>UZ#vCSrupe|beSwim&tN;nJh<_Nv<xF<>)fW)#XdMbkER%^<KJh
z;*##3xTISsE<0%%rsakIOTH1JvF&s at ZCXyp3uLFw;#In~lG$mj>-c=%+OriWV--Ir
z at Ap?=`e(JJ(t1RHN6FE5l?iI5sKEvS2tWV=5P$##AOHafKmY;|fWWW{<mtrl{6DOh
z7v}{52tWV=5P$##AOHafKmY;|U;#Y;<3 at l01Rwwb2tWV=5P$##AOHaf48H)L|A+q?
z;|w7H0SG_<0uX=z1Rwwb2tWV=c>c#d009U<00Izz00bZa0SG_<0uUH}0X+W?|24)L
zLI45~fB*y_009U<00Izz00ij&|2HRpH1roX2tWV=5P$##AOHafKmY;|fB*zuk3h>D
zExFsdFN1#n`o?DG at A=!mz4-R0mFHhS{`aGMCw_gf{mystq at 1=2M|VElc{X7l7&S-a
z;q0N#(b>ECcfWb-&&$6&y8G8Z_h0;R>*tJVW~XMJ>|DC|(5t=u;D?(BCuVNYzyF()
mPYwNr4FV8=00bZa0SG_<0uX=z1Rwx`ArdHzl*W_aDEtSkqPYeD

literal 0
HcmV?d00001

diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
new file mode 100644
index 0000000000..de812d27ba
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
@@ -0,0 +1,33 @@
+clang 3.9 add this warning to rightly flag undefined
+behavior, we relegate this to be just a warning instead
+of error and keep the behavior as it was. Right fix would
+be to not pass enum to the function with variadic arguments
+as last named argument
+
+Fixes errors like
+ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs]
+        va_start(ap, responseType0);
+                     ^
+ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here
+                                SECOidTag responseType0, ...)
+
+see
+https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start
+for more details
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Upstream-Status: Pending
+
+Index: nss-3.37.1/nss/coreconf/Werror.mk
+===================================================================
+--- nss-3.37.1.orig/nss/coreconf/Werror.mk
++++ nss-3.37.1/nss/coreconf/Werror.mk
+@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS
+     ifdef CC_IS_CLANG
+       # -Qunused-arguments : clang objects to arguments that it doesn't understand
+       #    and fixing this would require rearchitecture
+-      WARNING_CFLAGS += -Qunused-arguments
++      WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs
+       # -Wno-parentheses-equality : because clang warns about macro expansions
+       WARNING_CFLAGS += $(call disable_warning,parentheses-equality)
+       ifdef BUILD_OPT
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
new file mode 100644
index 0000000000..547594d5b6
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
@@ -0,0 +1,110 @@
+nss: fix incorrect shebang of perl
+
+Replace incorrect shebang of perl with `#!/usr/bin/env perl'.
+
+Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
+Upstream-Status: Pending
+---
+ nss/cmd/smimetools/smime  | 2 +-
+ nss/coreconf/cpdist.pl    | 2 +-
+ nss/coreconf/import.pl    | 2 +-
+ nss/coreconf/jniregen.pl  | 2 +-
+ nss/coreconf/outofdate.pl | 2 +-
+ nss/coreconf/release.pl   | 2 +-
+ nss/coreconf/version.pl   | 2 +-
+ nss/tests/clean_tbx       | 2 +-
+ nss/tests/path_uniq       | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime
+--- a/nss/cmd/smimetools/smime
++++ b/nss/cmd/smimetools/smime
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/env perl
+ 
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl
+index 800edfb..652187f 100755
+--- a/nss/coreconf/cpdist.pl
++++ b/nss/coreconf/cpdist.pl
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/env perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl
+index dd2d177..428eaa5 100755
+--- a/nss/coreconf/import.pl
++++ b/nss/coreconf/import.pl
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/env perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl
+index 2039180..5f4f69c 100755
+--- a/nss/coreconf/jniregen.pl
++++ b/nss/coreconf/jniregen.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/env perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl
+index 33d80bb..01fc097 100755
+--- a/nss/coreconf/outofdate.pl
++++ b/nss/coreconf/outofdate.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/env perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl
+index 7cde19d..b5df2f6 100755
+--- a/nss/coreconf/release.pl
++++ b/nss/coreconf/release.pl
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/env perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl
+index d2a4942..79359fe 100644
+--- a/nss/coreconf/version.pl
++++ b/nss/coreconf/version.pl
+@@ -1,4 +1,4 @@
+-#!/usr/sbin/perl
++#!/usr/bin/env perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx
+index 4de9555..a7def9f 100755
+--- a/nss/tests/clean_tbx
++++ b/nss/tests/clean_tbx
+@@ -1,4 +1,4 @@
+-#! /bin/perl
++#!/usr/bin/env perl
+ 
+ #######################################################################
+ #
+diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq
+index f29f60a..08fbffa 100755
+--- a/nss/tests/path_uniq
++++ b/nss/tests/path_uniq
+@@ -1,4 +1,4 @@
+-#! /bin/perl
++#!/usr/bin/env perl
+ 
+ ########################################################################
+ #
+-- 
+1.8.1.2
+
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
new file mode 100644
index 0000000000..43c09d13ea
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
@@ -0,0 +1,36 @@
+Fix nss multilib build on openSUSE 11.x 32bit
+
+While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will
+fail with error:
+
+* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled
+
+It caused by the '-m64' option which passed to host gcc.
+
+The nsinstall was built first while nss starting to build, it only runs
+on host to install built files, it doesn't need any cross-compling or
+multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
+error.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
+===================================================
+Index: nss-3.24/nss/coreconf/nsinstall/Makefile
+===================================================================
+--- nss-3.24.orig/nss/coreconf/nsinstall/Makefile
++++ nss-3.24/nss/coreconf/nsinstall/Makefile
+@@ -18,6 +18,13 @@ INTERNAL_TOOLS  = 1
+ 
+ include $(DEPTH)/coreconf/config.mk
+ 
++# nsinstall is unfit for cross-compiling/multilib-build since it was
++# always run on local host to install built files. This change intends
++# to clean the '-m64' from ARCHFLAG and LDFLAGS.
++ARCHFLAG =
++LDFLAGS =
++# CFLAGS =
++
+ ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+ PROGRAM		=
+ else
diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
new file mode 100644
index 0000000000..7661dc93a0
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
@@ -0,0 +1,26 @@
+nss:no rpath for cross compiling
+
+Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
+Upstream-Status: Inappropriate [configuration]
+---
+ nss/cmd/platlibs.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
+--- a/nss/cmd/platlibs.mk
++++ b/nss/cmd/platlibs.mk
+@@ -18,9 +18,9 @@ endif
+ 
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
+ endif
+ endif
+ 
+-- 
+1.8.1.2
+
diff --git a/meta-oe/recipes-support/nss/nss/nss.pc.in b/meta-oe/recipes-support/nss/nss/nss.pc.in
new file mode 100644
index 0000000000..402b4ecb33
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=OEPREFIX
+exec_prefix=OEEXECPREFIX
+libdir=OELIBDIR
+includedir=OEINCDIR
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3
+Cflags: -IOEINCDIR
diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch
new file mode 100644
index 0000000000..3a817faaa6
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch
@@ -0,0 +1,23 @@
+nss does not build on mips with clang because wrong types are used?
+
+pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
+     if (addend < MP_DIGIT_MAX) {
+       ~~~~~~ ^ ~~~~~~~~~~~~
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Upstream-Status: Pending
+Index: nss-3.37.1/nss/lib/freebl/pqg.c
+===================================================================
+--- nss-3.37.1.orig/nss/lib/freebl/pqg.c
++++ nss-3.37.1/nss/lib/freebl/pqg.c
+@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in
+ 
+ static SECStatus
+ addToSeed(const SECItem *seed,
+-          unsigned long addend,
+-          int seedlen, /* g in 186-1 */
++          unsigned long long  addend,
++          int                 seedlen, /* g in 186-1 */
+           SECItem *seedout)
+ {
+     mp_int s, sum, modulus, tmp;
diff --git a/meta-oe/recipes-support/nss/nss/signlibs.sh b/meta-oe/recipes-support/nss/nss/signlibs.sh
new file mode 100644
index 0000000000..a74e499f8c
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/signlibs.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# signlibs.sh
+#
+# (c)2010 Wind River Systems, Inc.
+#
+# regenerates the .chk files for the NSS libraries that require it
+# since the ones that are built have incorrect checksums that were
+# calculated on the host where they really need to be done on the
+# target
+
+CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null`
+SIGN_BINARY=`which shlibsign`
+for I in $CHK_FILES
+do
+       DN=`dirname $I`
+       BN=`basename $I .chk`
+       FN=$DN/$BN.so
+       $SIGN_BINARY -i $FN
+done
diff --git a/meta-oe/recipes-support/nss/nss/system-pkcs11.txt b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt
new file mode 100644
index 0000000000..1a264e9cc4
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/meta-oe/recipes-support/nss/nss_3.50.bb b/meta-oe/recipes-support/nss/nss_3.50.bb
new file mode 100644
index 0000000000..e9855d7a7e
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss_3.50.bb
@@ -0,0 +1,273 @@
+SUMMARY = "Mozilla's SSL and TLS implementation"
+DESCRIPTION = "Network Security Services (NSS) is a set of libraries \
+designed to support cross-platform development of \
+security-enabled client and server applications. \
+Applications built with NSS can support SSL v2 and v3, \
+TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \
+v3 certificates, and other security standards."
+HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
+SECTION = "libs"
+
+DEPENDS = "sqlite3 nspr zlib nss-native"
+DEPENDS_class-native = "sqlite3-native nspr-native zlib-native"
+
+LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)"
+
+LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
+                    file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
+                    file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
+
+VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}"
+
+SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \
+           file://nss.pc.in \
+           file://signlibs.sh \
+           file://0001-nss-fix-support-cross-compiling.patch \
+           file://nss-no-rpath-for-cross-compiling.patch \
+           file://nss-fix-incorrect-shebang-of-perl.patch \
+           file://disable-Wvarargs-with-clang.patch \
+           file://pqg.c-ULL_addend.patch \
+           file://blank-cert9.db \
+           file://blank-key4.db \
+           file://system-pkcs11.txt \
+           file://nss-fix-nsinstall-build.patch \
+           file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
+           "
+
+SRC_URI[md5sum] = "e0366615e12b147cebc136c915baea37"
+SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7"
+
+UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
+UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
+
+inherit siteinfo
+
+TD = "${S}/tentative-dist"
+TDS = "${S}/tentative-dist-staging"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_configure_prepend_libc-musl () {
+    sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk
+}
+
+do_compile_prepend_class-native() {
+    export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr
+    export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE}
+    export NSS_ENABLE_WERROR=0
+}
+
+do_compile_prepend_class-nativesdk() {
+    export LDFLAGS=""
+}
+
+do_compile_prepend_class-native() {
+    # Need to set RPATH so that chrpath will do its job correctly
+    RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}"
+}
+
+do_compile() {
+    export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr
+
+    export CROSS_COMPILE=1
+    export NATIVE_CC="${BUILD_CC}"
+    # Additional defines needed on Centos 7
+    export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux"
+    export BUILD_OPT=1
+
+    export FREEBL_NO_DEPEND=1
+    export FREEBL_LOWHASH=1
+
+    export LIBDIR=${libdir}
+    export MOZILLA_CLIENT=1
+    export NS_USE_GCC=1
+    export NSS_USE_SYSTEM_SQLITE=1
+    export NSS_ENABLE_ECC=1
+
+    ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)}
+
+    export OS_RELEASE=3.4
+    export OS_TARGET=Linux
+    export OS_ARCH=Linux
+
+    if [ "${TARGET_ARCH}" = "powerpc" ]; then
+        OS_TEST=ppc
+    elif [ "${TARGET_ARCH}" = "powerpc64" ]; then
+        OS_TEST=ppc64
+    elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then
+        OS_TEST=mips
+    elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then
+        OS_TEST="aarch64"
+    else
+        OS_TEST="${TARGET_ARCH}"
+    fi
+
+    if [ "${SITEINFO_BITS}" = "64" ]; then
+        export USE_64=1
+    elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then
+        export USE_X32=1
+    fi
+
+    export NSS_DISABLE_GTESTS=1
+
+    # We can modify CC in the environment, but if we set it via an
+    # argument to make, nsinstall, a host program, will also build with it!
+    #
+    # nss pretty much does its own thing with CFLAGS, so we put them into CC.
+    # Optimization will get clobbered, but most of the stuff will survive.
+    # The motivation for this is to point to the correct place for debug
+    # source files and CFLAGS does that.  Nothing uses CCC.
+    #
+    export CC="${CC} ${CFLAGS}"
+    make -C ./nss CCC="${CXX} -g" \
+        OS_TEST=${OS_TEST} \
+        RPATH="${RPATH}"
+}
+
+do_compile[vardepsexclude] += "SITEINFO_BITS"
+
+do_install_prepend_class-nativesdk() {
+    export LDFLAGS=""
+}
+
+do_install() {
+    export CROSS_COMPILE=1
+    export NATIVE_CC="${BUILD_CC}"
+    export BUILD_OPT=1
+
+    export FREEBL_NO_DEPEND=1
+
+    export LIBDIR=${libdir}
+    export MOZILLA_CLIENT=1
+    export NS_USE_GCC=1
+    export NSS_USE_SYSTEM_SQLITE=1
+    export NSS_ENABLE_ECC=1
+
+    export OS_RELEASE=3.4
+    export OS_TARGET=Linux
+    export OS_ARCH=Linux
+
+    if [ "${TARGET_ARCH}" = "powerpc" ]; then
+        OS_TEST=ppc
+    elif [ "${TARGET_ARCH}" = "powerpc64" ]; then
+        OS_TEST=ppc64
+    elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then
+        OS_TEST=mips
+    elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then
+        CPU_ARCH=aarch64
+        OS_TEST="aarch64"
+    else
+        OS_TEST="${TARGET_ARCH}"
+    fi
+    if [ "${SITEINFO_BITS}" = "64" ]; then
+        export USE_64=1
+    elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then
+        export USE_X32=1
+    fi
+
+    export NSS_DISABLE_GTESTS=1
+
+    make -C ./nss \
+        CCC="${CXX}" \
+        OS_TEST=${OS_TEST} \
+        SOURCE_LIB_DIR="${TD}/${libdir}" \
+        SOURCE_BIN_DIR="${TD}/${bindir}" \
+        install
+
+    install -d ${D}/${libdir}/
+    for file in ${S}/dist/*.OBJ/lib/*.so; do
+        echo "Installing `basename $file`..."
+        cp $file  ${D}/${libdir}/
+    done
+
+    for shared_lib in ${TD}/${libdir}/*.so.*; do
+        if [ -f $shared_lib ]; then
+            cp $shared_lib ${D}/${libdir}
+            ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe)
+        fi
+    done
+    for shared_lib in ${TD}/${libdir}/*.so; do
+        if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then
+            cp $shared_lib ${D}/${libdir}
+        fi
+    done
+
+    install -d ${D}/${includedir}/nss3
+    install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/*
+
+    install -d ${D}/${bindir}
+    for binary in ${TD}/${bindir}/*; do
+        install -m 755 -t ${D}/${bindir} $binary
+    done
+}
+
+do_install[vardepsexclude] += "SITEINFO_BITS"
+
+do_install_append() {
+    # Create empty .chk files for the NSS libraries at build time. They could
+    # be regenerated at target's boot time.
+    for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do
+        touch ${D}/${libdir}/$file
+        chmod 755 ${D}/${libdir}/$file
+    done
+    install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh
+
+    install -d ${D}${libdir}/pkgconfig/
+    sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc
+    sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc
+    sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc
+    sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc
+    sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc
+}
+
+do_install_append_class-target() {
+    # It used to call certutil to create a blank certificate with empty password at
+    # build time, but the checksum of key4.db changes every time when certutil is called.
+    # It causes non-determinism issue, so provide databases with a blank certificate
+    # which are originally from output of nss in qemux86-64 build. You can get these
+    # databases by:
+    # certutil -N -d sql:/database/path/ --empty-password
+    install -d ${D}${sysconfdir}/pki/nssdb/
+    install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db
+    install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db
+    install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt
+}
+
+PACKAGE_WRITE_DEPS += "nss-native"
+pkg_postinst_${PN} () {
+    if [ -n "$D" ]; then
+        for I in $D${libdir}/lib*.chk; do
+            DN=`dirname $I`
+            BN=`basename $I .chk`
+            FN=$DN/$BN.so
+            shlibsign -i $FN
+            if [ $? -ne 0 ]; then
+                exit 1
+            fi
+        done
+    else
+        signlibs.sh
+    fi
+}
+
+PACKAGES =+ "${PN}-smime"
+FILES_${PN}-smime = "\
+    ${bindir}/smime \
+"
+
+FILES_${PN} = "\
+    ${sysconfdir} \
+    ${bindir} \
+    ${libdir}/lib*.chk \
+    ${libdir}/lib*.so \
+    "
+
+FILES_${PN}-dev = "\
+    ${libdir}/nss \
+    ${libdir}/pkgconfig/* \
+    ${includedir}/* \
+    "
+
+RDEPENDS_${PN}-smime = "perl"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.25.1


From schnitzeltony at gmail.com  Sun Mar  8 21:06:30 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Sun,  8 Mar 2020 22:06:30 +0100
Subject: [oe] [PATCH] mutter: add patch from upstream to fix build with mesa
	>= 20.0.x
Message-ID: <20200308210630.23306-1-schnitzeltony@gmail.com>

Fixes:
| FAILED: cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o
| arm-mortsgna-linux-gnueabi-gcc -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 --sysroot=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot -Icogl/cogl/d9c41d2@@mutter-cogl-5 at sha -Icogl/cogl -I../mutter-3.34.4/cogl/cogl -Icogl -I../mutter-3.34.4/cogl -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/libdrm -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/cairo -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/pixman-1 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/uuid -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/freetype2 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/libpng16 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/gdk-pixbuf-2.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -O2 -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0=/usr/src/debug/mutter/3.34.4-r0 -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0=/usr/src/debug/mutter/3.34.4-r0 -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot= -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot-native= -fPIC -pthread '-DCOGL_LOCALEDIR="/usr/share/locale"' -DCOGL_COMPILATION '-DCOGL_GL_LIBNAME="libGL.so.1"' '-DCOGL_GLES2_LIBNAME="libGLESv2.so"' -MD -MQ 'cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o' -MF 'cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o.d' -o 'cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o' -c ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c
| ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c: In function '_cogl_winsys_display_setup':
| ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:467:23: error: 'CoglRendererEGL' {aka 'struct _CoglRendererEGL'} has no member named 'pf_eglBindWaylandDisplay'
|   467 |       if (egl_renderer->pf_eglBindWaylandDisplay)
|       |                       ^~
| ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:468:14: error: 'CoglRendererEGL' {aka 'struct _CoglRendererEGL'} has no member named 'pf_eglBindWaylandDisplay'
|   468 |  egl_renderer->pf_eglBindWaylandDisplay (egl_renderer->edpy,
|       |              ^~
| ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c: In function '_cogl_egl_create_image':
| ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:902:17: error: 'EGL_WAYLAND_BUFFER_WL' undeclared (first use in this function)
|   902 |   if (target == EGL_WAYLAND_BUFFER_WL)
|       |                 ^~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../0001-EGL-Include-EGL-eglmesaext.h.patch   | 72 +++++++++++++++++++
 .../recipes-gnome/mutter/mutter_3.34.4.bb     |  1 +
 2 files changed, 73 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch

diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch
new file mode 100644
index 000000000..b4fd03983
--- /dev/null
+++ b/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch
@@ -0,0 +1,72 @@
+From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH] EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+
+Upstream-Status: Applied [1]
+
+[1] https://gitlab.gnome.org/GNOME/mutter/-/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90
+---
+ cogl/cogl/meson.build       | 2 +-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c     | 1 +
+ src/backends/meta-egl.h     | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
+index 261955796..b0e66bff3 100644
+--- a/cogl/cogl/meson.build
++++ b/cogl/cogl/meson.build
+@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
+ built_headers += [cogl_gl_header_h]
+ 
+ if have_egl
+-  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
++  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
+ else
+   cogl_egl_includes_string = ''
+ endif
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d5b..db0b74f76 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 6554be935..fdeff4f77 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index f2a816445..4591e7d85 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -28,6 +28,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+-- 
+2.21.1
+
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
index b4ddc5dad..7979802d2 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
@@ -24,6 +24,7 @@ inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-ev
 
 SRC_URI[archive.md5sum] = "de19a6de98a2250dd7efdfca14359e39"
 SRC_URI[archive.sha256sum] = "0134513515f605dd0858154d0b54d2e23c5779d52590533e266d407251e20ba2"
+SRC_URI += "file://0001-EGL-Include-EGL-eglmesaext.h.patch"
 
 # x11 is still manadatory - see meson.build
 REQUIRED_DISTRO_FEATURES = "x11"
-- 
2.21.1


From changqing.li at windriver.com  Mon Mar  9 03:35:37 2020
From: changqing.li at windriver.com (Changqing Li)
Date: Mon, 9 Mar 2020 11:35:37 +0800
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
	<CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
	<CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
Message-ID: <d3bba1f6-6c0c-2ad1-2627-e0824a370a4d@windriver.com>


On 3/7/20 12:12 AM, Khem Raj wrote:
> On Thu, Mar 5, 2020 at 11:55 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>> Can we fix mozjs instead?
> perhaps thats better fix, maybe it can made optional via packageconfig ?
> or marked incompatible if meta-python is not included

I find not only mozjs have the problem.? I find that packages depend on 
by mozjs

is deleted by commit 
https://git.openembedded.org/meta-openembedded/commit/?id=505774658338002a92c2e32c4c57c55f36c5e36e, 


which is for drop of python2.? So I tried to move python3 version' 
packages depend by mozjs

back to meta-oe,? but after mozjs's problem is fixed.? other recipes 
still have similar problems,

which depend on other python packages.

>> On Fri, Mar 6, 2020 at 6:38 AM <changqing.li at windriver.com> wrote:
>>
>>> From: Changqing Li <changqing.li at windriver.com>
>>>
>>> yocto-check-layer/test_world failed since error:
>>> ERROR: test_world (common.CommonCheckLayer)
>>> ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
>>> /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
>>> DEPENDS on or otherwise requires it). Close matches:
>>>    python3-numpy-native
>>>    python3-pycairo-native
>>>    python3-rpm-native
>>> ERROR: Required build target 'meta-world-pkgdata' has no buildable
>>> providers.
>>> Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
>>> 'mozjs', 'python3-pytoml-native']
>>>
>>> mozjs depend on recipe under meta-python, but meta-python
>>> isn't in LAYERDEPENDS, so error occurred. Fix by add
>>> it into LAYERDEPENDS.
>>>
>>> Signed-off-by: Changqing Li <changqing.li at windriver.com>
>>> ---
>>>   meta-oe/conf/layer.conf | 5 ++++-
>>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
>>> index c537736..0ce0ad2 100644
>>> --- a/meta-oe/conf/layer.conf
>>> +++ b/meta-oe/conf/layer.conf
>>> @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
>>>   # cause compatibility issues with other layers
>>>   LAYERVERSION_openembedded-layer = "1"
>>>
>>> -LAYERDEPENDS_openembedded-layer = "core"
>>> +LAYERDEPENDS_openembedded-layer = " \
>>> +    core \
>>> +    meta-python \
>>> +"
>>>
>>>   LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
>>>
>>> --
>>> 2.7.4
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From zhengrq.fnst at cn.fujitsu.com  Mon Mar  9 05:15:05 2020
From: zhengrq.fnst at cn.fujitsu.com (Zheng Ruoqin)
Date: Mon, 9 Mar 2020 13:15:05 +0800
Subject: [oe] [meta-oe][PATCH] dnf-plugin-tui: upgrade 1.0 -> 1.1
Message-ID: <1583730905-97634-1-git-send-email-zhengrq.fnst@cn.fujitsu.com>

Signed-off-by: Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com>
---
 meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
index 5ecf64966..406494ebb 100644
--- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
+++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master "
-SRCREV = "31d6866d5eda02be9a6bfb1fca9e9095b12eecd1"
-PV = "1.0"
+SRCREV = "c5416adeb210154dc4ccc4c3e1c5297d83ebd41e"
+PV = "1.1"
 
 SRC_URI_append_class-target = "file://oe-remote.repo.sample"
 
-- 
2.20.1




From changqing.li at windriver.com  Mon Mar  9 06:04:28 2020
From: changqing.li at windriver.com (changqing.li at windriver.com)
Date: Mon, 9 Mar 2020 14:04:28 +0800
Subject: [oe] [meta-python][PATCH] python3-sqlparse: change shebang to
	python3
Message-ID: <1583733868-37088-1-git-send-email-changqing.li@windriver.com>

From: Changqing Li <changqing.li at windriver.com>

we have offcially dropped python2, so it is possible
that our code run on python3 only host, so change
shebang to python3 to avoid error like:
python: command not found

Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
 .../recipes-devtools/python/python-sqlparse.inc    |  2 +
 .../0001-sqlparse-change-shebang-to-python3.patch  | 51 ++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch

diff --git a/meta-python/recipes-devtools/python/python-sqlparse.inc b/meta-python/recipes-devtools/python/python-sqlparse.inc
index f71f815..14e683d 100644
--- a/meta-python/recipes-devtools/python/python-sqlparse.inc
+++ b/meta-python/recipes-devtools/python/python-sqlparse.inc
@@ -4,6 +4,8 @@ SECTION = "devel/python"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc"
 
+SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch"
+
 SRC_URI[md5sum] = "2ce34181d6b7b234c9f3c0ecd1ffb93e"
 SRC_URI[sha256sum] = "7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873"
 
diff --git a/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch
new file mode 100644
index 0000000..ad6c50f
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch
@@ -0,0 +1,51 @@
+From 10c9d3341d64d697f678a64ae707f6bda21565bb Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li at windriver.com>
+Date: Mon, 9 Mar 2020 13:10:37 +0800
+Subject: [PATCH] sqlparse: change shebang to python3
+
+Upstream-Status: Pending
+
+Don't send upstream since upstream still support python2,
+we can only make this change after python2 is offcially
+dropped.
+
+Signed-off-by: Changqing Li <changqing.li at windriver.com>
+---
+ setup.py             | 2 +-
+ sqlparse/__main__.py | 2 +-
+ sqlparse/cli.py      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 345d0ce..ce3abc3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2009-2018 the sqlparse authors and contributors
+diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py
+index 867d75d..dd0c074 100644
+--- a/sqlparse/__main__.py
++++ b/sqlparse/__main__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2009-2018 the sqlparse authors and contributors
+diff --git a/sqlparse/cli.py b/sqlparse/cli.py
+index 25555a5..8bf050a 100755
+--- a/sqlparse/cli.py
++++ b/sqlparse/cli.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2009-2018 the sqlparse authors and contributors
+-- 
+2.7.4
+
-- 
2.7.4


From akuster808 at gmail.com  Mon Mar  9 19:30:46 2020
From: akuster808 at gmail.com (akuster808)
Date: Mon, 9 Mar 2020 12:30:46 -0700
Subject: [oe] [PATCH] mutter: add patch from upstream to fix build with
 mesa >= 20.0.x
In-Reply-To: <20200308210630.23306-1-schnitzeltony@gmail.com>
References: <20200308210630.23306-1-schnitzeltony@gmail.com>
Message-ID: <c4517e41-78a8-ef05-33ea-5b721d28e6f1@gmail.com>



On 3/8/20 2:06 PM, Andreas M?ller wrote:
> Fixes:
> | FAILED: cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o
> | arm-mortsgna-linux-gnueabi-gcc -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 --sysroot=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot -Icogl/cogl/d9c41d2@@mutter-cogl-5 at sha -Icogl/cogl -I../mutter-3.34.4/cogl/cogl -Icogl -I../mutter-3.34.4/cogl -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/libdrm -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/cairo -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/pixman-1 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/uuid -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/freetype2 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/libpng16 -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/gdk-pixbuf-2.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -O2 -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0=/usr/src/debug/mutter/3.34.4-r0 -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0=/usr/src/debug/mutter/3.34.4-r0 -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot= -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot-native= -fPIC -pthread '-DCOGL_LOCALEDIR="/usr/share/locale"' -DCOGL_COMPILATION '-DCOGL_GL_LIBNAME="libGL.so.1"' '-DCOGL_GLES2_LIBNAME="libGLESv2.so"' -MD -MQ 'cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o' -MF 'cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o.d' -o 'cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o' -c ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c
> | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c: In function '_cogl_winsys_display_setup':
> | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:467:23: error: 'CoglRendererEGL' {aka 'struct _CoglRendererEGL'} has no member named 'pf_eglBindWaylandDisplay'
> |   467 |       if (egl_renderer->pf_eglBindWaylandDisplay)
> |       |                       ^~
> | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:468:14: error: 'CoglRendererEGL' {aka 'struct _CoglRendererEGL'} has no member named 'pf_eglBindWaylandDisplay'
> |   468 |  egl_renderer->pf_eglBindWaylandDisplay (egl_renderer->edpy,
> |       |              ^~
> | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c: In function '_cogl_egl_create_image':
> | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:902:17: error: 'EGL_WAYLAND_BUFFER_WL' undeclared (first use in this function)
> |   902 |   if (target == EGL_WAYLAND_BUFFER_WL)
> |       |                 ^~~~~~~~~~~~~~~~~~~~~
>
> Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> ---
>  .../0001-EGL-Include-EGL-eglmesaext.h.patch   | 72 +++++++++++++++++++
>  .../recipes-gnome/mutter/mutter_3.34.4.bb     |  1 +
>  2 files changed, 73 insertions(+)
>  create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch
>
> diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch
> new file mode 100644
> index 000000000..b4fd03983
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch
> @@ -0,0 +1,72 @@
> +From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001
> +From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
> +Date: Sun, 20 Oct 2019 12:04:31 +0200
> +Subject: [PATCH] EGL: Include EGL/eglmesaext.h
> +
> +The eglext.h shipped by libglvnd does not include the Mesa extensions,
> +unlike the header shipped in Mesa.
> +
> +Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
> +
> +Upstream-Status: Applied [1]

Missing Signed-off-by:
> +
> +[1] https://gitlab.gnome.org/GNOME/mutter/-/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90
> +---
> + cogl/cogl/meson.build       | 2 +-
> + src/backends/meta-egl-ext.h | 1 +
> + src/backends/meta-egl.c     | 1 +
> + src/backends/meta-egl.h     | 1 +
> + 4 files changed, 4 insertions(+), 1 deletion(-)
> +
> +diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
> +index 261955796..b0e66bff3 100644
> +--- a/cogl/cogl/meson.build
> ++++ b/cogl/cogl/meson.build
> +@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
> + built_headers += [cogl_gl_header_h]
> + 
> + if have_egl
> +-  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
> ++  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
> + else
> +   cogl_egl_includes_string = ''
> + endif
> +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
> +index 8705e7d5b..db0b74f76 100644
> +--- a/src/backends/meta-egl-ext.h
> ++++ b/src/backends/meta-egl-ext.h
> +@@ -29,6 +29,7 @@
> + 
> + #include <EGL/egl.h>
> + #include <EGL/eglext.h>
> ++#include <EGL/eglmesaext.h>
> + 
> + /*
> +  * This is a little different to the tests shipped with EGL implementations,
> +diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
> +index 6554be935..fdeff4f77 100644
> +--- a/src/backends/meta-egl.c
> ++++ b/src/backends/meta-egl.c
> +@@ -27,6 +27,7 @@
> + 
> + #include <EGL/egl.h>
> + #include <EGL/eglext.h>
> ++#include <EGL/eglmesaext.h>
> + #include <gio/gio.h>
> + #include <glib.h>
> + #include <glib-object.h>
> +diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
> +index f2a816445..4591e7d85 100644
> +--- a/src/backends/meta-egl.h
> ++++ b/src/backends/meta-egl.h
> +@@ -28,6 +28,7 @@
> + 
> + #include <EGL/egl.h>
> + #include <EGL/eglext.h>
> ++#include <EGL/eglmesaext.h>
> + #include <glib-object.h>
> + 
> + #define META_EGL_ERROR meta_egl_error_quark ()
> +-- 
> +2.21.1
> +
> diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
> index b4ddc5dad..7979802d2 100644
> --- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
> +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
> @@ -24,6 +24,7 @@ inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-ev
>  
>  SRC_URI[archive.md5sum] = "de19a6de98a2250dd7efdfca14359e39"
>  SRC_URI[archive.sha256sum] = "0134513515f605dd0858154d0b54d2e23c5779d52590533e266d407251e20ba2"
> +SRC_URI += "file://0001-EGL-Include-EGL-eglmesaext.h.patch"
>  
>  # x11 is still manadatory - see meson.build
>  REQUIRED_DISTRO_FEATURES = "x11"



From raj.khem at gmail.com  Mon Mar  9 19:37:08 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon,  9 Mar 2020 12:37:08 -0700
Subject: [oe] [meta-networking][PATCH 1/5] wireshark: Inherit mime and
	mime-xdg
Message-ID: <20200309193712.1028142-1-raj.khem@gmail.com>

Fixes
ERROR: QA Issue: package contains mime types but does not inherit mime: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/mime/packages/wireshark.xml' [mime]
ERROR: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/applications/wireshark.desktop' [mime-xdg]

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
index b2bcf5fd96..91a7e1a36d 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208fe
 
 PE = "1"
 
-inherit cmake pkgconfig python3native perlnative upstream-version-is-even
+inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg
 
 PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}"
 
-- 
2.25.1


From raj.khem at gmail.com  Mon Mar  9 19:37:09 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon,  9 Mar 2020 12:37:09 -0700
Subject: [oe] [meta-networking][PATCH 2/5] kronoset: Disable sign-compare
	with clang
In-Reply-To: <20200309193712.1028142-1-raj.khem@gmail.com>
References: <20200309193712.1028142-1-raj.khem@gmail.com>
Message-ID: <20200309193712.1028142-2-raj.khem@gmail.com>

clang isn't suppressing warnings from system headers like it should
Fixes
../../git/libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare]
                for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
                                                             ^~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../recipes-extended/kronosnet/kronosnet_1.15.bb            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb
index 24aa27a87b..6bf268da9d 100644
--- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb
+++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb
@@ -15,3 +15,9 @@ SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1"
 inherit autotools
 
 S = "${WORKDIR}/git"
+
+# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare]
+# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+#                                                             ^~~~~~~~~~~~~~~~~~~~~~~
+CFLAGS_append_toolchain-clang = " -Wno-sign-compare"
+
-- 
2.25.1


From raj.khem at gmail.com  Mon Mar  9 19:37:10 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon,  9 Mar 2020 12:37:10 -0700
Subject: [oe] [meta-oe][PATCH 3/5] abseil-cpp: Depend on libexecinfo on musl
In-Reply-To: <20200309193712.1028142-1-raj.khem@gmail.com>
References: <20200309193712.1028142-1-raj.khem@gmail.com>
Message-ID: <20200309193712.1028142-3-raj.khem@gmail.com>

Needed for execinfo to work
Fixes
absl/debugging/internal/stacktrace_generic-inl.inc:14:10: fatal error: 'execinfo.h' file not found
         ^~~~~~~~~~~~
1 error generated.

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb
index 115ffc69f9..b6ea5fdecc 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb
@@ -19,6 +19,8 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH}                \
 
 S = "${WORKDIR}/git"
 
+DEPENDS_append_libc-musl = " libexecinfo "
+
 ASNEEDED_class-native = ""
 ASNEEDED_class-nativesdk = ""
 
-- 
2.25.1


From raj.khem at gmail.com  Mon Mar  9 19:37:11 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon,  9 Mar 2020 12:37:11 -0700
Subject: [oe] [meta-multimedia][PATCH 4/5] minidlna: Use clock_gettime API
	insteaad of syscall
In-Reply-To: <20200309193712.1028142-1-raj.khem@gmail.com>
References: <20200309193712.1028142-1-raj.khem@gmail.com>
Message-ID: <20200309193712.1028142-4-raj.khem@gmail.com>

Makes it 64bit time_t safe

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../recipes-multimedia/minidlna/minidlna.inc  |  1 +
 ...for-clock_gettime-seprately-from-__N.patch | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch

diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
index 187ff536aa..04648a5d28 100644
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
@@ -12,6 +12,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
            file://minidlna-daemon.init.d \
            file://minidlna.service \
            file://0001-Update-Gettext-version.patch \
+           file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \
            "
 
 S = "${WORKDIR}/git"
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch
new file mode 100644
index 0000000000..24a307db19
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch
@@ -0,0 +1,36 @@
+From 1118b1912916924bbfa3fd4dced9dfed01fbf0e0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Mon, 9 Mar 2020 09:44:33 -0700
+Subject: [PATCH] configure: Check for clock_gettime seprately from
+ __NR_clock_gettime
+
+This helps prioritize using clock_gettime API from libc over syscall
+since direct use of __NR_clock_gettime is not time64-safe
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ configure.ac | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,6 +125,10 @@ case $host in
+ esac
+ 
+ AC_CHECK_HEADERS(syscall.h sys/syscall.h mach/mach_time.h)
++
++AC_MSG_CHECKING([for clock_gettime])
++AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],)
++
+ AC_MSG_CHECKING([for __NR_clock_gettime syscall])
+ AC_COMPILE_IFELSE(
+     [AC_LANG_PROGRAM(
+@@ -143,7 +147,6 @@ AC_COMPILE_IFELSE(
+     ],
+     [
+         AC_MSG_RESULT([no])
+-        AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],)
+     ])
+ 
+ AC_CHECK_HEADER(linux/netlink.h,
-- 
2.25.1


From raj.khem at gmail.com  Mon Mar  9 19:37:12 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon,  9 Mar 2020 12:37:12 -0700
Subject: [oe] [meta-multimedia][PATCH 5/5] libde265: Update to 1.0.5
In-Reply-To: <20200309193712.1028142-1-raj.khem@gmail.com>
References: <20200309193712.1028142-1-raj.khem@gmail.com>
Message-ID: <20200309193712.1028142-5-raj.khem@gmail.com>

License-Update: Examples are now MIT see [1]

[1] https://github.com/strukturag/libde265/commit/4488ae0c3b287ef6f24a958004481b2b337abc76

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../libde265/{libde265_1.0.2.bb => libde265_1.0.5.bb}      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-multimedia/recipes-multimedia/libde265/{libde265_1.0.2.bb => libde265_1.0.5.bb} (69%)

diff --git a/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb
similarity index 69%
rename from meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb
rename to meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb
index cd075ffe1b..613dcc71bf 100644
--- a/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb
+++ b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb
@@ -4,13 +4,12 @@ simple integration into other software."
 HOMEPAGE = "http://www.libde265.org/"
 SECTION = "libs/multimedia"
 
-LICENSE = "LGPLv3"
+LICENSE = "LGPLv3 & MIT"
 LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=852f345c1c52c9160f9a7c36bb997546"
+LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f"
 
 SRC_URI = "https://github.com/strukturag/libde265/releases/download/v${PV}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "93520b378df25f3a94e962f2b54872cc"
-SRC_URI[sha256sum] = "eaa0348839c2935dd90647d72c6dd4a043e36361cb3c33d2b04df10fbcebd3cb"
+SRC_URI[sha256sum] = "e3f277d8903408615a5cc34718b391b83c97c646faea4f41da93bac5ee08a87f"
 
 EXTRA_OECONF = "--disable-sherlock265 --disable-dec265"
 
-- 
2.25.1


From scott.branden at broadcom.com  Tue Mar 10 02:49:36 2020
From: scott.branden at broadcom.com (Scott Branden)
Date: Mon,  9 Mar 2020 19:49:36 -0700
Subject: [oe] [meta-python][PATCH] python3-pycryptodomex: add 3.9.4 recipe
Message-ID: <20200310024936.18941-1-scott.branden@broadcom.com>

From: Rajesh Ravi <rajesh.ravi at broadcom.com>

Add python3-pycryptodomex 3.9.4 recipe needed to build
such components as optee 3.8.0.

Signed-off-by: Rajesh Ravi <rajesh.ravi at broadcom.com>
Signed-off-by: Scott Branden <scott.branden at broadcom.com>
---
 .../python/python3-pycryptodomex_3.9.4.bb     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb

diff --git a/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
new file mode 100644
index 000000000..be6b10f3f
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Cryptographic library for Python"
+DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\
+ cryptographic primitives."
+HOMEPAGE = "http://www.pycryptodome.org"
+LICENSE = "PD & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
+
+SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
+SRC_URI[sha256sum] = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
+
+inherit pypi
+inherit setuptools3
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-io \
+    ${PYTHON_PN}-math \
+"
+
+RDEPENDS_${PN}-tests += " \
+    ${PYTHON_PN}-unittest \
+"
+
+PACKAGES =+ "${PN}-tests"
+
+FILES_${PN}-tests += " \
+    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
+    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
+"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1


From wangmy at cn.fujitsu.com  Tue Mar 10 11:29:18 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 10 Mar 2020 04:29:18 -0700
Subject: [oe]   [meta-networking][PATCH] kea: upgrade 1.7.4 -> 1.7.5
Message-ID: <1583839758-124554-1-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../recipes-connectivity/kea/{kea_1.7.4.bb => kea_1.7.5.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-connectivity/kea/{kea_1.7.4.bb => kea_1.7.5.bb} (93%)

diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb
similarity index 93%
rename from meta-networking/recipes-connectivity/kea/kea_1.7.4.bb
rename to meta-networking/recipes-connectivity/kea/kea_1.7.5.bb
index a2c97655a..38a256afd 100644
--- a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb
+++ b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb
@@ -14,8 +14,8 @@ SRC_URI = "\
     file://kea-dhcp6.service \
     file://kea-dhcp-ddns.service \
 "
-SRC_URI[md5sum] = "d2d0e3ad8064a5e6f3ba1e970d39f9cc"
-SRC_URI[sha256sum] = "2b7f8d8cafdb9ad2be8df9aceb2de58c8f37c1544e47c28f05e84555d0015ef5"
+SRC_URI[md5sum] = "1f771e0209c9149bcf8fb91a25db03bf"
+SRC_URI[sha256sum] = "9b89b75cd8fd71e0ad7cb32c1b996177ba617bea2d162851eed42eea739e9999"
 
 inherit autotools systemd
 
-- 
2.17.1




From ticotimo at gmail.com  Tue Mar 10 05:50:44 2020
From: ticotimo at gmail.com (Tim Orling)
Date: Mon, 9 Mar 2020 22:50:44 -0700
Subject: [oe] [meta-python][PATCH] python3-pycryptodomex: add 3.9.4
	recipe
In-Reply-To: <20200310024936.18941-1-scott.branden@broadcom.com>
References: <20200310024936.18941-1-scott.branden@broadcom.com>
Message-ID: <CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>

This probably should have an RCONFLICTS with python3-cryptodme (and maybe
even python3-crypto).

These three packages step all over each other with same functionality...

On Mon, Mar 9, 2020 at 7:50 PM Scott Branden via Openembedded-devel <
openembedded-devel at lists.openembedded.org> wrote:

> From: Rajesh Ravi <rajesh.ravi at broadcom.com>
>
> Add python3-pycryptodomex 3.9.4 recipe needed to build
> such components as optee 3.8.0.
>
> Signed-off-by: Rajesh Ravi <rajesh.ravi at broadcom.com>
> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
> ---
>  .../python/python3-pycryptodomex_3.9.4.bb     | 30 +++++++++++++++++++
>  1 file changed, 30 insertions(+)
>  create mode 100644 meta-python/recipes-devtools/python/
> python3-pycryptodomex_3.9.4.bb
>
> diff --git a/meta-python/recipes-devtools/python/
> python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/
> python3-pycryptodomex_3.9.4.bb
> new file mode 100644
> index 000000000..be6b10f3f
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
> @@ -0,0 +1,30 @@
> +SUMMARY = "Cryptographic library for Python"
> +DESCRIPTION = "PyCryptodome is a self-contained Python package of
> low-level\
> + cryptographic primitives."
> +HOMEPAGE = "http://www.pycryptodome.org"
> +LICENSE = "PD & BSD-2-Clause"
> +LIC_FILES_CHKSUM =
> "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
> +
> +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
> +SRC_URI[sha256sum] =
> "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
> +
> +inherit pypi
> +inherit setuptools3
> +
> +RDEPENDS_${PN} += " \
> +    ${PYTHON_PN}-io \
> +    ${PYTHON_PN}-math \
> +"
> +
> +RDEPENDS_${PN}-tests += " \
> +    ${PYTHON_PN}-unittest \
> +"
> +
> +PACKAGES =+ "${PN}-tests"
> +
> +FILES_${PN}-tests += " \
> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
> +"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From raj.khem at gmail.com  Tue Mar 10 17:18:56 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 10 Mar 2020 10:18:56 -0700
Subject: [oe] [meta-oe][PATCH] renderdoc: Upgrade to 1.7
Message-ID: <20200310171856.1851988-1-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../renderdoc/{renderdoc_1.6.bb => renderdoc_1.7.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/renderdoc/{renderdoc_1.6.bb => renderdoc_1.7.bb} (95%)

diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb
similarity index 95%
rename from meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb
rename to meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb
index 7cb79d0704..6ea632d064 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/baldurk/renderdoc"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772"
 
-SRCREV = "0e7f772596035137416be01766c2d61205efc63e"
+SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2"
 SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \
 	   file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \
 	   file://0001-Remove-glslang-pool_allocator-setAllocator.patch \
-- 
2.25.1


From scott.branden at broadcom.com  Tue Mar 10 19:15:48 2020
From: scott.branden at broadcom.com (Scott Branden)
Date: Tue, 10 Mar 2020 12:15:48 -0700
Subject: [oe] [meta-python][PATCH] python3-pycryptodomex: add 3.9.4
	recipe
In-Reply-To: <CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>
References: <20200310024936.18941-1-scott.branden@broadcom.com>
	<CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>
Message-ID: <2bdaa8bf-73cd-18d4-fbf7-2f08469e7a00@broadcom.com>



On 2020-03-09 10:50 p.m., Tim Orling wrote:
> This probably should have an RCONFLICTS with python3-cryptodme (and 
> maybe even python3-crypto).
>
> These three packages step all over each other with same functionality...

Good feedback Tim.

Rajesh, could you look if the other recipes do what is needed or can be 
enhanced and used instead?
>
> On Mon, Mar 9, 2020 at 7:50 PM Scott Branden via Openembedded-devel 
> <openembedded-devel at lists.openembedded.org 
> <mailto:openembedded-devel at lists.openembedded.org>> wrote:
>
>     From: Rajesh Ravi <rajesh.ravi at broadcom.com
>     <mailto:rajesh.ravi at broadcom.com>>
>
>     Add python3-pycryptodomex 3.9.4 recipe needed to build
>     such components as optee 3.8.0.
>
>     Signed-off-by: Rajesh Ravi <rajesh.ravi at broadcom.com
>     <mailto:rajesh.ravi at broadcom.com>>
>     Signed-off-by: Scott Branden <scott.branden at broadcom.com
>     <mailto:scott.branden at broadcom.com>>
>     ---
>     ?.../python/python3-pycryptodomex_3.9.4.bb
>     <http://python3-pycryptodomex_3.9.4.bb> ? ?| 30 +++++++++++++++++++
>     ?1 file changed, 30 insertions(+)
>     ?create mode 100644
>     meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
>     <http://python3-pycryptodomex_3.9.4.bb>
>
>     diff --git
>     a/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
>     <http://python3-pycryptodomex_3.9.4.bb>
>     b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
>     <http://python3-pycryptodomex_3.9.4.bb>
>     new file mode 100644
>     index 000000000..be6b10f3f
>     --- /dev/null
>     +++
>     b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
>     <http://python3-pycryptodomex_3.9.4.bb>
>     @@ -0,0 +1,30 @@
>     +SUMMARY = "Cryptographic library for Python"
>     +DESCRIPTION = "PyCryptodome is a self-contained Python package of
>     low-level\
>     + cryptographic primitives."
>     +HOMEPAGE = "http://www.pycryptodome.org"
>     +LICENSE = "PD & BSD-2-Clause"
>     +LIC_FILES_CHKSUM =
>     "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
>     +
>     +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
>     +SRC_URI[sha256sum] =
>     "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
>     +
>     +inherit pypi
>     +inherit setuptools3
>     +
>     +RDEPENDS_${PN} += " \
>     +? ? ${PYTHON_PN}-io \
>     +? ? ${PYTHON_PN}-math \
>     +"
>     +
>     +RDEPENDS_${PN}-tests += " \
>     +? ? ${PYTHON_PN}-unittest \
>     +"
>     +
>     +PACKAGES =+ "${PN}-tests"
>     +
>     +FILES_${PN}-tests += " \
>     +? ? ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
>     + ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
>     +"
>     +
>     +BBCLASSEXTEND = "native nativesdk"
>     -- 
>     2.17.1
>
>     -- 
>     _______________________________________________
>     Openembedded-devel mailing list
>     Openembedded-devel at lists.openembedded.org
>     <mailto:Openembedded-devel at lists.openembedded.org>
>     http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


From jpewhacker at gmail.com  Tue Mar 10 19:50:25 2020
From: jpewhacker at gmail.com (Joshua Watt)
Date: Tue, 10 Mar 2020 14:50:25 -0500
Subject: [oe] [meta-oe][PATCH] glmark2: Update to latest version
Message-ID: <20200310195025.4789-1-JPEWhacker@gmail.com>

Updates to the most recent version of glmark2. In particular, this fixes
problems where the benchmark would fail to start due to improper
handling of EGL_NO_DISPLAY with EGL 1.5

Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
---
 meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index 50b553c80..6d20bbdaf 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 DEPENDS = "libpng jpeg udev"
 
-PV = "20190904+${SRCPV}"
+PV = "20191226+${SRCPV}"
 
 COMPATIBLE_HOST_rpi  = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}"
 
 SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \
            file://python3.patch"
-SRCREV = "24a1139dcbfd86bd02065316eaa90559e39374e1"
+SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6"
 
 S = "${WORKDIR}/git"
 
-- 
2.17.1


From dachaac at gmail.com  Tue Mar 10 19:56:28 2020
From: dachaac at gmail.com (=?UTF-8?B?VmVzYSBKw6TDpHNrZWzDpGluZW4=?=)
Date: Tue, 10 Mar 2020 21:56:28 +0200
Subject: [oe] [meta-python][PATCH] python3-pycryptodomex: add 3.9.4
	recipe
In-Reply-To: <CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>
References: <20200310024936.18941-1-scott.branden@broadcom.com>
	<CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>
Message-ID: <3a1066ff-7016-dd0b-a7f5-197631b92785@gmail.com>

Hi,

Actually no.

pythonX-cryptodome has need to conflict with pythonX-crypto.

But python3-cryptodomex can coexists with either one of those as they 
have own namespace.

Some software need to unfortunately have both python3-cryptodome (brings 
python3-crypto "API emulation") and python3-cryptodomex installed in 
order to function.

Thanks,
Vesa J??skel?inen

On 10.3.2020 7.50, Tim Orling wrote:
> This probably should have an RCONFLICTS with python3-cryptodme (and maybe
> even python3-crypto).
> 
> These three packages step all over each other with same functionality...
> 
> On Mon, Mar 9, 2020 at 7:50 PM Scott Branden via Openembedded-devel <
> openembedded-devel at lists.openembedded.org> wrote:
> 
>> From: Rajesh Ravi <rajesh.ravi at broadcom.com>
>>
>> Add python3-pycryptodomex 3.9.4 recipe needed to build
>> such components as optee 3.8.0.
>>
>> Signed-off-by: Rajesh Ravi <rajesh.ravi at broadcom.com>
>> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
>> ---
>>   .../python/python3-pycryptodomex_3.9.4.bb     | 30 +++++++++++++++++++
>>   1 file changed, 30 insertions(+)
>>   create mode 100644 meta-python/recipes-devtools/python/
>> python3-pycryptodomex_3.9.4.bb
>>
>> diff --git a/meta-python/recipes-devtools/python/
>> python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/
>> python3-pycryptodomex_3.9.4.bb
>> new file mode 100644
>> index 000000000..be6b10f3f
>> --- /dev/null
>> +++ b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
>> @@ -0,0 +1,30 @@
>> +SUMMARY = "Cryptographic library for Python"
>> +DESCRIPTION = "PyCryptodome is a self-contained Python package of
>> low-level\
>> + cryptographic primitives."
>> +HOMEPAGE = "http://www.pycryptodome.org"
>> +LICENSE = "PD & BSD-2-Clause"
>> +LIC_FILES_CHKSUM =
>> "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
>> +
>> +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
>> +SRC_URI[sha256sum] =
>> "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
>> +
>> +inherit pypi
>> +inherit setuptools3
>> +
>> +RDEPENDS_${PN} += " \
>> +    ${PYTHON_PN}-io \
>> +    ${PYTHON_PN}-math \
>> +"
>> +
>> +RDEPENDS_${PN}-tests += " \
>> +    ${PYTHON_PN}-unittest \
>> +"
>> +
>> +PACKAGES =+ "${PN}-tests"
>> +
>> +FILES_${PN}-tests += " \
>> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
>> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
>> +"
>> +
>> +BBCLASSEXTEND = "native nativesdk"
>> --
>> 2.17.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>

From ticotimo at gmail.com  Tue Mar 10 20:35:14 2020
From: ticotimo at gmail.com (Tim Orling)
Date: Tue, 10 Mar 2020 13:35:14 -0700
Subject: [oe] [meta-python][PATCH] python3-pycryptodomex: add 3.9.4
	recipe
In-Reply-To: <3a1066ff-7016-dd0b-a7f5-197631b92785@gmail.com>
References: <20200310024936.18941-1-scott.branden@broadcom.com>
	<CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>
	<3a1066ff-7016-dd0b-a7f5-197631b92785@gmail.com>
Message-ID: <CANx9H-COTxmHWTQzW_Uu7SfgO3dq54-qKr0VHAo0Yvirj6V4Aw@mail.gmail.com>

On Tue, Mar 10, 2020 at 12:56 PM Vesa J??skel?inen <dachaac at gmail.com>
wrote:

> Hi,
>
> Actually no.
>
> pythonX-cryptodome has need to conflict with pythonX-crypto.
>
> But python3-cryptodomex can coexists with either one of those as they
> have own namespace.
>

That is probably what I am remembering, since I had to fix that exact issue
on meta-python2.


> Some software need to unfortunately have both python3-cryptodome (brings
> python3-crypto "API emulation") and python3-cryptodomex installed in
> order to function.
>

We (all of us ;) should look for recipes that have legacy RDEPENDS on
python3-crypto or python3-cryptodome , when in fact they could use the
cleaner solution of python3-cryptodomex.

Commits I made in meta-python2 might help.

Thank you for digging deeper and capturing the state of things.


> Thanks,
> Vesa J??skel?inen
>
> On 10.3.2020 7.50, Tim Orling wrote:
> > This probably should have an RCONFLICTS with python3-cryptodme (and maybe
> > even python3-crypto).
> >
> > These three packages step all over each other with same functionality...
> >
> > On Mon, Mar 9, 2020 at 7:50 PM Scott Branden via Openembedded-devel <
> > openembedded-devel at lists.openembedded.org> wrote:
> >
> >> From: Rajesh Ravi <rajesh.ravi at broadcom.com>
> >>
> >> Add python3-pycryptodomex 3.9.4 recipe needed to build
> >> such components as optee 3.8.0.
> >>
> >> Signed-off-by: Rajesh Ravi <rajesh.ravi at broadcom.com>
> >> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
> >> ---
> >>   .../python/python3-pycryptodomex_3.9.4.bb     | 30
> +++++++++++++++++++
> >>   1 file changed, 30 insertions(+)
> >>   create mode 100644 meta-python/recipes-devtools/python/
> >> python3-pycryptodomex_3.9.4.bb
> >>
> >> diff --git a/meta-python/recipes-devtools/python/
> >> python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/
> >> python3-pycryptodomex_3.9.4.bb
> >> new file mode 100644
> >> index 000000000..be6b10f3f
> >> --- /dev/null
> >> +++ b/meta-python/recipes-devtools/python/
> python3-pycryptodomex_3.9.4.bb
> >> @@ -0,0 +1,30 @@
> >> +SUMMARY = "Cryptographic library for Python"
> >> +DESCRIPTION = "PyCryptodome is a self-contained Python package of
> >> low-level\
> >> + cryptographic primitives."
> >> +HOMEPAGE = "http://www.pycryptodome.org"
> >> +LICENSE = "PD & BSD-2-Clause"
> >> +LIC_FILES_CHKSUM =
> >> "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
> >> +
> >> +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
> >> +SRC_URI[sha256sum] =
> >> "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
> >> +
> >> +inherit pypi
> >> +inherit setuptools3
> >> +
> >> +RDEPENDS_${PN} += " \
> >> +    ${PYTHON_PN}-io \
> >> +    ${PYTHON_PN}-math \
> >> +"
> >> +
> >> +RDEPENDS_${PN}-tests += " \
> >> +    ${PYTHON_PN}-unittest \
> >> +"
> >> +
> >> +PACKAGES =+ "${PN}-tests"
> >> +
> >> +FILES_${PN}-tests += " \
> >> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
> >> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
> >> +"
> >> +
> >> +BBCLASSEXTEND = "native nativesdk"
> >> --
> >> 2.17.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From changqing.li at windriver.com  Wed Mar 11 06:39:16 2020
From: changqing.li at windriver.com (Changqing Li)
Date: Wed, 11 Mar 2020 14:39:16 +0800
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
	<CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
	<CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
Message-ID: <c519184e-2e78-36fd-2f9a-1b97ebfcb2f1@windriver.com>


On 3/7/20 12:12 AM, Khem Raj wrote:
> On Thu, Mar 5, 2020 at 11:55 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>> Can we fix mozjs instead?
> perhaps thats better fix, maybe it can made optional via packageconfig ?
> or marked incompatible if meta-python is not included

Hi,? Khem

There are 2 solutions for the problem, Which do you think is better?


1.? fix this by using BBFILES_DYNAMIC, add a folder dynamic-layers under 
meta-oe,

and move those recipes that depend on meta-python under the 
dynamic-layers.? and add

these bbfiles by BBFILES_DYNAMIC.?? but these will need to move many 
recipes from

original folder to folder dynamic-layers,?? do you think this change is 
acceptable?

git diff conf/layer.conf

+# only activates content when identified layers are present,
+# to ensure yocto compatibility check pass
+BBFILES_DYNAMIC += 
"meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
+"

2. move those python recipes from meta-python under meta-oe

>> On Fri, Mar 6, 2020 at 6:38 AM <changqing.li at windriver.com> wrote:
>>
>>> From: Changqing Li <changqing.li at windriver.com>
>>>
>>> yocto-check-layer/test_world failed since error:
>>> ERROR: test_world (common.CommonCheckLayer)
>>> ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
>>> /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
>>> DEPENDS on or otherwise requires it). Close matches:
>>>    python3-numpy-native
>>>    python3-pycairo-native
>>>    python3-rpm-native
>>> ERROR: Required build target 'meta-world-pkgdata' has no buildable
>>> providers.
>>> Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
>>> 'mozjs', 'python3-pytoml-native']
>>>
>>> mozjs depend on recipe under meta-python, but meta-python
>>> isn't in LAYERDEPENDS, so error occurred. Fix by add
>>> it into LAYERDEPENDS.
>>>
>>> Signed-off-by: Changqing Li <changqing.li at windriver.com>
>>> ---
>>>   meta-oe/conf/layer.conf | 5 ++++-
>>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
>>> index c537736..0ce0ad2 100644
>>> --- a/meta-oe/conf/layer.conf
>>> +++ b/meta-oe/conf/layer.conf
>>> @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
>>>   # cause compatibility issues with other layers
>>>   LAYERVERSION_openembedded-layer = "1"
>>>
>>> -LAYERDEPENDS_openembedded-layer = "core"
>>> +LAYERDEPENDS_openembedded-layer = " \
>>> +    core \
>>> +    meta-python \
>>> +"
>>>
>>>   LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
>>>
>>> --
>>> 2.7.4
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From nick83ola at gmail.com  Wed Mar 11 07:03:58 2020
From: nick83ola at gmail.com (Nicola Lunghi)
Date: Wed, 11 Mar 2020 07:03:58 +0000
Subject: [oe] [meta-python][PATCH 1/3] python3-cycler: add recipe for 0.10.0
Message-ID: <20200311070359.18480-1-nick83ola@gmail.com>

This is a dependency for python3-matplotlib

Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
---
 .../python/python3-cycler_0.10.0.bb              | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb

diff --git a/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
new file mode 100644
index 000000000..cd21be8ac
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Composable style cycles"
+HOMEPAGE = "http://github.com/matplotlib/cycler"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811"
+
+SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b"
+SRC_URI[sha256sum] = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} += "\
+    python3-core \
+    python3-six \
+"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.20.1


From nick83ola at gmail.com  Wed Mar 11 07:04:00 2020
From: nick83ola at gmail.com (Nicola Lunghi)
Date: Wed, 11 Mar 2020 07:04:00 +0000
Subject: [oe] [meta-python][PATCH 2/3] python3-kiwisolver: add recipe for
	version 1.1.0
In-Reply-To: <20200311070359.18480-1-nick83ola@gmail.com>
References: <20200311070359.18480-1-nick83ola@gmail.com>
Message-ID: <20200311070359.18480-2-nick83ola@gmail.com>

This is a dependency for python3-matplotlib

Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
---
 .../python/python3-kiwisolver_1.1.0.bb           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb

diff --git a/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb b/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb
new file mode 100644
index 000000000..a10830257
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb
@@ -0,0 +1,16 @@
+SUMMARY = "A fast implementation of the Cassowary constraint solver"
+HOMEPAGE = "https://github.com/nucleic/kiwi"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=1c177d169db050341d3b890c69fb80e3"
+
+SRC_URI[md5sum] = "fc8a614367f7ba0d34a02fd08c535afc"
+SRC_URI[sha256sum] = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} += "\
+    python3-core \
+    python3-setuptools \
+"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.20.1


From nick83ola at gmail.com  Wed Mar 11 07:04:02 2020
From: nick83ola at gmail.com (Nicola Lunghi)
Date: Wed, 11 Mar 2020 07:04:02 +0000
Subject: [oe] [meta-python][PATCH 3/3] python3-matplotlib: fix dependencies
	and license
In-Reply-To: <20200311070359.18480-1-nick83ola@gmail.com>
References: <20200311070359.18480-1-nick83ola@gmail.com>
Message-ID: <20200311070359.18480-3-nick83ola@gmail.com>

* The license indicated in the old recipe (and in this) is the PSF not the BSD
that was indicated before.
* fixed the dependencies (looking at the recipe at meta-jupiter
https://github.com/Xilinx/meta-jupyter/tree/master/recipes-python/
* the setupext script was a leftover from the python2 recipe remove it for now
  but probably has to be put updated and put back in the future:
  -> all the module are installed by default and they have different licenses?

Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
---
 .../python-matplotlib/fix_setupext.patch      | 110 ------------------
 .../python/python3-matplotlib_3.1.1.bb        |  24 ++--
 2 files changed, 17 insertions(+), 117 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch

diff --git a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
deleted file mode 100644
index 21b9094a1..000000000
--- a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-This fixes the numpy import problem in setupext.py using a hard-coded path.
-
-Index: matplotlib-2.0.2/setupext.py
-===================================================================
---- matplotlib-2.0.2.orig/setupext.py
-+++ matplotlib-2.0.2/setupext.py
-@@ -148,6 +148,7 @@ def has_include_file(include_dirs, filen
-     Returns `True` if `filename` can be found in one of the
-     directories in `include_dirs`.
-     """
-+    return True
-     if sys.platform == 'win32':
-         include_dirs += os.environ.get('INCLUDE', '.').split(';')
-     for dir in include_dirs:
-@@ -172,7 +173,7 @@ def get_base_dirs():
-     Returns a list of standard base directories on this platform.
-     """
-     if options['basedirlist']:
--        return options['basedirlist']
-+        return [os.environ['STAGING_LIBDIR']]
- 
-     basedir_map = {
-         'win32': ['win32_static', ],
-@@ -260,14 +261,6 @@ def make_extension(name, files, *args, *
-     `distutils.core.Extension` constructor.
-     """
-     ext = DelayedExtension(name, files, *args, **kwargs)
--    for dir in get_base_dirs():
--        include_dir = os.path.join(dir, 'include')
--        if os.path.exists(include_dir):
--            ext.include_dirs.append(include_dir)
--        for lib in ('lib', 'lib64'):
--            lib_dir = os.path.join(dir, lib)
--            if os.path.exists(lib_dir):
--                ext.library_dirs.append(lib_dir)
-     ext.include_dirs.append('.')
- 
-     return ext
-@@ -314,6 +307,7 @@ class PkgConfig(object):
-                     "    matplotlib may not be able to find some of its dependencies")
- 
-     def set_pkgconfig_path(self):
-+        return
-         pkgconfig_path = sysconfig.get_config_var('LIBDIR')
-         if pkgconfig_path is None:
-             return
-@@ -875,14 +869,14 @@ class Numpy(SetupPackage):
-             reload(numpy)
- 
-         ext = Extension('test', [])
--        ext.include_dirs.append(numpy.get_include())
-+        ext.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/'))
-         if not has_include_file(
-                 ext.include_dirs, os.path.join("numpy", "arrayobject.h")):
-             warnings.warn(
-                 "The C headers for numpy could not be found. "
-                 "You may need to install the development package")
- 
--        return [numpy.get_include()]
-+        return [os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/')]
- 
-     def check(self):
-         min_version = extract_versions()['__version__numpy__']
-Index: matplotlib-2.0.2/setup.py
-===================================================================
---- matplotlib-2.0.2.orig/setup.py
-+++ matplotlib-2.0.2/setup.py
-@@ -66,28 +66,6 @@ mpl_packages = [
-     setupext.Python(),
-     setupext.Platform(),
-     'Required dependencies and extensions',
--    setupext.Numpy(),
--    setupext.Six(),
--    setupext.Dateutil(),
--    setupext.FuncTools32(),
--    setupext.Subprocess32(),
--    setupext.Pytz(),
--    setupext.Cycler(),
--    setupext.Tornado(),
--    setupext.Pyparsing(),
--    setupext.LibAgg(),
--    setupext.FreeType(),
--    setupext.FT2Font(),
--    setupext.Png(),
--    setupext.Qhull(),
--    setupext.Image(),
--    setupext.TTConv(),
--    setupext.Path(),
--    setupext.ContourLegacy(),
--    setupext.Contour(),
--    setupext.Delaunay(),
--    setupext.QhullWrap(),
--    setupext.Tri(),
-     'Optional subpackages',
-     setupext.SampleData(),
-     setupext.Toolkits(),
-@@ -100,13 +78,8 @@ mpl_packages = [
-     setupext.BackendMacOSX(),
-     setupext.BackendQt5(),
-     setupext.BackendQt4(),
--    setupext.BackendGtk3Agg(),
-     setupext.BackendGtk3Cairo(),
--    setupext.BackendGtkAgg(),
--    setupext.BackendTkAgg(),
--    setupext.BackendWxAgg(),
-     setupext.BackendGtk(),
--    setupext.BackendAgg(),
-     setupext.BackendCairo(),
-     setupext.Windowing(),
-     'Optional LaTeX dependencies',
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
index 824680c24..1fb234c8e 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
@@ -4,16 +4,26 @@ Matplotlib is a Python 2D plotting library which produces \
 publication-quality figures in a variety of hardcopy formats \
 and interactive environments across platforms."
 HOMEPAGE = "https://github.com/matplotlib/matplotlib"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74"
-
-DEPENDS = "python3-numpy-native python3-numpy freetype libpng python3-dateutil python3-pytz"
-RDEPENDS_${PN} = "python3-numpy freetype libpng python3-dateutil python3-pytz"
+LICENSE = "PSF"
+LIC_FILES_CHKSUM = "\
+    file://setup.py;beginline=275;endline=275;md5=2a114620e4e6843aa7568d5902501753 \
+    file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \
+"
+DEPENDS = "python3-numpy-native freetype libpng"
 
 SRC_URI[md5sum] = "f894af5564a588e880644123237251b7"
 SRC_URI[sha256sum] = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812080c93"
 
-PYPI_PACKAGE = "matplotlib"
-inherit pypi setuptools3
+inherit pypi setuptools3 pkgconfig
+
+EXTRA_OECONF = "--disable-docs"
+
+RDEPENDS_${PN} += "\
+    python3-numpy \
+    python3-pyparsing \
+    python3-cycler \
+    python3-dateutil \
+    python3-kiwisolver \
+"
 
 BBCLASSEXTEND = "native"
-- 
2.20.1


From raj.khem at gmail.com  Wed Mar 11 07:37:34 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 11 Mar 2020 00:37:34 -0700
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <c519184e-2e78-36fd-2f9a-1b97ebfcb2f1@windriver.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
	<CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
	<CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
	<c519184e-2e78-36fd-2f9a-1b97ebfcb2f1@windriver.com>
Message-ID: <CAMKF1spdp2K5V2-ejRC+9aHiWoDiqkkDw6KwwQXz1BjdprygJw@mail.gmail.com>

On Tue, Mar 10, 2020 at 11:39 PM Changqing Li
<changqing.li at windriver.com> wrote:
>
>
> On 3/7/20 12:12 AM, Khem Raj wrote:
> > On Thu, Mar 5, 2020 at 11:55 PM Martin Jansa <martin.jansa at gmail.com> wrote:
> >> Can we fix mozjs instead?
> > perhaps thats better fix, maybe it can made optional via packageconfig ?
> > or marked incompatible if meta-python is not included
>
> Hi,  Khem
>
> There are 2 solutions for the problem, Which do you think is better?
>
>
> 1.  fix this by using BBFILES_DYNAMIC, add a folder dynamic-layers under
> meta-oe,
>
> and move those recipes that depend on meta-python under the
> dynamic-layers.  and add
>
> these bbfiles by BBFILES_DYNAMIC.   but these will need to move many
> recipes from
>
> original folder to folder dynamic-layers,   do you think this change is
> acceptable?


I think we can live with BBFILES_DYNAMIC solution.
>
> git diff conf/layer.conf
>
> +# only activates content when identified layers are present,
> +# to ensure yocto compatibility check pass
> +BBFILES_DYNAMIC +=
> "meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
> +"
>
> 2. move those python recipes from meta-python under meta-oe
>
> >> On Fri, Mar 6, 2020 at 6:38 AM <changqing.li at windriver.com> wrote:
> >>
> >>> From: Changqing Li <changqing.li at windriver.com>
> >>>
> >>> yocto-check-layer/test_world failed since error:
> >>> ERROR: test_world (common.CommonCheckLayer)
> >>> ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
> >>> /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
> >>> DEPENDS on or otherwise requires it). Close matches:
> >>>    python3-numpy-native
> >>>    python3-pycairo-native
> >>>    python3-rpm-native
> >>> ERROR: Required build target 'meta-world-pkgdata' has no buildable
> >>> providers.
> >>> Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
> >>> 'mozjs', 'python3-pytoml-native']
> >>>
> >>> mozjs depend on recipe under meta-python, but meta-python
> >>> isn't in LAYERDEPENDS, so error occurred. Fix by add
> >>> it into LAYERDEPENDS.
> >>>
> >>> Signed-off-by: Changqing Li <changqing.li at windriver.com>
> >>> ---
> >>>   meta-oe/conf/layer.conf | 5 ++++-
> >>>   1 file changed, 4 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
> >>> index c537736..0ce0ad2 100644
> >>> --- a/meta-oe/conf/layer.conf
> >>> +++ b/meta-oe/conf/layer.conf
> >>> @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6"
> >>>   # cause compatibility issues with other layers
> >>>   LAYERVERSION_openembedded-layer = "1"
> >>>
> >>> -LAYERDEPENDS_openembedded-layer = "core"
> >>> +LAYERDEPENDS_openembedded-layer = " \
> >>> +    core \
> >>> +    meta-python \
> >>> +"
> >>>
> >>>   LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
> >>>
> >>> --
> >>> 2.7.4
> >>>
> >>> --
> >>> _______________________________________________
> >>> Openembedded-devel mailing list
> >>> Openembedded-devel at lists.openembedded.org
> >>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >>>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From nick83ola at gmail.com  Wed Mar 11 07:55:14 2020
From: nick83ola at gmail.com (Nicola Lunghi)
Date: Wed, 11 Mar 2020 07:55:14 +0000
Subject: [oe] [meta-oe][PATCH] smem: matplotlib is an optional depencency
Message-ID: <20200311075513.9491-1-nick83ola@gmail.com>

smem doesn't need matplotlib and numpy to run, is an optional dependency only
needed to produce graphs.

This is needed to avoid to include and build matplotlib and numpy by default

Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
---
 meta-oe/recipes-support/smem/smem_1.5.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/recipes-support/smem/smem_1.5.bb
index 90db9c3f3..446325e93 100644
--- a/meta-oe/recipes-support/smem/smem_1.5.bb
+++ b/meta-oe/recipes-support/smem/smem_1.5.bb
@@ -20,6 +20,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
 
+#PACKAGECONFIG ?= "graph"
+PACKAGECONFIG[graph] = ",,,python3-matplotlib python3-numpy"
+
 do_compile() {
         ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
 }
@@ -34,7 +37,6 @@ do_install() {
 }
 
 RDEPENDS_${PN} = "python3-core python3-compression"
-RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
 
 PACKAGE_BEFORE_PN = "smemcap"
 
-- 
2.20.1


From brgl at bgdev.pl  Wed Mar 11 08:04:04 2020
From: brgl at bgdev.pl (Bartosz Golaszewski)
Date: Wed, 11 Mar 2020 09:04:04 +0100
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
	<dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
	<CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>
Message-ID: <CAMRc=MehBSu1RpPkzP=xiFqt3wpJrf4FhV889jcPxUHPnf0GLg@mail.gmail.com>

wt., 3 mar 2020 o 14:56 Bartosz Golaszewski <brgl at bgdev.pl> napisa?(a):
>
> If this is not something that should be part of meta-openembedded - is
> there any way to have it hosted at https://git.yoctoproject.org/cgit/
> as an official yocto layer? I'm sorry if this is a dumb question, I
> don't know exactly what the policy is for that.
>

Hi Khem,

gentle ping on this. What is the procedure of hosting a layer at OE?

Bartosz

From changqing.li at windriver.com  Wed Mar 11 08:42:05 2020
From: changqing.li at windriver.com (changqing.li at windriver.com)
Date: Wed, 11 Mar 2020 16:42:05 +0800
Subject: [oe] [meta-oe][PATCH] conf/layer.conf: add BBFILES_DYNAMIC and
	dynamic layers
Message-ID: <1583916125-405729-1-git-send-email-changqing.li@windriver.com>

From: Changqing Li <changqing.li at windriver.com>

some recipes under meta-oe have dependency on meta-python,
and test_world of yocto-check-layer will failed with error
like:

ERROR: test_world (common.CommonCheckLayer)
ERROR: Nothing PROVIDES 'python3-pytoml-native' (but
/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
DEPENDS on or otherwise requires it). Close matches:
  python3-numpy-native
  python3-pycairo-native
  python3-rpm-native
ERROR: Required build target 'meta-world-pkgdata' has no buildable
providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
'mozjs', 'python3-pytoml-native']

fix by make these recipes only active when identified layers are
present

Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
 meta-oe/conf/layer.conf                                              | 5 +++++
 .../recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb           | 0
 .../{ => dynamic-layers/meta-python}/recipes-bsp/rwmem/rwmem_1.2.bb  | 0
 .../lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 0
 .../meta-python}/recipes-connectivity/lirc/lirc/lirc.tmpfiles        | 0
 .../meta-python}/recipes-connectivity/lirc/lirc/lirc_options.conf    | 0
 .../meta-python}/recipes-connectivity/lirc/lirc/lircd.conf           | 0
 .../meta-python}/recipes-connectivity/lirc/lirc/lircd.init           | 0
 .../meta-python}/recipes-connectivity/lirc/lirc/lircd.service        | 0
 .../meta-python}/recipes-connectivity/lirc/lirc/lircexec.init        | 0
 .../meta-python}/recipes-connectivity/lirc/lirc/pollfd.patch         | 0
 .../meta-python}/recipes-connectivity/lirc/lirc_0.9.4d.bb            | 0
 .../meta-python}/recipes-core/packagegroups/packagegroup-meta-oe.bb  | 0
 .../0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch      | 0
 .../0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch  | 0
 .../mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch | 0
 .../0001-Tell-scons-to-use-build-settings-from-environment-va.patch  | 0
 .../0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch  | 0
 .../mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch      | 0
 .../mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch | 0
 .../0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch     | 0
 .../mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch        | 0
 .../recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch    | 0
 .../mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch    | 0
 .../meta-python}/recipes-dbs/mongodb/mongodb/arm64-support.patch     | 0
 .../meta-python}/recipes-dbs/mongodb/mongodb_git.bb                  | 0
 .../0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch  | 0
 .../lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch      | 0
 .../lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch         | 0
 .../meta-python}/recipes-extended/lcdproc/lcdproc_git.bb             | 0
 .../recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch    | 0
 .../0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch  | 0
 .../mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch     | 0
 .../mozjs/mozjs/0004-do-not-create-python-environment.patch          | 0
 .../recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch     | 0
 .../mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch | 0
 .../mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch             | 0
 .../recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch        | 0
 .../mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch       | 0
 .../recipes-extended/mozjs/mozjs/0010-format-overflow.patch          | 0
 .../mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch             | 0
 .../recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch            | 0
 .../mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch           | 0
 .../mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch             | 0
 .../mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch   | 0
 .../recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch        | 0
 .../mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch               | 0
 .../meta-python}/recipes-extended/mozjs/mozjs_60.9.0.bb              | 0
 .../smem/smem/0001-smem-fix-support-for-source-option-python3.patch  | 0
 .../meta-python}/recipes-support/smem/smem_1.5.bb                    | 0
 50 files changed, 5 insertions(+)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-bsp/rwmem/rwmem_1.2.bb (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lirc.tmpfiles (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lirc_options.conf (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.conf (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.init (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.service (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircexec.init (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/pollfd.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc_0.9.4d.bb (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-core/packagegroups/packagegroup-meta-oe.bb (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/arm64-support.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb_git.bb (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc_git.bb (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0010-format-overflow.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs_60.9.0.bb (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch (100%)
 rename meta-oe/{ => dynamic-layers/meta-python}/recipes-support/smem/smem_1.5.bb (100%)

diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index c537736..652a378 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -23,6 +23,11 @@ BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/"
 
 BBFILE_PRIORITY_openembedded-layer = "6"
 
+# only activates content when identified layers are present,
+# to ensure yocto compatibility check pass
+BBFILES_DYNAMIC += "meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
+"
+
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_openembedded-layer = "1"
diff --git a/meta-oe/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb
similarity index 100%
rename from meta-oe/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb
diff --git a/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
similarity index 100%
rename from meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc.tmpfiles
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc.tmpfiles
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc_options.conf
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc_options.conf
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.conf
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/lircd.conf
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.conf
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.init b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.init
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/lircd.init
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.init
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.service b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.service
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/lircd.service
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.service
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircexec.init
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/lircexec.init
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircexec.init
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch
diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.9.4d.bb
similarity index 100%
rename from meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.9.4d.bb
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bb
similarity index 100%
rename from meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bb
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/arm64-support.patch
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/arm64-support.patch
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mongodb/mongodb_git.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch
similarity index 100%
rename from meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch
similarity index 100%
rename from meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
similarity index 100%
rename from meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb
similarity index 100%
rename from meta-oe/recipes-extended/lcdproc/lcdproc_git.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0010-format-overflow.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0010-format-overflow.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0010-format-overflow.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0010-format-overflow.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
similarity index 100%
rename from meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
diff --git a/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
similarity index 100%
rename from meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
rename to meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb
similarity index 100%
rename from meta-oe/recipes-support/smem/smem_1.5.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb
-- 
2.7.4


From git at andred.net  Wed Mar 11 09:43:08 2020
From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik)
Date: Wed, 11 Mar 2020 09:43:08 +0000
Subject: [oe] [meta-oe][PATCH] smem: matplotlib is an optional depencency
In-Reply-To: <20200311075513.9491-1-nick83ola@gmail.com>
References: <20200311075513.9491-1-nick83ola@gmail.com>
Message-ID: <e50174e3f36143c1dc43f41cedc6232c34035578.camel@andred.net>

On Wed, 2020-03-11 at 07:55 +0000, Nicola Lunghi wrote:
> smem doesn't need matplotlib and numpy to run, is an optional dependency only
> needed to produce graphs.

Right, that's why it's an RRECOMMENDS. If you don't want it in the image, just do
BAD_RECOMMENDATIONS as per usual practice :-)

Cheers,
Andre'

> This is needed to avoid to include and build matplotlib and numpy by default
> 
> Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
> ---
>  meta-oe/recipes-support/smem/smem_1.5.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/recipes-support/smem/smem_1.5.bb
> index 90db9c3f3..446325e93 100644
> --- a/meta-oe/recipes-support/smem/smem_1.5.bb
> +++ b/meta-oe/recipes-support/smem/smem_1.5.bb
> @@ -20,6 +20,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
>  
>  S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
>  
> +#PACKAGECONFIG ?= "graph"
> +PACKAGECONFIG[graph] = ",,,python3-matplotlib python3-numpy"
> +
>  do_compile() {
>          ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
>  }
> @@ -34,7 +37,6 @@ do_install() {
>  }
>  
>  RDEPENDS_${PN} = "python3-core python3-compression"
> -RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
>  
>  PACKAGE_BEFORE_PN = "smemcap"
>  
> -- 
> 2.20.1
> 


From De.Huo at windriver.com  Wed Mar 11 09:52:30 2020
From: De.Huo at windriver.com (De Huo)
Date: Wed, 11 Mar 2020 17:52:30 +0800
Subject: [oe] [meta-oe][zeus][PATCH] rng-tools: Supply patches to fix rngd
	block reboot issue
Message-ID: <1583920350-198351-1-git-send-email-De.Huo@windriver.com>

There will be issue about "Hardware RNG Entropy Gatherer Daemon slow stop"
during "reboot" of CN96xx.

Backport the patches from
https://github.com/nhorman/rng-tools/commit/3e47faae108df4824531bf9c003cc1c65b7b2842
 and
https://github.com/nhorman/rng-tools/commit/cf1475fbdf33d5c3a62099b6b20f2b2017d6de33

Signed-off-by: De Huo <De.Huo at windriver.com>
---
 .../0001-Allow-jitter-threads-to-exit-faster.patch | 130 +++++++++++++++++++++
 .../rng-tools/0002-Daemonize-earlier-in-init.patch |  88 ++++++++++++++
 meta/recipes-support/rng-tools/rng-tools_6.7.bb    |   2 +
 3 files changed, 220 insertions(+)
 create mode 100644 meta/recipes-support/rng-tools/rng-tools/0001-Allow-jitter-threads-to-exit-faster.patch
 create mode 100644 meta/recipes-support/rng-tools/rng-tools/0002-Daemonize-earlier-in-init.patch

diff --git a/meta/recipes-support/rng-tools/rng-tools/0001-Allow-jitter-threads-to-exit-faster.patch b/meta/recipes-support/rng-tools/rng-tools/0001-Allow-jitter-threads-to-exit-faster.patch
new file mode 100644
index 0000000..46a401a
--- /dev/null
+++ b/meta/recipes-support/rng-tools/rng-tools/0001-Allow-jitter-threads-to-exit-faster.patch
@@ -0,0 +1,130 @@
+From 3e47faae108df4824531bf9c003cc1c65b7b2842 Mon Sep 17 00:00:00 2001
+From: Neil Horman <nhorman at tuxdriver.com>
+Date: Fri, 7 Jun 2019 08:51:02 -0400
+Subject: [PATCH] Allow jitter threads to exit faster
+
+commit:3e47faae108df4824531bf9c003cc1c65b7b2842
+https://github.com/nhorman/rng-tools
+
+Even with the recent pipe adjustments, it can take a long time for
+jitterentropy to exit.  This is because the call to jent_read_entropy
+can take a long time to complete, and termination signal delivery won't
+cause it to return early, like a syscall.
+
+Mitigate this by using sigsetjmp/siglongjmp.  We set a return point at
+the top of the loop for each thread, and register a signal handler to
+execute a siglongjmp back to that point so that we can recheck the
+active flag and break the loop as soon as a signal is delivered.
+
+Upstream-Status: Backport
+
+Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
+Signed-off-by: Anca Nicoleta Mihalache <anca.mihalache at windriver.com>
+Signed-off-by: De Huo <de.huo at windriver.com>
+---
+ rngd_jitter.c | 32 ++++++++++++++++++++++++++++++--
+ 1 file changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/rngd_jitter.c b/rngd_jitter.c
+index 54070ae..7f01ee9 100644
+--- a/rngd_jitter.c
++++ b/rngd_jitter.c
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <setjmp.h>
+ #include "rng-tools-config.h"
+ 
+ #include <jitterentropy.h>
+@@ -48,6 +49,7 @@ struct thread_data {
+ 	int active;
+ 	int done;
+ 	struct timespec slptm;
++	sigjmp_buf	jmpbuf;
+ };
+ 
+ static struct thread_data *tdata;
+@@ -228,6 +230,16 @@ static inline void update_sleep_time(struct thread_data *me,
+ 	me->slptm.tv_nsec /= 2;
+ }
+ 
++void jitter_thread_exit_signal(int signum)
++{
++	pthread_t self = pthread_self();
++	int i;
++	for(i=0;i<num_threads;i++)  {
++		if (threads[i] == self)
++			siglongjmp(tdata[i].jmpbuf, 1);
++	}
++}
++
+ static void *thread_entropy_task(void *data)
+ {
+ 	cpu_set_t cpuset;
+@@ -263,6 +275,13 @@ static void *thread_entropy_task(void *data)
+ 		goto out;
+ 	}
+ 
++	/*
++	 * Use setjmp here to allow us to return early from
++	 * jent_read_entropy, as it can run for a long time
++	 */
++	if (sigsetjmp(me->jmpbuf, 1))
++		goto out_interrupt;
++
+ 	/* Now go to sleep until there is more work to do */
+ 	do {
+ 		message(LOG_DAEMON|LOG_DEBUG, "JITTER thread on cpu %d wakes up for refill\n", me->core_id);
+@@ -286,7 +305,11 @@ static void *thread_entropy_task(void *data)
+ 			message(LOG_DAEMON|LOG_DEBUG, "DONE Writing to pipe with return %ld\n", ret);
+ 			if (first)
+ 				me->active = 1;
+-			if (ret < 0)
++			/*
++ 			 * suppress EBADF errors, as those indicate the pipe is
++ 			 * closed and we are exiting
++ 			 */
++			if ((ret < 0) && (errno != EBADF))
+ 				message(LOG_DAEMON|LOG_WARNING, "Error on pipe write: %s\n", strerror(errno));
+ 			if (!first && !me->active)
+ 				break;
+@@ -296,6 +319,7 @@ static void *thread_entropy_task(void *data)
+ 
+ 	} while (me->active);
+ 
++out_interrupt:
+ 	free(tmpbuf);
+ out:
+ 	me->done = 1;
+@@ -335,6 +359,7 @@ int validate_jitter_options(struct rng *ent_src)
+ 	return 0;
+ }
+ 
++
+ /*
+  * Init JITTER
+  */
+@@ -349,6 +374,9 @@ int init_jitter_entropy_source(struct rng *ent_src)
+ #ifdef HAVE_LIBGCRYPT
+ 	char key[AES_BLOCK];
+ #endif
++
++	signal(SIGUSR1, jitter_thread_exit_signal);
++
+ 	int ret = jent_entropy_init();
+ 	if(ret) {
+ 		message(LOG_DAEMON|LOG_WARNING, "JITTER rng fails with code %d\n", ret);
+@@ -474,8 +502,8 @@ void close_jitter_entropy_source(struct rng *ent_src)
+ 	/* And wait for completion of each thread */
+ 	for (i=0; i < num_threads; i++) {
+ 		message(LOG_DAEMON|LOG_DEBUG, "Checking on done for thread %d\n", i);
++		pthread_kill(threads[i], SIGUSR1);
+ 		while (!tdata[i].done)
+-			pthread_kill(threads[i], SIGINT);
+ 			if(tdata[i].done) {
+ 				message(LOG_DAEMON|LOG_INFO, "Closing thread %d\n", tdata[i].core_id);
+ 				pthread_join(threads[i], NULL);
+-- 
+2.23.0
+
diff --git a/meta/recipes-support/rng-tools/rng-tools/0002-Daemonize-earlier-in-init.patch b/meta/recipes-support/rng-tools/rng-tools/0002-Daemonize-earlier-in-init.patch
new file mode 100644
index 0000000..c517516
--- /dev/null
+++ b/meta/recipes-support/rng-tools/rng-tools/0002-Daemonize-earlier-in-init.patch
@@ -0,0 +1,88 @@
+From cf1475fbdf33d5c3a62099b6b20f2b2017d6de33 Mon Sep 17 00:00:00 2001
+From: Neil Horman <nhorman at hmswarspite.think-freely.org>
+Date: Wed, 13 Nov 2019 08:23:22 -0500
+Subject: [PATCH] Daemonize earlier in init
+
+commit:cf1475fbdf33d5c3a62099b6b20f2b2017d6de33
+https://github.com/nhorman/rng-tools
+
+It was reported here:
+https://github.com/nhorman/rng-tools/issues/73
+
+That rngd hangs on shutdown, but only when being run as a daemon.  The problem
+turns out to be that we are daemonizing too late in init.  Because we daemonize
+after initalizing all our entropy sources, we get a premature exit on the
+threads created prior to daemonization.  This leads to hangs in shutdown when we
+wait for termination of threads that have already exited abnormally.
+
+Fix it by daemonizing before we init any entropy sources
+
+Upstream-Status: Backport
+
+Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
+Signed-off-by: Anca Nicoleta Mihalache <anca.mihalache at windriver.com>
+Signed-off-by: De Huo <de.huo at windriver.com>
+---
+ rngd.c | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/rngd.c b/rngd.c
+index a086949..78ff4f4 100644
+--- a/rngd.c
++++ b/rngd.c
+@@ -749,6 +749,22 @@ int main(int argc, char **argv)
+ 	if (argp_parse(&argp, argc, argv, 0, 0, arguments) < 0)
+ 		return 1;
+ 
++	if (arguments->daemon && !arguments->list) {
++		am_daemon = true;
++
++		if (daemon(0, 0) < 0) {
++			message(LOG_CONS|LOG_INFO, "can't daemonize: %s\n",
++			strerror(errno));
++			return 1;
++		}
++
++		/* require valid, locked PID file to proceed */
++		pid_fd = write_pid_file(arguments->pid_file);
++		if (pid_fd < 0)
++			return 1;
++
++	}
++
+ 	if (arguments->list) {
+ 		int found = 0;
+ 		message(LOG_CONS|LOG_INFO, "Entropy sources that are available but disabled\n");
+@@ -807,28 +823,12 @@ int main(int argc, char **argv)
+ 	/* Init entropy sink and open random device */
+ 	init_kernel_rng(arguments->random_name);
+ 
+-	if (arguments->daemon) {
+-		am_daemon = true;
+-
+-		if (daemon(0, 0) < 0) {
+-			message(LOG_CONS|LOG_INFO, "can't daemonize: %s\n",
+-			strerror(errno));
+-			return 1;
+-		}
+-
+-		/* require valid, locked PID file to proceed */
+-		pid_fd = write_pid_file(arguments->pid_file);
+-		if (pid_fd < 0)
+-			return 1;
+-
+-		signal(SIGHUP, SIG_IGN);
+-		signal(SIGPIPE, SIG_IGN);
+-	}
+ 	/*
+ 	 * We always catch these to ensure that we gracefully shutdown
+ 	 */
+ 	signal(SIGINT, term_signal);
+ 	signal(SIGTERM, term_signal);
++
+ 	if (arguments->test) {
+ 		message(LOG_CONS|LOG_INFO, "Entering test mode...no entropy will "
+ 			"be delivered to the kernel\n");
+-- 
+2.23.0
+
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.7.bb b/meta/recipes-support/rng-tools/rng-tools_6.7.bb
index b4e453f..c73466e 100644
--- a/meta/recipes-support/rng-tools/rng-tools_6.7.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_6.7.bb
@@ -13,6 +13,8 @@ SRC_URI = "\
     file://init \
     file://default \
     file://rngd.service \
+    file://0001-Allow-jitter-threads-to-exit-faster.patch \
+    file://0002-Daemonize-earlier-in-init.patch \
 "
 SRCREV = "9fc873c5af0e392632e6b736938b811f7ca97251"
 
-- 
1.9.1


From git at andred.net  Wed Mar 11 10:06:03 2020
From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik)
Date: Wed, 11 Mar 2020 10:06:03 +0000
Subject: [oe] [meta-oe][PATCH] smem: matplotlib is an optional depencency
In-Reply-To: <e50174e3f36143c1dc43f41cedc6232c34035578.camel@andred.net>
References: <20200311075513.9491-1-nick83ola@gmail.com>
	<e50174e3f36143c1dc43f41cedc6232c34035578.camel@andred.net>
Message-ID: <44513925f8e11e8f2c6afedce2558da0a9e608f0.camel@andred.net>

On Wed, 2020-03-11 at 09:43 +0000, Andr? Draszik wrote:
> On Wed, 2020-03-11 at 07:55 +0000, Nicola Lunghi wrote:
> > smem doesn't need matplotlib and numpy to run, is an optional dependency only
> > needed to produce graphs.
> 
> Right, that's why it's an RRECOMMENDS. If you don't want it in the image, just do
> BAD_RECOMMENDATIONS as per usual practice :-)

Also, smem really wants those to produce graphs. If you want something simple on
the target to just capture the data, there is smemcap as a separate utility
(and package).

A.

> 
> Cheers,
> Andre'
> 
> > This is needed to avoid to include and build matplotlib and numpy by default
> > 
> > Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
> > ---
> >  meta-oe/recipes-support/smem/smem_1.5.bb | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/recipes-support/smem/smem_1.5.bb
> > index 90db9c3f3..446325e93 100644
> > --- a/meta-oe/recipes-support/smem/smem_1.5.bb
> > +++ b/meta-oe/recipes-support/smem/smem_1.5.bb
> > @@ -20,6 +20,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
> >  
> >  S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
> >  
> > +#PACKAGECONFIG ?= "graph"
> > +PACKAGECONFIG[graph] = ",,,python3-matplotlib python3-numpy"
> > +
> >  do_compile() {
> >          ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
> >  }
> > @@ -34,7 +37,6 @@ do_install() {
> >  }
> >  
> >  RDEPENDS_${PN} = "python3-core python3-compression"
> > -RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
> >  
> >  PACKAGE_BEFORE_PN = "smemcap"
> >  
> > -- 
> > 2.20.1
> > 


From nick83ola at gmail.com  Wed Mar 11 11:48:27 2020
From: nick83ola at gmail.com (nick83ola)
Date: Wed, 11 Mar 2020 11:48:27 +0000
Subject: [oe] [meta-oe][PATCH] smem: matplotlib is an optional depencency
In-Reply-To: <44513925f8e11e8f2c6afedce2558da0a9e608f0.camel@andred.net>
References: <20200311075513.9491-1-nick83ola@gmail.com>
	<e50174e3f36143c1dc43f41cedc6232c34035578.camel@andred.net>
	<44513925f8e11e8f2c6afedce2558da0a9e608f0.camel@andred.net>
Message-ID: <CABPh3UP2nKhoJ8PCysTc=datmBa=Cgb6kCbiyAk4=yjDV1X2Ow@mail.gmail.com>

Hi Andre,
the problem is that if you put the package in RRECOMMENDS, yocto will
still build
python3-numpy and python3-matplotlib even if you add it to BAD_RECOMMENDATIONS

from https://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#var-RRECOMMENDS
  The package manager will automatically install the RRECOMMENDS list
of packages when installing the built package.
  However, you can prevent listed packages from being installed by using the
  BAD_RECOMMENDATIONS, NO_RECOMMENDATIONS, and PACKAGE_EXCLUDE variables.

Note the "from being installed"

And on my particular machine (armv5) with musl the numpy build is broken
(no fpu, not supported for now, working on a fix for that but it
require more time)

Also I don't think is a good idea to build python-numpy (that is huge)
if the user is not using it...
on the smem web page it clearly states (https://www.selenic.com/smem)

 ->  the matplotlib library for chart generation (optional, auto-detected)

and in the code is doing exactly that

  def showbar(l, columns, sort):
      try:
          import pylab, numpy
      except ImportError:
          sys.stderr.write("bar chart requires matplotlib\n")
          sys.exit(-1)

so numpy and matplotlib are needed only if you want to use the

parser.add_option("", "--pie", type='str', help="show pie graph")
parser.add_option("", "--bar", type='str', help="show bar graph")

function

Another thing: there's a way to declare that a recipe needs a floating
point unit?

Cheers
Nick


On Wed, 11 Mar 2020 at 10:06, Andr? Draszik <git at andred.net> wrote:
>
> On Wed, 2020-03-11 at 09:43 +0000, Andr? Draszik wrote:
> > On Wed, 2020-03-11 at 07:55 +0000, Nicola Lunghi wrote:
> > > smem doesn't need matplotlib and numpy to run, is an optional dependency only
> > > needed to produce graphs.
> >
> > Right, that's why it's an RRECOMMENDS. If you don't want it in the image, just do
> > BAD_RECOMMENDATIONS as per usual practice :-)
>
> Also, smem really wants those to produce graphs. If you want something simple on
> the target to just capture the data, there is smemcap as a separate utility
> (and package).
>
> A.
>
> >
> > Cheers,
> > Andre'
> >
> > > This is needed to avoid to include and build matplotlib and numpy by default
> > >
> > > Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
> > > ---
> > >  meta-oe/recipes-support/smem/smem_1.5.bb | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/recipes-support/smem/smem_1.5.bb
> > > index 90db9c3f3..446325e93 100644
> > > --- a/meta-oe/recipes-support/smem/smem_1.5.bb
> > > +++ b/meta-oe/recipes-support/smem/smem_1.5.bb
> > > @@ -20,6 +20,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
> > >
> > >  S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
> > >
> > > +#PACKAGECONFIG ?= "graph"
> > > +PACKAGECONFIG[graph] = ",,,python3-matplotlib python3-numpy"
> > > +
> > >  do_compile() {
> > >          ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
> > >  }
> > > @@ -34,7 +37,6 @@ do_install() {
> > >  }
> > >
> > >  RDEPENDS_${PN} = "python3-core python3-compression"
> > > -RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
> > >
> > >  PACKAGE_BEFORE_PN = "smemcap"
> > >
> > > --
> > > 2.20.1
> > >
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From nicolas.dechesne at linaro.org  Wed Mar 11 13:28:09 2020
From: nicolas.dechesne at linaro.org (Nicolas Dechesne)
Date: Wed, 11 Mar 2020 14:28:09 +0100
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAMRc=MehBSu1RpPkzP=xiFqt3wpJrf4FhV889jcPxUHPnf0GLg@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
	<dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
	<CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>
	<CAMRc=MehBSu1RpPkzP=xiFqt3wpJrf4FhV889jcPxUHPnf0GLg@mail.gmail.com>
Message-ID: <CAP71Wjz1n_Csm762xbsxUK-3i3OYm-rfh=9Ccf28USLgJjRiFQ@mail.gmail.com>

hi Bartosz,

On Wed, Mar 11, 2020 at 9:04 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:

> wt., 3 mar 2020 o 14:56 Bartosz Golaszewski <brgl at bgdev.pl> napisa?(a):
> >
> > If this is not something that should be part of meta-openembedded - is
> > there any way to have it hosted at https://git.yoctoproject.org/cgit/
> > as an official yocto layer? I'm sorry if this is a dumb question, I
> > don't know exactly what the policy is for that.
> >
>
> Hi Khem,
>
> gentle ping on this. What is the procedure of hosting a layer at OE?
>

it depends what you mean here.

1. Hosting on git.yoctoproject.org is mostly for layers supported by YP
membership, these layers are under the responsibility of the YP TSC [1]
2. Hosting on git.openembedded.org is under the responsibility of the OE
TSC [2]

We recently started an initiative using gitlab, to host layers:
https://gitlab.com/openembedded/community, though it's not picking up much
for now. But that would be another option, Paul B. or myself could give you
access

You might want to host the layer on your own (github, gitlab or anywhere
else). I understand why you think that hosting on yoctoproject.org would
make it 'more' official, however hundreds of layers are 'self hosted' and
it's usually not a big concern.

In any case you should register your layer in the OE layer index.


[1] https://wiki.yoctoproject.org/wiki/TSC
[2] https://www.openembedded.org/wiki/TSC



> Bartosz
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From ticotimo at gmail.com  Wed Mar 11 14:38:31 2020
From: ticotimo at gmail.com (Tim Orling)
Date: Wed, 11 Mar 2020 07:38:31 -0700
Subject: [oe] [meta-oe][PATCH] layer.conf: add meta-python to
	LAYERDEPENDS
In-Reply-To: <CAMKF1spdp2K5V2-ejRC+9aHiWoDiqkkDw6KwwQXz1BjdprygJw@mail.gmail.com>
References: <1583473076-316898-1-git-send-email-changqing.li@windriver.com>
	<CA+chaQeyJH+C1u6bmi+6oLm5EqwTUyavb_E1WBz7RNJ4+Yf4EQ@mail.gmail.com>
	<CAMKF1sqK87OAVsNfumC0TZC+6U80NJ4aWzCx45pU+NK33ax=pw@mail.gmail.com>
	<c519184e-2e78-36fd-2f9a-1b97ebfcb2f1@windriver.com>
	<CAMKF1spdp2K5V2-ejRC+9aHiWoDiqkkDw6KwwQXz1BjdprygJw@mail.gmail.com>
Message-ID: <CANx9H-A94H-OdEHBPwwRuDGctRq_Qqx5SLQq-4K8Ov5O08nbxg@mail.gmail.com>

On Wed, Mar 11, 2020 at 12:38 AM Khem Raj <raj.khem at gmail.com> wrote:

> On Tue, Mar 10, 2020 at 11:39 PM Changqing Li
> <changqing.li at windriver.com> wrote:
> >
> >
> > On 3/7/20 12:12 AM, Khem Raj wrote:
> > > On Thu, Mar 5, 2020 at 11:55 PM Martin Jansa <martin.jansa at gmail.com>
> wrote:
> > >> Can we fix mozjs instead?
> > > perhaps thats better fix, maybe it can made optional via packageconfig
> ?
> > > or marked incompatible if meta-python is not included
> >
> > Hi,  Khem
> >
> > There are 2 solutions for the problem, Which do you think is better?
> >
> >
> > 1.  fix this by using BBFILES_DYNAMIC, add a folder dynamic-layers under
> > meta-oe,
> >
> > and move those recipes that depend on meta-python under the
> > dynamic-layers.  and add
> >
> > these bbfiles by BBFILES_DYNAMIC.   but these will need to move many
> > recipes from
> >
> > original folder to folder dynamic-layers,   do you think this change is
> > acceptable?
>
>
> I think we can live with BBFILES_DYNAMIC solution.


I agree.


>

From ticotimo at gmail.com  Wed Mar 11 14:47:03 2020
From: ticotimo at gmail.com (Tim Orling)
Date: Wed, 11 Mar 2020 07:47:03 -0700
Subject: [oe] [meta-python][PATCH 1/3] python3-cycler: add recipe for
	0.10.0
In-Reply-To: <20200311070359.18480-1-nick83ola@gmail.com>
References: <20200311070359.18480-1-nick83ola@gmail.com>
Message-ID: <CANx9H-Ctq14Tj8DyHnN3-X3bB=8XXncAQiiVhRiALtLW4Rszjg@mail.gmail.com>

FWIW, I had made significant progress towards getting ptest enabled for
Matplotlib, although a bit out of date now [1]. Which included a recipe for
cycler. It also unbundled a bunch of dependencies, like libagg.

The ptests do require a fair amount of ram, so standard qemu settings will
epically fail.

[1]
https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python-matplotlib-2.1.2-WIP

On Wed, Mar 11, 2020 at 12:04 AM Nicola Lunghi <nick83ola at gmail.com> wrote:

> This is a dependency for python3-matplotlib
>
> Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
> ---
>  .../python/python3-cycler_0.10.0.bb              | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>  create mode 100644 meta-python/recipes-devtools/python/
> python3-cycler_0.10.0.bb
>
> diff --git a/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
> b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
> new file mode 100644
> index 000000000..cd21be8ac
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
> @@ -0,0 +1,16 @@
> +SUMMARY = "Composable style cycles"
> +HOMEPAGE = "http://github.com/matplotlib/cycler"
> +LICENSE = "BSD"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811"
> +
> +SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b"
> +SRC_URI[sha256sum] =
> "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
> +
> +inherit pypi setuptools3
> +
> +RDEPENDS_${PN} += "\
> +    python3-core \
> +    python3-six \
> +"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From sakib.sajal at windriver.com  Wed Mar 11 19:11:48 2020
From: sakib.sajal at windriver.com (Sakib Sajal)
Date: Wed, 11 Mar 2020 12:11:48 -0700
Subject: [oe] [meta-oe][PATCH v2] openjpeg: Fix CVE-2020-6851
Message-ID: <20200311191148.77027-1-sakib.sajal@windriver.com>

From: Yue Tao <Yue.Tao at windriver.com>

Backport patch from upstream to fix heap-based buffer overflow

Upstream-Status: Backport
CVE: CVE-2020-6851

Signed-off-by: Yue Tao <Yue.Tao at windriver.com>
Signed-off-by: Sakib Sajal <Sakib.Sajal at windriver.com>
---
 .../openjpeg/openjpeg/CVE-2020-6851.patch     | 32 +++++++++++++++++++
 .../openjpeg/openjpeg_2.3.1.bb                |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch

diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
new file mode 100644
index 000000000..9f2fc901f
--- /dev/null
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
@@ -0,0 +1,32 @@
+From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at spatialys.com>
+Date: Sat, 11 Jan 2020 01:51:19 +0100
+Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
+ coordinates are beyond INT_MAX (fixes #1228)
+
+---
+ src/lib/openjp2/j2k.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
+index 14f6ff41..922550eb 100644
+--- a/src/lib/openjp2/j2k.c
++++ b/src/lib/openjp2/j2k.c
+@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
+     l_img_comp = p_image->comps;
+     for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
+         OPJ_INT32 l_h, l_w;
++        if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
++                p_image->y0 > (OPJ_UINT32)INT_MAX ||
++                p_image->x1 > (OPJ_UINT32)INT_MAX ||
++                p_image->y1 > (OPJ_UINT32)INT_MAX) {
++            opj_event_msg(p_manager, EVT_ERROR,
++                          "Image coordinates above INT_MAX are not supported\n");
++            return OPJ_FALSE;
++        }
+ 
+         l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
+                          (OPJ_INT32)l_img_comp->dx);
+-- 
+2.17.1
+
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
index ffd4099b4..4045148dd 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
@@ -8,6 +8,7 @@ DEPENDS = "libpng tiff lcms zlib"
 SRC_URI = " \
     git://github.com/uclouvain/openjpeg.git \
     file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
+    file://CVE-2020-6851.patch \
 "
 SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788"
 S = "${WORKDIR}/git"
-- 
2.17.1


From akuster808 at gmail.com  Wed Mar 11 19:39:43 2020
From: akuster808 at gmail.com (akuster808)
Date: Wed, 11 Mar 2020 12:39:43 -0700
Subject: [oe] [meta-oe][PATCH v2] openjpeg: Fix CVE-2020-6851
In-Reply-To: <20200311191148.77027-1-sakib.sajal@windriver.com>
References: <20200311191148.77027-1-sakib.sajal@windriver.com>
Message-ID: <6edd37b1-c032-c6b3-fc8c-3d7b3e82a294@gmail.com>



On 3/11/20 12:11 PM, Sakib Sajal wrote:
> From: Yue Tao <Yue.Tao at windriver.com>
>
> Backport patch from upstream to fix heap-based buffer overflow
>
> Upstream-Status: Backport
> CVE: CVE-2020-6851

Applies to Zeus too.


>
> Signed-off-by: Yue Tao <Yue.Tao at windriver.com>
> Signed-off-by: Sakib Sajal <Sakib.Sajal at windriver.com>
> ---
>  .../openjpeg/openjpeg/CVE-2020-6851.patch     | 32 +++++++++++++++++++
>  .../openjpeg/openjpeg_2.3.1.bb                |  1 +
>  2 files changed, 33 insertions(+)
>  create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
>
> diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
> new file mode 100644
> index 000000000..9f2fc901f
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
> @@ -0,0 +1,32 @@
> +From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
> +From: Even Rouault <even.rouault at spatialys.com>
> +Date: Sat, 11 Jan 2020 01:51:19 +0100
> +Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
> + coordinates are beyond INT_MAX (fixes #1228)
> +
> +---
> + src/lib/openjp2/j2k.c | 8 ++++++++
> + 1 file changed, 8 insertions(+)
> +
> +diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
> +index 14f6ff41..922550eb 100644
> +--- a/src/lib/openjp2/j2k.c
> ++++ b/src/lib/openjp2/j2k.c
> +@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
> +     l_img_comp = p_image->comps;
> +     for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
> +         OPJ_INT32 l_h, l_w;
> ++        if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
> ++                p_image->y0 > (OPJ_UINT32)INT_MAX ||
> ++                p_image->x1 > (OPJ_UINT32)INT_MAX ||
> ++                p_image->y1 > (OPJ_UINT32)INT_MAX) {
> ++            opj_event_msg(p_manager, EVT_ERROR,
> ++                          "Image coordinates above INT_MAX are not supported\n");
> ++            return OPJ_FALSE;
> ++        }
> + 
> +         l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
> +                          (OPJ_INT32)l_img_comp->dx);
> +-- 
> +2.17.1
> +
> diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
> index ffd4099b4..4045148dd 100644
> --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
> @@ -8,6 +8,7 @@ DEPENDS = "libpng tiff lcms zlib"
>  SRC_URI = " \
>      git://github.com/uclouvain/openjpeg.git \
>      file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
> +    file://CVE-2020-6851.patch \
>  "
>  SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788"
>  S = "${WORKDIR}/git"


From raj.khem at gmail.com  Wed Mar 11 22:40:55 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 11 Mar 2020 15:40:55 -0700
Subject: [oe] State of OE world - 2020-03-09
Message-ID: <CAMKF1spbcLr-ZA8KrObx3OAhv0A7gJ2Dk+Zkj0FZzbMr7C_Maw@mail.gmail.com>

== Failed tasks 2020-03-09 ==

INFO: jenkins-job.sh-1.8.46 Complete log available at
/media/ra_build_share/buildlogs/oe/world/dunfell/log.report.20200310_140304.log

=== common (0) ===

=== common-x86 (0) ===

=== qemuarm (0) ===

=== qemuarm64 (1) ===
    * sources/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb:do_compile

=== qemux86 (0) ===

=== qemux86_64 (0) ===

=== Number of failed tasks (1) ===
{| class=wikitable
|-
|| qemuarm || 0 ||
/media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemuarm.20200309_132038.log/
||
|-
|| qemuarm64 || 1 ||
/media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemuarm64.20200309_202041.log/
|| http://errors.yoctoproject.org/Errors/Build/99898/
|-
|| qemux86 || 0 ||
/media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemux86.20200309_202040.log/
||
|-
|| qemux86_64 || 0 ||
/media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemux86-64.20200309_202038.log/
||
|}

=== PNBLACKLISTs (20) ===


sources/meta-openembedded:
    * meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb:PNBLACKLIST[netkit-rusers]
= "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or
directory"
    * meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb:PNBLACKLIST[drbd]
= "Kernel module Needs forward porting to kernel 5.2+"
    * meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb:PNBLACKLIST[lowpan-tools]
= "WARNING these tools are deprecated! Use wpan-tools instead"
    * meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb:PNBLACKLIST[dnf-plugin-tui]
?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
    * meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb:PNBLACKLIST[nanopb]
= "Needs forward porting to use python3"
    * meta-oe/recipes-extended/socketcan/can-isotp_git.bb:PNBLACKLIST[can-isotp]
= "Kernel module Needs forward porting to kernel 5.2+"
    * meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb:PNBLACKLIST[dnfdragora]
?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
    * meta-oe/recipes-kernel/bpftool/bpftool.bb:PNBLACKLIST[bpftool] =
"Needs forward porting to kernel 5.2+"


sources/meta-yoe:
    * conf/distro/yoe.inc:PNBLACKLIST[build-appliance-image] = "tries
to include whole downloads directory in /home/builder/poky :/"
    * conf/distro/yoe.inc:PNBLACKLIST[smartrefrigerator] = "Needs
porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[qmlbrowser] = "Needs porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[minehunt] = "Needs porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[homeautomation] = "Needs porting
to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[samegame] = "Needs porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[applicationlauncher] = "Needs
porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[spacetouch] = "Needs porting to
libplanes 1.0"
    * conf/distro/yoe.inc:PNBLACKLIST[qtviewplanes] = "Needs porting
to libplanes 1.0"
    * conf/distro/yoe.inc:PNBLACKLIST[egt-thermostat] = "Needs porting
to egt 0.8.2+"


sources/openembedded-core:
    * meta/recipes-devtools/dnf/dnf_4.2.2.bb:PNBLACKLIST[dnf] ?=
"${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not
build without package_rpm in PACKAGE_CLASSES due disabled rpm support
in libsolv', d)}"
    * meta/recipes-devtools/libdnf/libdnf_0.28.1.bb:PNBLACKLIST[libdnf]
?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does
not build without package_rpm in PACKAGE_CLASSES due disabled rpm
support in libsolv', d)}"


conf/local.conf:
    * PNBLACKLIST[bigbuckbunny-1080p] = "big and doesn't really need
to be tested so much"
    * PNBLACKLIST[bigbuckbunny-480p] = "big and doesn't really need to
be tested so much"
    * PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to
be tested so much"
    * PNBLACKLIST[tearsofsteel-1080p] = "big and doesn't really need
to be tested so much"
    * PNBLACKLIST[build-appliance-image] = "tries to include whole
downloads directory in /home/builder/poky :/"

=== QA issues (0) ===
{| class=wikitable
!| Count ||Issue
|-
||0 ||already-stripped
|-
||0 ||build-deps
|-
||0 ||compile-host-path
|-
||0 ||file-rdeps
|-
||0 ||host-user-contaminated
|-
||0 ||installed-vs-shipped
|-
||0 ||invalid-pkgconfig
|-
||0 ||ldflags
|-
||0 ||libdir
|-
||0 ||pkgname
|-
||0 ||qa_pseudo
|-
||0 ||symlink-to-sysroot
|-
||0 ||textrel
|-
||0 ||unknown-configure-option
|-
||0 ||version-going-backwards
|}



=== Incorrect PACKAGE_ARCH or sstate signatures (0) ===

Complete log: /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.signatures.20200309_212117.log/

No issues detected


QA issues by type:
count: 0 issue: already-stripped


count: 0 issue: libdir


count: 0 issue: textrel


count: 0 issue: build-deps


count: 0 issue: file-rdeps


count: 0 issue: version-going-backwards


count: 0 issue: host-user-contaminated


count: 0 issue: installed-vs-shipped


count: 0 issue: unknown-configure-option


count: 0 issue: symlink-to-sysroot


count: 0 issue: invalid-pkgconfig


count: 0 issue: pkgname


count: 0 issue: ldflags


count: 0 issue: compile-host-path


count: 0 issue: qa_pseudo



This git log matches with the metadata as seen by qemuarm build.
In some cases qemux86 and qemux86-64 builds are built with slightly
different metadata, you can see the exact version near the top of each
log.world.qemu* files linked from the report
~/oe/world/yoe ~/oe/world/yoe

From otavio.salvador at ossystems.com.br  Wed Mar 11 23:03:39 2020
From: otavio.salvador at ossystems.com.br (Otavio Salvador)
Date: Wed, 11 Mar 2020 20:03:39 -0300
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAP71Wjz1n_Csm762xbsxUK-3i3OYm-rfh=9Ccf28USLgJjRiFQ@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
	<dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
	<CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>
	<CAMRc=MehBSu1RpPkzP=xiFqt3wpJrf4FhV889jcPxUHPnf0GLg@mail.gmail.com>
	<CAP71Wjz1n_Csm762xbsxUK-3i3OYm-rfh=9Ccf28USLgJjRiFQ@mail.gmail.com>
Message-ID: <CAP9ODKrUcXcvrgWP1DpE=yDaoBcNSo=7fDd+y7jZZ9zcLQYuNQ@mail.gmail.com>

On Wed, Mar 11, 2020 at 10:28 AM Nicolas Dechesne
<nicolas.dechesne at linaro.org> wrote:
> On Wed, Mar 11, 2020 at 9:04 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
>> wt., 3 mar 2020 o 14:56 Bartosz Golaszewski <brgl at bgdev.pl> napisa?(a):
>> >
>> > If this is not something that should be part of meta-openembedded - is
>> > there any way to have it hosted at https://git.yoctoproject.org/cgit/
>> > as an official yocto layer? I'm sorry if this is a dumb question, I
>> > don't know exactly what the policy is for that.
>> gentle ping on this. What is the procedure of hosting a layer at OE?
>
> it depends what you mean here.
>
> 1. Hosting on git.yoctoproject.org is mostly for layers supported by YP membership, these layers are under the responsibility of the YP TSC [1]
> 2. Hosting on git.openembedded.org is under the responsibility of the OE TSC [2]
>
> We recently started an initiative using gitlab, to host layers: https://gitlab.com/openembedded/community, though it's not picking up much for now. But that would be another option, Paul B. or myself could give you access
>
> You might want to host the layer on your own (github, gitlab or anywhere else). I understand why you think that hosting on yoctoproject.org would make it 'more' official, however hundreds of layers are 'self hosted' and it's usually not a big concern.
>
> In any case you should register your layer in the OE layer index.
>
>
> [1] https://wiki.yoctoproject.org/wiki/TSC
> [2] https://www.openembedded.org/wiki/TSC

I've been preferring github over gitlab but either works. I also think
we ought to put it under one of those platforms and rely on those for
future.


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

From akuster808 at gmail.com  Wed Mar 11 23:12:12 2020
From: akuster808 at gmail.com (akuster808)
Date: Wed, 11 Mar 2020 16:12:12 -0700
Subject: [oe] State of OE world - 2020-03-09
In-Reply-To: <CAMKF1spbcLr-ZA8KrObx3OAhv0A7gJ2Dk+Zkj0FZzbMr7C_Maw@mail.gmail.com>
References: <CAMKF1spbcLr-ZA8KrObx3OAhv0A7gJ2Dk+Zkj0FZzbMr7C_Maw@mail.gmail.com>
Message-ID: <c06e6d10-600b-17a1-a343-b414875bc988@gmail.com>

Khem,

There is something wrong with this.

No one will be able to get to those logs posted in this email or what is
on the wiki.

I think we need some links like:

http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.world.qemuarm.20191213_215925.log/


-armin

On 3/11/20 3:40 PM, Khem Raj wrote:
> == Failed tasks 2020-03-09 ==
>
> INFO: jenkins-job.sh-1.8.46 Complete log available at
> /media/ra_build_share/buildlogs/oe/world/dunfell/log.report.20200310_140304.log
>
> === common (0) ===
>
> === common-x86 (0) ===
>
> === qemuarm (0) ===
>
> === qemuarm64 (1) ===
>     * sources/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb:do_compile
>
> === qemux86 (0) ===
>
> === qemux86_64 (0) ===
>
> === Number of failed tasks (1) ===
> {| class=wikitable
> |-
> || qemuarm || 0 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemuarm.20200309_132038.log/
> ||
> |-
> || qemuarm64 || 1 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemuarm64.20200309_202041.log/
> || http://errors.yoctoproject.org/Errors/Build/99898/
> |-
> || qemux86 || 0 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemux86.20200309_202040.log/
> ||
> |-
> || qemux86_64 || 0 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemux86-64.20200309_202038.log/
> ||
> |}
>
> === PNBLACKLISTs (20) ===
>
>
> sources/meta-openembedded:
>     * meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb:PNBLACKLIST[netkit-rusers]
> = "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or
> directory"
>     * meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb:PNBLACKLIST[drbd]
> = "Kernel module Needs forward porting to kernel 5.2+"
>     * meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb:PNBLACKLIST[lowpan-tools]
> = "WARNING these tools are deprecated! Use wpan-tools instead"
>     * meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb:PNBLACKLIST[dnf-plugin-tui]
> ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
> not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
>     * meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb:PNBLACKLIST[nanopb]
> = "Needs forward porting to use python3"
>     * meta-oe/recipes-extended/socketcan/can-isotp_git.bb:PNBLACKLIST[can-isotp]
> = "Kernel module Needs forward porting to kernel 5.2+"
>     * meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb:PNBLACKLIST[dnfdragora]
> ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
> not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
>     * meta-oe/recipes-kernel/bpftool/bpftool.bb:PNBLACKLIST[bpftool] =
> "Needs forward porting to kernel 5.2+"
>
>
> sources/meta-yoe:
>     * conf/distro/yoe.inc:PNBLACKLIST[build-appliance-image] = "tries
> to include whole downloads directory in /home/builder/poky :/"
>     * conf/distro/yoe.inc:PNBLACKLIST[smartrefrigerator] = "Needs
> porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[qmlbrowser] = "Needs porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[minehunt] = "Needs porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[homeautomation] = "Needs porting
> to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[samegame] = "Needs porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[applicationlauncher] = "Needs
> porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[spacetouch] = "Needs porting to
> libplanes 1.0"
>     * conf/distro/yoe.inc:PNBLACKLIST[qtviewplanes] = "Needs porting
> to libplanes 1.0"
>     * conf/distro/yoe.inc:PNBLACKLIST[egt-thermostat] = "Needs porting
> to egt 0.8.2+"
>
>
> sources/openembedded-core:
>     * meta/recipes-devtools/dnf/dnf_4.2.2.bb:PNBLACKLIST[dnf] ?=
> "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not
> build without package_rpm in PACKAGE_CLASSES due disabled rpm support
> in libsolv', d)}"
>     * meta/recipes-devtools/libdnf/libdnf_0.28.1.bb:PNBLACKLIST[libdnf]
> ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does
> not build without package_rpm in PACKAGE_CLASSES due disabled rpm
> support in libsolv', d)}"
>
>
> conf/local.conf:
>     * PNBLACKLIST[bigbuckbunny-1080p] = "big and doesn't really need
> to be tested so much"
>     * PNBLACKLIST[bigbuckbunny-480p] = "big and doesn't really need to
> be tested so much"
>     * PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to
> be tested so much"
>     * PNBLACKLIST[tearsofsteel-1080p] = "big and doesn't really need
> to be tested so much"
>     * PNBLACKLIST[build-appliance-image] = "tries to include whole
> downloads directory in /home/builder/poky :/"
>
> === QA issues (0) ===
> {| class=wikitable
> !| Count ||Issue
> |-
> ||0 ||already-stripped
> |-
> ||0 ||build-deps
> |-
> ||0 ||compile-host-path
> |-
> ||0 ||file-rdeps
> |-
> ||0 ||host-user-contaminated
> |-
> ||0 ||installed-vs-shipped
> |-
> ||0 ||invalid-pkgconfig
> |-
> ||0 ||ldflags
> |-
> ||0 ||libdir
> |-
> ||0 ||pkgname
> |-
> ||0 ||qa_pseudo
> |-
> ||0 ||symlink-to-sysroot
> |-
> ||0 ||textrel
> |-
> ||0 ||unknown-configure-option
> |-
> ||0 ||version-going-backwards
> |}
>
>
>
> === Incorrect PACKAGE_ARCH or sstate signatures (0) ===
>
> Complete log: /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.signatures.20200309_212117.log/
>
> No issues detected
>
>
> QA issues by type:
> count: 0 issue: already-stripped
>
>
> count: 0 issue: libdir
>
>
> count: 0 issue: textrel
>
>
> count: 0 issue: build-deps
>
>
> count: 0 issue: file-rdeps
>
>
> count: 0 issue: version-going-backwards
>
>
> count: 0 issue: host-user-contaminated
>
>
> count: 0 issue: installed-vs-shipped
>
>
> count: 0 issue: unknown-configure-option
>
>
> count: 0 issue: symlink-to-sysroot
>
>
> count: 0 issue: invalid-pkgconfig
>
>
> count: 0 issue: pkgname
>
>
> count: 0 issue: ldflags
>
>
> count: 0 issue: compile-host-path
>
>
> count: 0 issue: qa_pseudo
>
>
>
> This git log matches with the metadata as seen by qemuarm build.
> In some cases qemux86 and qemux86-64 builds are built with slightly
> different metadata, you can see the exact version near the top of each
> log.world.qemu* files linked from the report
> ~/oe/world/yoe ~/oe/world/yoe


From raj.khem at gmail.com  Wed Mar 11 23:26:52 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 11 Mar 2020 16:26:52 -0700
Subject: [oe] State of OE world - 2020-03-09
In-Reply-To: <c06e6d10-600b-17a1-a343-b414875bc988@gmail.com>
References: <CAMKF1spbcLr-ZA8KrObx3OAhv0A7gJ2Dk+Zkj0FZzbMr7C_Maw@mail.gmail.com>
	<c06e6d10-600b-17a1-a343-b414875bc988@gmail.com>
Message-ID: <CAMKF1sr93X2ot0+2gJ2XbZbTe47AQvBpGbrPyyQVJuC9ePBX8g@mail.gmail.com>

On Wed, Mar 11, 2020 at 4:12 PM akuster808 <akuster808 at gmail.com> wrote:
>
> Khem,
>
> There is something wrong with this.
>
> No one will be able to get to those logs posted in this email or what is on the wiki.
>
> I think we need some links like:
>
> http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.world.qemuarm.20191213_215925.log/
>

yes its a known issue, Tom is working on fixing the www link
then next report will have the new links.

>
> -armin
>
> On 3/11/20 3:40 PM, Khem Raj wrote:
>
> == Failed tasks 2020-03-09 ==
>
> INFO: jenkins-job.sh-1.8.46 Complete log available at
> /media/ra_build_share/buildlogs/oe/world/dunfell/log.report.20200310_140304.log
>
> === common (0) ===
>
> === common-x86 (0) ===
>
> === qemuarm (0) ===
>
> === qemuarm64 (1) ===
>     * sources/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb:do_compile
>
> === qemux86 (0) ===
>
> === qemux86_64 (0) ===
>
> === Number of failed tasks (1) ===
> {| class=wikitable
> |-
> || qemuarm || 0 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemuarm.20200309_132038.log/
> ||
> |-
> || qemuarm64 || 1 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemuarm64.20200309_202041.log/
> || http://errors.yoctoproject.org/Errors/Build/99898/
> |-
> || qemux86 || 0 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemux86.20200309_202040.log/
> ||
> |-
> || qemux86_64 || 0 ||
> /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.world.qemux86-64.20200309_202038.log/
> ||
> |}
>
> === PNBLACKLISTs (20) ===
>
>
> sources/meta-openembedded:
>     * meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb:PNBLACKLIST[netkit-rusers]
> = "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or
> directory"
>     * meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb:PNBLACKLIST[drbd]
> = "Kernel module Needs forward porting to kernel 5.2+"
>     * meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb:PNBLACKLIST[lowpan-tools]
> = "WARNING these tools are deprecated! Use wpan-tools instead"
>     * meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb:PNBLACKLIST[dnf-plugin-tui]
> ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
> not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
>     * meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb:PNBLACKLIST[nanopb]
> = "Needs forward porting to use python3"
>     * meta-oe/recipes-extended/socketcan/can-isotp_git.bb:PNBLACKLIST[can-isotp]
> = "Kernel module Needs forward porting to kernel 5.2+"
>     * meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb:PNBLACKLIST[dnfdragora]
> ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
> not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
>     * meta-oe/recipes-kernel/bpftool/bpftool.bb:PNBLACKLIST[bpftool] =
> "Needs forward porting to kernel 5.2+"
>
>
> sources/meta-yoe:
>     * conf/distro/yoe.inc:PNBLACKLIST[build-appliance-image] = "tries
> to include whole downloads directory in /home/builder/poky :/"
>     * conf/distro/yoe.inc:PNBLACKLIST[smartrefrigerator] = "Needs
> porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[qmlbrowser] = "Needs porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[minehunt] = "Needs porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[homeautomation] = "Needs porting
> to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[samegame] = "Needs porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[applicationlauncher] = "Needs
> porting to QT > 5.6"
>     * conf/distro/yoe.inc:PNBLACKLIST[spacetouch] = "Needs porting to
> libplanes 1.0"
>     * conf/distro/yoe.inc:PNBLACKLIST[qtviewplanes] = "Needs porting
> to libplanes 1.0"
>     * conf/distro/yoe.inc:PNBLACKLIST[egt-thermostat] = "Needs porting
> to egt 0.8.2+"
>
>
> sources/openembedded-core:
>     * meta/recipes-devtools/dnf/dnf_4.2.2.bb:PNBLACKLIST[dnf] ?=
> "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not
> build without package_rpm in PACKAGE_CLASSES due disabled rpm support
> in libsolv', d)}"
>     * meta/recipes-devtools/libdnf/libdnf_0.28.1.bb:PNBLACKLIST[libdnf]
> ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does
> not build without package_rpm in PACKAGE_CLASSES due disabled rpm
> support in libsolv', d)}"
>
>
> conf/local.conf:
>     * PNBLACKLIST[bigbuckbunny-1080p] = "big and doesn't really need
> to be tested so much"
>     * PNBLACKLIST[bigbuckbunny-480p] = "big and doesn't really need to
> be tested so much"
>     * PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to
> be tested so much"
>     * PNBLACKLIST[tearsofsteel-1080p] = "big and doesn't really need
> to be tested so much"
>     * PNBLACKLIST[build-appliance-image] = "tries to include whole
> downloads directory in /home/builder/poky :/"
>
> === QA issues (0) ===
> {| class=wikitable
> !| Count ||Issue
> |-
> ||0 ||already-stripped
> |-
> ||0 ||build-deps
> |-
> ||0 ||compile-host-path
> |-
> ||0 ||file-rdeps
> |-
> ||0 ||host-user-contaminated
> |-
> ||0 ||installed-vs-shipped
> |-
> ||0 ||invalid-pkgconfig
> |-
> ||0 ||ldflags
> |-
> ||0 ||libdir
> |-
> ||0 ||pkgname
> |-
> ||0 ||qa_pseudo
> |-
> ||0 ||symlink-to-sysroot
> |-
> ||0 ||textrel
> |-
> ||0 ||unknown-configure-option
> |-
> ||0 ||version-going-backwards
> |}
>
>
>
> === Incorrect PACKAGE_ARCH or sstate signatures (0) ===
>
> Complete log: /media/ra_build_share/buildlogs/oe/world/dunfell//media/ra_build_share/buildlogs/oe/world/dunfell/log.signatures.20200309_212117.log/
>
> No issues detected
>
>
> QA issues by type:
> count: 0 issue: already-stripped
>
>
> count: 0 issue: libdir
>
>
> count: 0 issue: textrel
>
>
> count: 0 issue: build-deps
>
>
> count: 0 issue: file-rdeps
>
>
> count: 0 issue: version-going-backwards
>
>
> count: 0 issue: host-user-contaminated
>
>
> count: 0 issue: installed-vs-shipped
>
>
> count: 0 issue: unknown-configure-option
>
>
> count: 0 issue: symlink-to-sysroot
>
>
> count: 0 issue: invalid-pkgconfig
>
>
> count: 0 issue: pkgname
>
>
> count: 0 issue: ldflags
>
>
> count: 0 issue: compile-host-path
>
>
> count: 0 issue: qa_pseudo
>
>
>
> This git log matches with the metadata as seen by qemuarm build.
> In some cases qemux86 and qemux86-64 builds are built with slightly
> different metadata, you can see the exact version near the top of each
> log.world.qemu* files linked from the report
> ~/oe/world/yoe ~/oe/world/yoe
>
>

From akuster808 at gmail.com  Thu Mar 12 02:57:19 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:19 -0700
Subject: [oe] [zeus 00/13] Patch review
Message-ID: <cover.1583981708.git.akuster808@gmail.com>

Here is the next set for meta-openembedded.
Please have reviews back by Friday.

The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:

  fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)

are available in the Git repository at:

  git://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
  http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut

Adrian Bunk (1):
  wireshark: Upgrade 3.0.6 -> 3.0.8

Carlos Rafael Giani (1):
  opencv: Enable pkg-config .pc file generation

Khem Raj (2):
  ade: Fix install paths in multilib builds
  sanlock: Replace cp -a with cp -R --no-dereference

Martin Jansa (1):
  s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
    use git fetcher instead of svn fetcher

Mike Krupicka (1):
  mosquitto: Use mosquitto.init for daemon init

Paul Barker (1):
  lmsensors: Fix sensord dependencies

Peter Kjellerstedt (2):
  lvm2, libdevmapper: Do not patch configure
  libldb: Do not require the "pam" distro feature to be enabled

Ross Burton (4):
  opencv: don't download during configure
  opencv: also download face alignment data in do_fetch()
  opencv: PACKAGECONFIG for G-API, use system ADE
  opencv: abort configure if we need to download

 .../mosquitto/files/mosquitto.init            |  2 +-
 .../recipes-support/libldb/libldb_1.5.6.bb    |  3 +-
 ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} |  4 +-
 .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb |  3 +-
 ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++
 .../recipes-extended/sanlock/sanlock_3.8.0.bb |  4 +-
 ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------
 ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++
 meta-oe/recipes-support/opencv/ade_0.1.1f.bb  |  1 +
 .../opencv/opencv/download.patch              | 32 ++++++++++++
 .../recipes-support/opencv/opencv_4.1.0.bb    | 32 ++++++++++--
 ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} |  7 ++-
 ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} |  6 +--
 ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++--
 .../{usbpath_svn.bb => usbpath_git.bb}        | 10 ++--
 .../{wmiconfig_svn.bb => wmiconfig_git.bb}    | 13 +++--
 16 files changed, 183 insertions(+), 69 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%)
 create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
 create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
 create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
 rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%)
 rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%)
 rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
 rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%)
 rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)

-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:20 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:20 -0700
Subject: [oe] [zeus 01/13] mosquitto: Use mosquitto.init for daemon init
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <7624a4f2d1a86538dbf556e7ad1d82841e7e4e65.1583981708.git.akuster808@gmail.com>

From: Mike Krupicka <Mike.Krupicka at panduit.com>

Config file specification is missing in start) case. It is present already in restart) case.

Signed-off-by: Khem Raj <raj.khem at gmail.com>
(cherry picked from commit 257ea010b716073acbe6866f4c3968b4962fdc37)
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../recipes-connectivity/mosquitto/files/mosquitto.init         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
index 6a0c12760e..9d5963c418 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
+++ b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
@@ -38,7 +38,7 @@ export PATH="${PATH:+$PATH:}@SBINDIR@:@BASE_SBINDIR@"
 case "$1" in
     start)
         echo "Starting Mosquitto message broker" "mosquitto"
-        if start-stop-daemon --start --quiet --oknodo --background  --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} ; then
+        if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c @SYSCONFDIR@/mosquitto/mosquitto.conf ; then
             exit 0
         else
             exit 1
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:21 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:21 -0700
Subject: [oe] [zeus 02/13] wireshark: Upgrade 3.0.6 -> 3.0.8
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <8d55a4ea3ccf886dbecdc1ce15c37e4c01ac8788.1583981708.git.akuster808@gmail.com>

From: Adrian Bunk <bunk at stusta.de>

Upgrade on the 3.0 stable branch,
including fixes for CVE-2019-19553 and CVE-2020-7045.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.8.bb
similarity index 95%
rename from meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
rename to meta-networking/recipes-support/wireshark/wireshark_3.0.8.bb
index ccaa0c94a3..226e16e4ed 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.8.bb
@@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-SRC_URI[md5sum] = "c6f8d12a3efe21cc7885f7cb0c4bd938"
-SRC_URI[sha256sum] = "a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e"
+SRC_URI[md5sum] = "034f09e639fb4efebbc08af7b2a85333"
+SRC_URI[sha256sum] = "b4bd8189934d82330a053c5b10398f2b625b1e1c8818831ab61739b2d7aa7561"
 
 PE = "1"
 
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:22 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:22 -0700
Subject: [oe] [zeus 03/13] lvm2, libdevmapper: Do not patch configure
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <3874e1681dc90ff5516fe2e5537387747b6b8928.1583981708.git.akuster808@gmail.com>

From: Peter Kjellerstedt <pkj at axis.com>

Since the do_configure task regenerates the configure script, there is
no need to patch it. Actually doing so will cause problems, which can be
seen by doing:

  bitbake lvm2 -c configure
  bitbake lvm2 -c patch -f

Reported-by: Andrey Zhizhikin <andrey.z at gmail.com>
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch
index 07cb88ffba..91ab239f37 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch
@@ -4,44 +4,12 @@ Date: Mon, 19 Aug 2019 14:54:43 +0200
 Subject: [PATCH] configure: Fix setting of CLDFLAGS default
 
 ---
- configure    | 6 +++---
  configure.ac | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc]
 Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
 
-diff --git a/configure b/configure
-index ff3a59b6b..4c8476502 100755
---- a/configure
-+++ b/configure
-@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then :
- fi
- case "$host_os" in
- 	linux*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
- 		# equivalent to -rdynamic
- 		ELDFLAGS="-Wl,--export-dynamic"
- 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -3098,7 +3098,7 @@ case "$host_os" in
- 		;;
- 	darwin*)
- 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- 		ELDFLAGS=
- 		CLDWHOLEARCHIVE="-all_load"
- 		CLDNOWHOLEARCHIVE=
-@@ -3111,7 +3111,7 @@ case "$host_os" in
- 		BLKDEACTIVATE=no
- 		;;
- 	*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- 		;;
- esac
- 
 diff --git a/configure.ac b/configure.ac
 index 5da694631..830edb8da 100644
 --- a/configure.ac
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:23 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:23 -0700
Subject: [oe] [zeus 04/13] lmsensors: Fix sensord dependencies
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <57213b86c2999636b038ebc4fc4b380fec551523.1583981708.git.akuster808@gmail.com>

From: Paul Barker <pbarker at konsulko.com>

If sensord is removed from PACKAGECONFIG, the recipe should not depend
on rrdtool and the lmsensors package should not depend on
lmsensors-sensord.

Signed-off-by: Paul Barker <pbarker at konsulko.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

Backport of 5674b0a9e8778f7538419451e629ef0c13711123 from master branch.

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb
index ffafd17f82..316d066d59 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 DEPENDS = " \
     bison-native \
     flex-native \
-    rrdtool \
     virtual/libiconv \
 "
 
@@ -93,7 +92,7 @@ ALLOW_EMPTY_${PN} = "1"
 RDEPENDS_${PN} += " \
     ${PN}-libsensors \
     ${PN}-sensors \
-    ${PN}-sensord \
+    ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \
     ${PN}-fancontrol \
     ${PN}-sensorsdetect \
     ${PN}-sensorsconfconvert \
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:24 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:24 -0700
Subject: [oe] [zeus 05/13] libldb: Do not require the "pam" distro feature
	to be enabled
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <863f24825bf877224ac8391a22798d15a2e60478.1583981708.git.akuster808@gmail.com>

From: Peter Kjellerstedt <peter.kjellerstedt at axis.com>

It was only added because samba was a dependency, but was not removed
again when the dependency on samba was removed in commit 6207331f.

This effectively reverts commit a190c2e3.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
(cherry picked from commit 0d2b80bd783fb2190c28caa2ebf3a13d4491d7c7)
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-networking/recipes-support/libldb/libldb_1.5.6.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-networking/recipes-support/libldb/libldb_1.5.6.bb b/meta-networking/recipes-support/libldb/libldb_1.5.6.bb
index 99eb6f9ce8..cc24863c60 100644
--- a/meta-networking/recipes-support/libldb/libldb_1.5.6.bb
+++ b/meta-networking/recipes-support/libldb/libldb_1.5.6.bb
@@ -36,8 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada
 SRC_URI[md5sum] = "fc58ef432c1fcb03fc3bb6cccce08977"
 SRC_URI[sha256sum] = "ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b"
 
-inherit waf-samba distro_features_check
-REQUIRED_DISTRO_FEATURES = "pam"
+inherit waf-samba
 
 S = "${WORKDIR}/ldb-${PV}"
 
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:25 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:25 -0700
Subject: [oe] [zeus 06/13] ade: Fix install paths in multilib builds
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <00cf0f4ddcd89ea8cc8f5f0f800954c349ade834.1583981708.git.akuster808@gmail.com>

From: Khem Raj <raj.khem at gmail.com>

Fixes
ERROR: ade-0.1.1f-r0 do_package: QA Issue: ade: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libade.a

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Sanjeev Nahulanthran <sanjeev.nahulanthran at intel.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 ...tallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++++
 meta-oe/recipes-support/opencv/ade_0.1.1f.bb  |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch

diff --git a/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
new file mode 100644
index 0000000000..f038b0aa91
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
@@ -0,0 +1,39 @@
+From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Thu, 19 Dec 2019 21:33:46 -0800
+Subject: [PATCH] use GNUInstallDirs for detecting install paths
+
+This helps with multilib builds
+
+Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19]
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ sources/ade/CMakeLists.txt | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt
+index 2d1dd20..46415d1 100644
+--- a/sources/ade/CMakeLists.txt
++++ b/sources/ade/CMakeLists.txt
+@@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION)
+                       VERBATIM)
+ endif()
+ 
++include(GNUInstallDirs)
++
+ install(TARGETS ade COMPONENT dev
+         EXPORT adeTargets
+-        ARCHIVE DESTINATION lib
+-        LIBRARY DESTINATION lib
+-        RUNTIME DESTINATION lib
+-        INCLUDES DESTINATION include)
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev)
+ 
+-- 
+2.24.1
+
diff --git a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb
index 332820d149..3861802158 100644
--- a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb
+++ b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb
@@ -5,6 +5,7 @@ organizing data flow processing and execution."
 HOMEPAGE = "https://github.com/opencv/ade"
 
 SRC_URI = "git://github.com/opencv/ade.git \
+           file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \
            "
 
 SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9"
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:26 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:26 -0700
Subject: [oe] [zeus 07/13] opencv: Enable pkg-config .pc file generation
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <79aad0803acddfbc00144936727c86a4820696de.1583981708.git.akuster808@gmail.com>

From: Carlos Rafael Giani <crg7475 at mailbox.org>

In OpenCV 4, .pc file generation is disabled by default. Yet, other
software such as GStreamer and FFmpeg rely on the .pc files during build
time configuration. Explicitely enable .pc file generation to make sure
pkg-config can be used for getting information about OpenCV.

Signed-off-by: Carlos Rafael Giani <crg7475 at mailbox.org>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 77b5dd60c4..5e89db0977 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DCMAKE_SKIP_RPATH=ON \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
+    -DOPENCV_GENERATE_PKGCONFIG=ON \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:27 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:27 -0700
Subject: [oe] [zeus 08/13] opencv: don't download during configure
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <289c3f9fb5a395fa660f21d3768b7d70f04af040.1583981708.git.akuster808@gmail.com>

From: Ross Burton <ross.burton at intel.com>

OpenCV downloads data files during the CMake configure phase, which
is bad because fetching should only happen in do_fetch (and if proxies
are needed, won't be set in do_configure).

The recipe attempts to solve this already by having the repositories in
SRC_URI and moving the files to the correct place before do_configure().
However they are written to ${B} which is then wiped in do_configure so
they're not used.

The OpenCV download logic has a download cache with specially formatted
filenames, so take the downloaded files and populate the cache.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../recipes-support/opencv/opencv_4.1.0.bb    | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 5e89db0977..cfc7854e1d 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -51,10 +51,28 @@ PV = "4.1.0"
 
 S = "${WORKDIR}/git"
 
+# OpenCV wants to download more files during configure.  We download these in
+# do_fetch and construct a source cache in the format it expects
+OPENCV_DLDIR = "${WORKDIR}/downloads"
+
 do_unpack_extra() {
     tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
-    cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
-    cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
+
+    md5() {
+        # Return the MD5 of $1
+        echo $(md5sum $1 | cut -d' ' -f1)
+    }
+    cache() {
+        TAG=$1
+        shift
+        mkdir --parents ${OPENCV_DLDIR}/$TAG
+        for F in $*; do
+            DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F)
+            test -e $DEST || ln -s $F $DEST
+        done
+    }
+    cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
+    cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
 }
 addtask unpack_extra after do_unpack before do_patch
 
@@ -65,6 +83,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
+    -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:28 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:28 -0700
Subject: [oe] [zeus 09/13] opencv: also download face alignment data in
	do_fetch()
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <41f3185f91bf1e8b1ec7cfe0c6da29a9058093d0.1583981708.git.akuster808@gmail.com>

From: Ross Burton <ross.burton at intel.com>

The face alignment data is downloaded in do_configure, so download it in
do_fetch and add it to the cache.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index cfc7854e1d..487393f388 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
 SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
 
 def ipp_filename(d):
     import re
@@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \
            git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \
            git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \
            file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
            file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \
            file://0003-To-fix-errors-as-following.patch \
@@ -73,6 +75,7 @@ do_unpack_extra() {
     }
     cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
     cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
+    cache data ${WORKDIR}/face/*.dat
 }
 addtask unpack_extra after do_unpack before do_patch
 
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:29 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:29 -0700
Subject: [oe] [zeus 10/13] opencv: PACKAGECONFIG for G-API, use system ADE
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <7748b8700cfae176e209faf8052585485a070910.1583981708.git.akuster808@gmail.com>

From: Ross Burton <ross.burton at intel.com>

The Graph API is enabled by default, and if ADE isn't present it will
download a copy of the source during do_configure.

Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we
package.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 487393f388..03e4f58dca 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -93,10 +93,11 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
 "
 EXTRA_OECMAKE_append_x86 = " -DX86=ON"
 
-PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
+PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
     ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
 
+PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
 PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
 PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
 PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:30 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:30 -0700
Subject: [oe] [zeus 11/13] opencv: abort configure if we need to download
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <a07c8387291c2c2650dc17ef7f56f8fef8b50057.1583981708.git.akuster808@gmail.com>

From: Ross Burton <ross.burton at intel.com>

OpenCV's habit of downloading files during do_configure is bad form
(as it becomes impossible to do offline builds), so add an option to
error out if a download would be needed.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../opencv/opencv/download.patch              | 32 +++++++++++++++++++
 .../recipes-support/opencv/opencv_4.1.0.bb    |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch

diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch b/meta-oe/recipes-support/opencv/opencv/download.patch
new file mode 100644
index 0000000000..fa8db88078
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/download.patch
@@ -0,0 +1,32 @@
+This CMake module will download files during do_configure.  This is bad as it
+means we can't do offline builds.
+
+Add an option to disallow downloads by emitting a fatal error.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index cdc47ad2cb..74573f45a2 100644
+--- a/cmake/OpenCVDownload.cmake
++++ b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ #    RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it
+ #  Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache
+ 
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files")
+ if(DEFINED ENV{OPENCV_DOWNLOAD_PATH})
+   set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}")
+@@ -153,6 +154,11 @@ function(ocv_download)
+ 
+   # Download
+   if(NOT EXISTS "${CACHE_CANDIDATE}")
++    if(NOT OPENCV_ALLOW_DOWNLOADS)
++      message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++      return()
++    endif()
++
+     ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+     file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
+          INACTIVITY_TIMEOUT 60
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 03e4f58dca..f679ccb05f 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -48,6 +48,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            file://0003-To-fix-errors-as-following.patch \
            file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
            file://0001-Dont-use-isystem.patch \
+           file://download.patch \
            "
 PV = "4.1.0"
 
@@ -87,6 +88,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     -DIPPROOT=${WORKDIR}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
     -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
+    -DOPENCV_ALLOW_DOWNLOADS=OFF \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:31 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:31 -0700
Subject: [oe] [zeus 12/13] s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native,
	usbpath, wmiconfig: use git fetcher instead of svn fetcher
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <d20c231a946a6c703910808c09a6e26f9401d476.1583981708.git.akuster808@gmail.com>

From: Martin Jansa <martin.jansa at gmail.com>

* svn checkouts from http://svn.openmoko.org/ are now redirected to github:
  svn --non-interactive --trust-server-cert co --no-auth-cache --ignore-externals -r 4949 http://svn.openmoko.org/trunk/src/target/gpio at 4949 gpio

Redirecting to URL 'https://github.com/openmoko/openmoko-svn':
A    gpio/branches
A    gpio/branches/oe
A    gpio/branches/oe/pre-20070305
A    gpio/branches/oe/pre-20070305/README
A    gpio/branches/oe/pre-20070305/classes
A    gpio/branches/oe/pre-20070305/classes/autotools.bbclass
A    gpio/branches/oe/pre-20070305/classes/base.bbclass
A    gpio/branches/oe/pre-20070305/classes/openmoko-base.bbclass
A    gpio/branches/oe/pre-20070305/classes/openmoko-panel-plugin.bbclass

* unfortunately this is causing the checkout to start from trunk, not the
  subdirectory specified in the URL (e.g. /trunk/src/target/gpio) and then
  S variable points to incorrect directory as discussed here:
  http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205028.html

* use git fetcher directly to remove the dependency on subversion-native

* for simplicity use the same SRCREV and PV for all of these, there wasn't any
  commit in last 8 years (not anyone can expect new commits), I don't
  expect anyone nowadays actually using these recipes which I've imported
  from meta-smartphone in 2011 - that's why I will send their removal in
  follow-up commit.

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
(cherry picked from commit 6902dcd2edc3a08f6929e19e9a9c18493883f9d2)
[ak: fixes build issue
WARNING: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: Could not copy license file /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c to /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/license-destdir/s3c24xx-gpio/gpio.c: [Errno 2] No such file or directory: '/home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c'
ERROR: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: QA Issue: s3c24xx-gpio: LIC_FILES_CHKSUM points to an invalid file: /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c [license-checksum]
]
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb}    |  7 +++----
 .../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb}    |  6 +++---
 ...ux-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++++------
 .../usbpath/{usbpath_svn.bb => usbpath_git.bb}      | 10 +++++-----
 .../{wmiconfig_svn.bb => wmiconfig_git.bb}          | 13 ++++++-------
 5 files changed, 22 insertions(+), 25 deletions(-)
 rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%)
 rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%)
 rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
 rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%)
 rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)

diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb
similarity index 73%
rename from meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
rename to meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb
index 255754d5d1..98573a062c 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb
@@ -3,11 +3,10 @@ SECTION = "console/utils"
 AUTHOR = "Werner Almesberger <werner at openmoko.org>"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1"
-SRCREV = "4949"
-PV = "1.0+svnr${SRCPV}"
-PR = "r2"
+PV = "1.0+git${SRCPV}"
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http"
+SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1"
+SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio"
 S = "${WORKDIR}/gpio"
 
 CLEANBROKEN = "1"
diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb
similarity index 74%
rename from meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
rename to meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb
index 976a4f15ec..99781718c8 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb
@@ -3,10 +3,10 @@ SECTION = "console/utils"
 AUTHOR = "Werner Almesberger <werner at openmoko.org>"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7"
-SRCREV = "4949"
-PV = "1.0+svnr${SRCPV}"
+PV = "1.0+git${SRCPV}"
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http"
+SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1"
+SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio"
 S = "${WORKDIR}/gpio"
 
 CLEANBROKEN = "1"
diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb
similarity index 72%
rename from meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
rename to meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb
index 9e609c4dd8..7d468bae18 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb
@@ -3,13 +3,12 @@ SECTION = "devel"
 AUTHOR = "Harald Welte <laforge at openmoko.org>"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8"
-SRCREV = "4268"
-PV = "0.1+svnr${SRCPV}"
-PR = "r1"
+PV = "1.0+git${SRCPV}"
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http \
-           file://0001-ppt.c-Do-not-include-sys-io.h.patch \
-          "
+SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1"
+SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \
+    file://0001-ppt.c-Do-not-include-sys-io.h.patch \
+"
 S = "${WORKDIR}/sjf2410-linux"
 
 inherit native deploy
diff --git a/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-oe/recipes-support/usbpath/usbpath_git.bb
similarity index 68%
rename from meta-oe/recipes-support/usbpath/usbpath_svn.bb
rename to meta-oe/recipes-support/usbpath/usbpath_git.bb
index 6c9cd049fe..a3c75901fb 100644
--- a/meta-oe/recipes-support/usbpath/usbpath_svn.bb
+++ b/meta-oe/recipes-support/usbpath/usbpath_git.bb
@@ -8,12 +8,12 @@ DEPENDS_class-native = "virtual/libusb0-native"
 
 BBCLASSEXTEND = "native"
 
-SRCREV = "3172"
-PV = "0.0+svnr${SRCPV}"
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \
-           file://configure.patch"
+PV = "1.0+git${SRCPV}"
 
+SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1"
+SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \
+    file://configure.patch \
+"
 S = "${WORKDIR}/usbpath"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb
similarity index 58%
rename from meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
rename to meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb
index c66572b1c1..23273caf8e 100644
--- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
+++ b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb
@@ -2,14 +2,13 @@ SUMMARY = "Atheros 6K Wifi configuration utility"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911"
 SECTION = "console/network"
-SRCREV = "5394"
-PV = "0.0.0+svnr${SRCPV}"
-PR = "r2"
+PV = "1.0+git${SRCPV}"
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \
-           file://0001-makefile-Pass-CFLAGS-to-compile.patch \
-           file://0002-fix-err-API-to-have-format-string.patch \
-           "
+SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1"
+SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \
+    file://0001-makefile-Pass-CFLAGS-to-compile.patch \
+    file://0002-fix-err-API-to-have-format-string.patch \
+"
 S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig"
 
 CLEANBROKEN = "1"
-- 
2.17.1


From akuster808 at gmail.com  Thu Mar 12 02:57:32 2020
From: akuster808 at gmail.com (Armin Kuster)
Date: Wed, 11 Mar 2020 19:57:32 -0700
Subject: [oe] [zeus 13/13] sanlock: Replace cp -a with cp -R --no-dereference
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <eb58bf9bca2187eb68497d975c314f5e58d7e58b.1583981708.git.akuster808@gmail.com>

From: Khem Raj <raj.khem at gmail.com>

helps to stop leaking builder's UID into sstate cache

Fixes
Exception: KeyError: 'getpwuid(): uid not found: 6000'

Signed-off-by: Khem Raj <raj.khem at gmail.com>
(cherry picked from commit 80d4d7538a85123603eea3d87542c1c0433febb7)
[ak: fixes build issue
Exception: KeyError: 'getpwuid(): uid not found: 1000']
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++
 .../recipes-extended/sanlock/sanlock_3.8.0.bb |  4 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch

diff --git a/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch b/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
new file mode 100644
index 0000000000..a0b721c466
--- /dev/null
+++ b/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
@@ -0,0 +1,51 @@
+From 78a9cffb1c760466933bbbcbae7ecb9b30a3e6a5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Thu, 21 Nov 2019 13:47:42 -0800
+Subject: [PATCH] sanlock: Replace "cp -a" with "cp -R --no-dereference
+ --preserve=mode, links"
+
+Using "cp -a" leaks UID of user running the builds
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ src/Makefile  | 8 ++++----
+ wdmd/Makefile | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 533dd79..2fc9ba5 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -127,9 +127,9 @@ install: all
+ 	$(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)
+ 	$(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig
+ 	$(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig
+-	cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR)
+ 	$(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR)
+ 	$(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/
+diff --git a/wdmd/Makefile b/wdmd/Makefile
+index 5849efc..4894517 100644
+--- a/wdmd/Makefile
++++ b/wdmd/Makefile
+@@ -68,7 +68,7 @@ install: all
+ 	$(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8
+ 	$(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR)
+ 	$(INSTALL) -c -m 755 $(SHLIB_TARGET) $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR)
+-	cp -a $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR)
++	cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR)
+ 	$(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR)
+ 	$(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8
+-- 
+2.24.0
+
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb
index 9f7ce9c570..850690fe9e 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb
@@ -11,7 +11,9 @@ SECTION = "utils"
 LICENSE = "LGPLv2+ & GPLv2 & GPLv2+"
 LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22"
 
-SRC_URI = "git://pagure.io/sanlock.git;protocol=http"
+SRC_URI = "git://pagure.io/sanlock.git;protocol=http \
+           file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
+          "
 SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f"
 S = "${WORKDIR}/git"
 
-- 
2.17.1


From scott.branden at broadcom.com  Thu Mar 12 03:02:30 2020
From: scott.branden at broadcom.com (Scott Branden)
Date: Wed, 11 Mar 2020 20:02:30 -0700
Subject: [oe] [meta-python][PATCH] python3-pycryptodomex: add 3.9.4
	recipe
In-Reply-To: <CAAr5zNcMr=PuSfM5sQ4oSFFwpVX8rjKuYOHoawOxtgs89jom_w@mail.gmail.com>
References: <20200310024936.18941-1-scott.branden@broadcom.com>
	<CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>
	<2bdaa8bf-73cd-18d4-fbf7-2f08469e7a00@broadcom.com>
	<CAAr5zNcMr=PuSfM5sQ4oSFFwpVX8rjKuYOHoawOxtgs89jom_w@mail.gmail.com>
Message-ID: <CA+JzhdJO5KR8+McWj8gBKsW0k4TuWH=WB47DdbNtiPcGvBfZAg@mail.gmail.com>

So no changes to make.  Could we get this added to master-next?

On Tue, 10 Mar 2020 at 20:48, Rajesh Ravi <rajesh.ravi at broadcom.com> wrote:

> ++
>
> Hi Scott,
>
> A)I tried a lot no other recipe could resolve OP-TEE 3.8.0 build break.
> I posted this in OP-TEE as well as meta-openembedded forums.
> This is the only solution suggested in following OP-TEE forum and  I found
> to be worked as per my knowledge.
>
> Ref: https://github.com/OP-TEE/optee_os/issues/3624
>
>        https://github.com/openembedded/meta-openembedded/issues/187
>
> python3-pycryptodome could not resolve all the required dependencies
> needed by OP-TEE 3.8.0
>
> B)Already existing recipe: python-pycryptodomex_3.9.4.bb does not have
> RCONFLICTS. (even with python3-pycryptodome_3.9.4.bb)
>    Is this probably because there is no  python-pycryptodome recipe?
> Please correct me if I'm wrong
>
> Regards,
> Rajesh
>
>
>
>
>
>
>
>
>
> On Wed, Mar 11, 2020 at 12:45 AM Scott Branden <scott.branden at broadcom.com>
> wrote:
>
>>
>>
>> On 2020-03-09 10:50 p.m., Tim Orling wrote:
>>
>> This probably should have an RCONFLICTS with python3-cryptodme (and maybe
>> even python3-crypto).
>>
>> These three packages step all over each other with same functionality...
>>
>>
>> Good feedback Tim.
>>
>> Rajesh, could you look if the other recipes do what is needed or can be
>> enhanced and used instead?
>>
>>
>> On Mon, Mar 9, 2020 at 7:50 PM Scott Branden via Openembedded-devel <
>> openembedded-devel at lists.openembedded.org> wrote:
>>
>>> From: Rajesh Ravi <rajesh.ravi at broadcom.com>
>>>
>>> Add python3-pycryptodomex 3.9.4 recipe needed to build
>>> such components as optee 3.8.0.
>>>
>>> Signed-off-by: Rajesh Ravi <rajesh.ravi at broadcom.com>
>>> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
>>> ---
>>>  .../python/python3-pycryptodomex_3.9.4.bb     | 30 +++++++++++++++++++
>>>  1 file changed, 30 insertions(+)
>>>  create mode 100644 meta-python/recipes-devtools/python/
>>> python3-pycryptodomex_3.9.4.bb
>>>
>>> diff --git a/meta-python/recipes-devtools/python/
>>> python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/
>>> python3-pycryptodomex_3.9.4.bb
>>> new file mode 100644
>>> index 000000000..be6b10f3f
>>> --- /dev/null
>>> +++ b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
>>> @@ -0,0 +1,30 @@
>>> +SUMMARY = "Cryptographic library for Python"
>>> +DESCRIPTION = "PyCryptodome is a self-contained Python package of
>>> low-level\
>>> + cryptographic primitives."
>>> +HOMEPAGE = "http://www.pycryptodome.org"
>>> +LICENSE = "PD & BSD-2-Clause"
>>> +LIC_FILES_CHKSUM =
>>> "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
>>> +
>>> +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
>>> +SRC_URI[sha256sum] =
>>> "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
>>> +
>>> +inherit pypi
>>> +inherit setuptools3
>>> +
>>> +RDEPENDS_${PN} += " \
>>> +    ${PYTHON_PN}-io \
>>> +    ${PYTHON_PN}-math \
>>> +"
>>> +
>>> +RDEPENDS_${PN}-tests += " \
>>> +    ${PYTHON_PN}-unittest \
>>> +"
>>> +
>>> +PACKAGES =+ "${PN}-tests"
>>> +
>>> +FILES_${PN}-tests += " \
>>> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
>>> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
>>> +"
>>> +
>>> +BBCLASSEXTEND = "native nativesdk"
>>> --
>>> 2.17.1
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>>
>>
>
> --
> Regards,
> Rajesh
>

From ticotimo at gmail.com  Thu Mar 12 03:37:10 2020
From: ticotimo at gmail.com (Tim Orling)
Date: Wed, 11 Mar 2020 20:37:10 -0700
Subject: [oe] [meta-python][PATCH] python3-pycryptodomex: add 3.9.4
	recipe
In-Reply-To: <CA+JzhdJO5KR8+McWj8gBKsW0k4TuWH=WB47DdbNtiPcGvBfZAg@mail.gmail.com>
References: <20200310024936.18941-1-scott.branden@broadcom.com>
	<CANx9H-A_bpFV7c+u_-3p23a4kUmjiuQ+FUE5LqtKu2_rDW+BzQ@mail.gmail.com>
	<2bdaa8bf-73cd-18d4-fbf7-2f08469e7a00@broadcom.com>
	<CAAr5zNcMr=PuSfM5sQ4oSFFwpVX8rjKuYOHoawOxtgs89jom_w@mail.gmail.com>
	<CA+JzhdJO5KR8+McWj8gBKsW0k4TuWH=WB47DdbNtiPcGvBfZAg@mail.gmail.com>
Message-ID: <CANx9H-DknFT=arvxEvTiKktBUS2ONZt9wDGDA=4mwz_YuQvCog@mail.gmail.com>

On Wed, Mar 11, 2020 at 8:02 PM Scott Branden <scott.branden at broadcom.com>
wrote:

> So no changes to make.  Could we get this added to master-next?
>

My concerns have been addressed.

Thank you everyone for the time you took to research the state of things.

Reviewed-by: Tim Orling <ticotimo at gmail.com>

>
> On Tue, 10 Mar 2020 at 20:48, Rajesh Ravi <rajesh.ravi at broadcom.com>
> wrote:
>
>> ++
>>
>> Hi Scott,
>>
>> A)I tried a lot no other recipe could resolve OP-TEE 3.8.0 build break.
>> I posted this in OP-TEE as well as meta-openembedded forums.
>> This is the only solution suggested in following OP-TEE forum and  I
>> found to be worked as per my knowledge.
>>
>> Ref: https://github.com/OP-TEE/optee_os/issues/3624
>>
>>        https://github.com/openembedded/meta-openembedded/issues/187
>>
>> python3-pycryptodome could not resolve all the required dependencies
>> needed by OP-TEE 3.8.0
>>
>> B)Already existing recipe: python-pycryptodomex_3.9.4.bb does not have
>> RCONFLICTS. (even with python3-pycryptodome_3.9.4.bb)
>>    Is this probably because there is no  python-pycryptodome recipe?
>> Please correct me if I'm wrong
>>
>> Regards,
>> Rajesh
>>
>>
>>
>>
>>
>>
>>
>>
>>
>> On Wed, Mar 11, 2020 at 12:45 AM Scott Branden <
>> scott.branden at broadcom.com> wrote:
>>
>>>
>>>
>>> On 2020-03-09 10:50 p.m., Tim Orling wrote:
>>>
>>> This probably should have an RCONFLICTS with python3-cryptodme (and
>>> maybe even python3-crypto).
>>>
>>> These three packages step all over each other with same functionality...
>>>
>>>
>>> Good feedback Tim.
>>>
>>> Rajesh, could you look if the other recipes do what is needed or can be
>>> enhanced and used instead?
>>>
>>>
>>> On Mon, Mar 9, 2020 at 7:50 PM Scott Branden via Openembedded-devel <
>>> openembedded-devel at lists.openembedded.org> wrote:
>>>
>>>> From: Rajesh Ravi <rajesh.ravi at broadcom.com>
>>>>
>>>> Add python3-pycryptodomex 3.9.4 recipe needed to build
>>>> such components as optee 3.8.0.
>>>>
>>>> Signed-off-by: Rajesh Ravi <rajesh.ravi at broadcom.com>
>>>> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
>>>> ---
>>>>  .../python/python3-pycryptodomex_3.9.4.bb     | 30 +++++++++++++++++++
>>>>  1 file changed, 30 insertions(+)
>>>>  create mode 100644 meta-python/recipes-devtools/python/
>>>> python3-pycryptodomex_3.9.4.bb
>>>>
>>>> diff --git a/meta-python/recipes-devtools/python/
>>>> python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/
>>>> python3-pycryptodomex_3.9.4.bb
>>>> new file mode 100644
>>>> index 000000000..be6b10f3f
>>>> --- /dev/null
>>>> +++ b/meta-python/recipes-devtools/python/
>>>> python3-pycryptodomex_3.9.4.bb
>>>> @@ -0,0 +1,30 @@
>>>> +SUMMARY = "Cryptographic library for Python"
>>>> +DESCRIPTION = "PyCryptodome is a self-contained Python package of
>>>> low-level\
>>>> + cryptographic primitives."
>>>> +HOMEPAGE = "http://www.pycryptodome.org"
>>>> +LICENSE = "PD & BSD-2-Clause"
>>>> +LIC_FILES_CHKSUM =
>>>> "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
>>>> +
>>>> +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
>>>> +SRC_URI[sha256sum] =
>>>> "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
>>>> +
>>>> +inherit pypi
>>>> +inherit setuptools3
>>>> +
>>>> +RDEPENDS_${PN} += " \
>>>> +    ${PYTHON_PN}-io \
>>>> +    ${PYTHON_PN}-math \
>>>> +"
>>>> +
>>>> +RDEPENDS_${PN}-tests += " \
>>>> +    ${PYTHON_PN}-unittest \
>>>> +"
>>>> +
>>>> +PACKAGES =+ "${PN}-tests"
>>>> +
>>>> +FILES_${PN}-tests += " \
>>>> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
>>>> +    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
>>>> +"
>>>> +
>>>> +BBCLASSEXTEND = "native nativesdk"
>>>> --
>>>> 2.17.1
>>>>
>>>> --
>>>> _______________________________________________
>>>> Openembedded-devel mailing list
>>>> Openembedded-devel at lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>>
>>>
>>>
>>
>> --
>> Regards,
>> Rajesh
>>
>

From nick83ola at gmail.com  Thu Mar 12 08:50:57 2020
From: nick83ola at gmail.com (nick83ola)
Date: Thu, 12 Mar 2020 08:50:57 +0000
Subject: [oe] [meta-python][PATCH 1/3] python3-cycler: add recipe for
	0.10.0
In-Reply-To: <CANx9H-Ctq14Tj8DyHnN3-X3bB=8XXncAQiiVhRiALtLW4Rszjg@mail.gmail.com>
References: <20200311070359.18480-1-nick83ola@gmail.com>
	<CANx9H-Ctq14Tj8DyHnN3-X3bB=8XXncAQiiVhRiALtLW4Rszjg@mail.gmail.com>
Message-ID: <CABPh3UNyYWiP0pVLkDG_738E+wCxQ38-kgogg5LX00LUnadd4g@mail.gmail.com>

Hi TIm,
nice work I'll have a look into it

Thanks for sharing
Nick


On Wed, 11 Mar 2020 at 14:47, Tim Orling <ticotimo at gmail.com> wrote:
>
> FWIW, I had made significant progress towards getting ptest enabled for Matplotlib, although a bit out of date now [1]. Which included a recipe for cycler. It also unbundled a bunch of dependencies, like libagg.
>
> The ptests do require a fair amount of ram, so standard qemu settings will epically fail.
>
> [1]
> https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python-matplotlib-2.1.2-WIP
>
> On Wed, Mar 11, 2020 at 12:04 AM Nicola Lunghi <nick83ola at gmail.com> wrote:
>>
>> This is a dependency for python3-matplotlib
>>
>> Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
>> ---
>>  .../python/python3-cycler_0.10.0.bb              | 16 ++++++++++++++++
>>  1 file changed, 16 insertions(+)
>>  create mode 100644 meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
>>
>> diff --git a/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
>> new file mode 100644
>> index 000000000..cd21be8ac
>> --- /dev/null
>> +++ b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
>> @@ -0,0 +1,16 @@
>> +SUMMARY = "Composable style cycles"
>> +HOMEPAGE = "http://github.com/matplotlib/cycler"
>> +LICENSE = "BSD"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811"
>> +
>> +SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b"
>> +SRC_URI[sha256sum] = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
>> +
>> +inherit pypi setuptools3
>> +
>> +RDEPENDS_${PN} += "\
>> +    python3-core \
>> +    python3-six \
>> +"
>> +
>> +BBCLASSEXTEND = "native nativesdk"
>> --
>> 2.20.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From martin.jansa at gmail.com  Thu Mar 12 14:14:56 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Thu, 12 Mar 2020 15:14:56 +0100
Subject: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5
In-Reply-To: <CAMKF1spqvnHXTOMWX8VV4QponpKun+2tpZS4hAG5JpDDdv8xgQ@mail.gmail.com>
References: <20200229185539.3905864-1-raj.khem@gmail.com>
	<CA+chaQfxab4+mepbvxdNkoj4h9T1T5Qq4TWwne2teiexjyuwnA@mail.gmail.com>
	<CAMKF1srZjHaeuTD0FLv0kmmn+Gwq9QThHxhGXB0+WSBSo2bEJg@mail.gmail.com>
	<CA+chaQeF7U2C+t+zugHFry2bpxiFbfa294_A_dnfmdvJ-3pw9A@mail.gmail.com>
	<CAMKF1spqvnHXTOMWX8VV4QponpKun+2tpZS4hAG5JpDDdv8xgQ@mail.gmail.com>
Message-ID: <CA+chaQcTRNcXnWX67kRts_K6cBdR9gun3qdqBX5nREts0ymH-g@mail.gmail.com>

It doesn't seem to build for aarch64 without the jit in luajit:

| DEBUG: Executing shell function do_compile
| NOTE: VERBOSE=1 cmake --build
/OE/build/tmp-glibc/work/aarch64-oe-linux/sysdig/0.26.5-r0/build --target
all --
| ninja: error: 'libluajit-5.1.so', needed by 'userspace/sysdig/csysdig',
missing and no known rule to make it
| WARNING: exit code 1 from a shell command.
| ERROR: Execution of
'/OE/build/tmp-glibc/work/aarch64-oe-linux/sysdig/0.26.5-r0/temp/run.do_compile.51845'
failed with exit code 1:
| ninja: error: 'libluajit-5.1.so', needed by 'userspace/sysdig/csysdig',
missing and no known rule to make it
| WARNING: exit code 1 from a shell command.

On Tue, Mar 3, 2020 at 4:27 PM Khem Raj <raj.khem at gmail.com> wrote:

>
>
> On Tue, Mar 3, 2020 at 5:53 AM Martin Jansa <martin.jansa at gmail.com>
> wrote:
>
>> Should I send the patch to move grpc from meta-networking to meta-oe to
>> fix this or do you have it already?
>>
>
> Please send I don?t have it ready
>
>>
>> On Mon, Mar 2, 2020 at 6:22 PM Khem Raj <raj.khem at gmail.com> wrote:
>>
>>> On Mon, Mar 2, 2020 at 4:27 AM Martin Jansa <martin.jansa at gmail.com>
>>> wrote:
>>> >
>>> > Hi,
>>> >
>>> > added dependency on grpc exists only in meta-networking, so this fails
>>> to parse now.
>>> >
>>>
>>> I think grpc is common enough to belong to meta-oe as well.
>>>
>>> > Cheers,
>>>
>>

From schnitzeltony at gmail.com  Thu Mar 12 14:21:38 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Thu, 12 Mar 2020 15:21:38 +0100
Subject: [oe] [PATCH][meta-xfce 1/3] xfce4-clipman-plugin: upgrade 1.4.3 ->
	1.4.4
Message-ID: <20200312142140.5926-1-schnitzeltony@gmail.com>

Release notes for 1.4.4
=======================
This is a bugfix release.

- settings: Improve layout
- settings: Drop some GtkStock items
- Update support URLs from goodies to docs.xfce.org (Bug #16141)
- Drop deprecated Gtk style properties
- Also show desktop file in Cinnamon (Bug #14058)
- Fix getting modifier in gsd-clipboard-manager (Bug #14642)
- Fix typo
- Translation Updates:
  Albanian, Armenian (Armenia), Belarusian, Catalan,
  Chinese (China), Czech, Danish, Finnish, French, Galician,
  Hebrew, Icelandic, Italian, Kazakh, Norwegian Bokm?l, Polish,
  Portuguese, Slovak, Slovenian, Spanish, Turkish, Ukrainian

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 ...-clipman-plugin_1.4.3.bb => xfce4-clipman-plugin_1.4.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.4.3.bb => xfce4-clipman-plugin_1.4.4.bb} (76%)

diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.4.bb
similarity index 76%
rename from meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb
rename to meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.4.bb
index a1ac05729..164895013 100644
--- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb
+++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.4.bb
@@ -8,8 +8,8 @@ inherit xfce-panel-plugin
 
 DEPENDS += "xfconf xorgproto libxtst"
 
-SRC_URI[md5sum] = "fa0acd5f5e3298e56ebd47d2944cd02b"
-SRC_URI[sha256sum] = "29cdb85efb54bd5c9c04cc695b7c4914d6dff972b9fd969cbfb5504e9c632ad2"
+SRC_URI[md5sum] = "104c917ef53a66f7aa2dca01b43c3b77"
+SRC_URI[sha256sum] = "08e14c5d0fcee9adb4bc77efc0ab4af2b12b3fe1ee5e2121fc60e877ac9c29a0"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode"
-- 
2.21.1


From schnitzeltony at gmail.com  Thu Mar 12 14:21:39 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Thu, 12 Mar 2020 15:21:39 +0100
Subject: [oe] [PATCH][meta-xfce 2/3] xfce4-whiskermenu-plugin: upgrade 2.4.2
	-> 2.4.3
In-Reply-To: <20200312142140.5926-1-schnitzeltony@gmail.com>
References: <20200312142140.5926-1-schnitzeltony@gmail.com>
Message-ID: <20200312142140.5926-2-schnitzeltony@gmail.com>

Release notes for 2.4.3
=======================
- Fix loading incorrect icons for some applications. (bug #16461)
- Translation updates: Bulgarian, Finnish, Greek, Icelandic,
  Interlingue, Nepali, Norwegian Bokmal, Russian, Slovak.

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 ...menu-plugin_2.4.2.bb => xfce4-whiskermenu-plugin_2.4.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.4.2.bb => xfce4-whiskermenu-plugin_2.4.3.bb} (66%)

diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb
similarity index 66%
rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb
rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb
index 25fc72d97..3da631bb2 100644
--- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb
+++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit xfce-panel-plugin cmake
 
-SRC_URI[md5sum] = "f553d3be2ffebd8d9fa5b6415647e4ff"
-SRC_URI[sha256sum] = "fb2e1d44744d851c5339900e7af9068397028efa9ee5235a66ab273e95740dee"
+SRC_URI[md5sum] = "7b66438996127b759ad634f6579e003c"
+SRC_URI[sha256sum] = "39faeee91ceb3cb727f9de09dbf20a8c73e524851a2c3b76a4b19a0732de5ff0"
 
 RRECOMMENDS_${PN} += "menulibre"
-- 
2.21.1


From schnitzeltony at gmail.com  Thu Mar 12 14:21:40 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Thu, 12 Mar 2020 15:21:40 +0100
Subject: [oe] [PATCH][meta-xfce 3/3] xfce4-power-manager: upgrade 1.6.5 ->
	1.6.6
In-Reply-To: <20200312142140.5926-1-schnitzeltony@gmail.com>
References: <20200312142140.5926-1-schnitzeltony@gmail.com>
Message-ID: <20200312142140.5926-3-schnitzeltony@gmail.com>

Release notes for 1.6.6
=======================
- Dismiss critical notification when connecting to AC
- Fix inhibiting xfce4-screensaver (Bug #16364)
- settings: Move % sign out of spinbutton (Bug #15994)
- panel-plugin: Toggle presentation mode on middle click
- panel-plugin: Properly show 'About' menu item
- panel-plugin: Add missing about callback
- panel-plugin: Properly hook up about signal
- panel-plugin: Replace deprecated call
- Switch to symbolic window-close icons

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 ...e4-power-manager_1.6.5.bb => xfce4-power-manager_1.6.6.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.5.bb => xfce4-power-manager_1.6.6.bb} (89%)

diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb
similarity index 89%
rename from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb
rename to meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb
index 295e2e4ed..608990ad4 100644
--- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb
+++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb
@@ -11,8 +11,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver"
 
-SRC_URI[md5sum] = "709efbc2de9ed84b4831847ff70bcd7f"
-SRC_URI[sha256sum] = "10adb67899b181ca5fc577fc9bb7a698fb94e42073585f7e2be642c7db127a74"
+SRC_URI[md5sum] = "19873fc8a6de5e37ed57036a0002a5ce"
+SRC_URI[sha256sum] = "1b7bf0d3e8af69b10f7b6a518451e01fc7888e0d9d360bc33f6c89179bb6080b"
 
 EXTRA_OECONF = " \
     --enable-network-manager \
-- 
2.21.1


From raj.khem at gmail.com  Thu Mar 12 16:09:38 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Thu, 12 Mar 2020 09:09:38 -0700
Subject: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5
In-Reply-To: <CA+chaQcTRNcXnWX67kRts_K6cBdR9gun3qdqBX5nREts0ymH-g@mail.gmail.com>
References: <20200229185539.3905864-1-raj.khem@gmail.com>
	<CA+chaQfxab4+mepbvxdNkoj4h9T1T5Qq4TWwne2teiexjyuwnA@mail.gmail.com>
	<CAMKF1srZjHaeuTD0FLv0kmmn+Gwq9QThHxhGXB0+WSBSo2bEJg@mail.gmail.com>
	<CA+chaQeF7U2C+t+zugHFry2bpxiFbfa294_A_dnfmdvJ-3pw9A@mail.gmail.com>
	<CAMKF1spqvnHXTOMWX8VV4QponpKun+2tpZS4hAG5JpDDdv8xgQ@mail.gmail.com>
	<CA+chaQcTRNcXnWX67kRts_K6cBdR9gun3qdqBX5nREts0ymH-g@mail.gmail.com>
Message-ID: <f8165f06-2341-e19d-5135-cfee6cba28fe@gmail.com>



On 3/12/20 7:14 AM, Martin Jansa wrote:
> It doesn't seem to build for aarch64 without the jit in luajit:
> 
> | DEBUG: Executing shell function do_compile
> | NOTE: VERBOSE=1 cmake --build 
> /OE/build/tmp-glibc/work/aarch64-oe-linux/sysdig/0.26.5-r0/build 
> --target all --
> | ninja: error: 'libluajit-5.1.so <http://libluajit-5.1.so>', needed by 
> 'userspace/sysdig/csysdig', missing and no known rule to make it
> | WARNING: exit code 1 from a shell command.
> | ERROR: Execution of 
> '/OE/build/tmp-glibc/work/aarch64-oe-linux/sysdig/0.26.5-r0/temp/run.do_compile.51845' 
> failed with exit code 1:
> | ninja: error: 'libluajit-5.1.so <http://libluajit-5.1.so>', needed by 
> 'userspace/sysdig/csysdig', missing and no known rule to make it
> | WARNING: exit code 1 from a shell command.
> 

luajit needs 32bit compiler on build host, so I wonder if thats the case 
here. I have not yet looked into it, but I have seen this failure on 
aarch64 as well.

> On Tue, Mar 3, 2020 at 4:27 PM Khem Raj <raj.khem at gmail.com 
> <mailto:raj.khem at gmail.com>> wrote:
> 
> 
> 
>     On Tue, Mar 3, 2020 at 5:53 AM Martin Jansa <martin.jansa at gmail.com
>     <mailto:martin.jansa at gmail.com>> wrote:
> 
>         Should I send the patch to move grpc from meta-networking to
>         meta-oe to fix this or do you have it already?
> 
> 
>     Please send I don?t have it ready
> 
> 
>         On Mon, Mar 2, 2020 at 6:22 PM Khem Raj <raj.khem at gmail.com
>         <mailto:raj.khem at gmail.com>> wrote:
> 
>             On Mon, Mar 2, 2020 at 4:27 AM Martin Jansa
>             <martin.jansa at gmail.com <mailto:martin.jansa at gmail.com>> wrote:
>              >
>              > Hi,
>              >
>              > added dependency on grpc exists only in meta-networking,
>             so this fails to parse now.
>              >
> 
>             I think grpc is common enough to belong to meta-oe as well.
> 
>              > Cheers,
> 

From raj.khem at gmail.com  Thu Mar 12 16:57:04 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Thu, 12 Mar 2020 09:57:04 -0700
Subject: [oe] [PATCH] nodejs: install gen-regexp-special-case only when icu
	is enabled
Message-ID: <20200312165704.2373253-1-raj.khem@gmail.com>

From: Jaga <jagadheesan_duraisamy at comcast.com>

Fixes install errors when icu packageconfig is disabled

Signed-off-by: Jaga <jagadheesan_duraisamy at comcast.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 1ea438c5b0..a482c6b4ca 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -138,7 +138,9 @@ do_install_append_class-native() {
     install -d ${D}${bindir}
     install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
     install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator
-    install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case
+    if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then
+        install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case
+    fi
     install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache
     install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot
 }
-- 
2.25.1


From brgl at bgdev.pl  Thu Mar 12 17:51:30 2020
From: brgl at bgdev.pl (Bartosz Golaszewski)
Date: Thu, 12 Mar 2020 18:51:30 +0100
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAP71Wjz1n_Csm762xbsxUK-3i3OYm-rfh=9Ccf28USLgJjRiFQ@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
	<dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
	<CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>
	<CAMRc=MehBSu1RpPkzP=xiFqt3wpJrf4FhV889jcPxUHPnf0GLg@mail.gmail.com>
	<CAP71Wjz1n_Csm762xbsxUK-3i3OYm-rfh=9Ccf28USLgJjRiFQ@mail.gmail.com>
Message-ID: <CAMRc=Md1Udxq0eOUzNH=Pr3corUEa88_wdTJJFyurjMvJcfaAQ@mail.gmail.com>

?r., 11 mar 2020 o 14:28 Nicolas Dechesne
<nicolas.dechesne at linaro.org> napisa?(a):
>
> hi Bartosz,
>
> On Wed, Mar 11, 2020 at 9:04 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
>>
>> wt., 3 mar 2020 o 14:56 Bartosz Golaszewski <brgl at bgdev.pl> napisa?(a):
>> >
>> > If this is not something that should be part of meta-openembedded - is
>> > there any way to have it hosted at https://git.yoctoproject.org/cgit/
>> > as an official yocto layer? I'm sorry if this is a dumb question, I
>> > don't know exactly what the policy is for that.
>> >
>>
>> Hi Khem,
>>
>> gentle ping on this. What is the procedure of hosting a layer at OE?
>

Hi Nicolas,

thanks for the response.

>
> it depends what you mean here.
>
> 1. Hosting on git.yoctoproject.org is mostly for layers supported by YP membership, these layers are under the responsibility of the YP TSC [1]
> 2. Hosting on git.openembedded.org is under the responsibility of the OE TSC [2]
>

I'm not sure what that means exactly in terms of making a layer
official. I can only guess that non-members can't make their layers
part of the project for political reasons.

> We recently started an initiative using gitlab, to host layers: https://gitlab.com/openembedded/community, though it's not picking up much for now. But that would be another option, Paul B. or myself could give you access
>

Yes, that is one way, but I just don't like githubs, gitlabs and other
bitbuckets. I prefer regular mailing list flow + cgit whenever
possible.

> You might want to host the layer on your own (github, gitlab or anywhere else). I understand why you think that hosting on yoctoproject.org would make it 'more' official, however hundreds of layers are 'self hosted' and it's usually not a big concern.
>

They are also scattered all over and significant part of them are not
being actively maintained. Hosting it at some official git would at
least mean that if I ever stop working on it, someone else could take
over without moving the git tree. It would also make it more visible
and make it possible for the development to happen on the official
mailing list.

Anyway: is the material I described in this thread something that
could be committed to various existing parts of meta-openembedded
without creating a new layer?

> In any case you should register your layer in the OE layer index.
>

Sure.

>
> [1] https://wiki.yoctoproject.org/wiki/TSC
> [2] https://www.openembedded.org/wiki/TSC

Thanks,
Bartosz Golaszewski

From raj.khem at gmail.com  Thu Mar 12 18:12:53 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Thu, 12 Mar 2020 11:12:53 -0700
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAMRc=Md1Udxq0eOUzNH=Pr3corUEa88_wdTJJFyurjMvJcfaAQ@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
	<dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
	<CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>
	<CAMRc=MehBSu1RpPkzP=xiFqt3wpJrf4FhV889jcPxUHPnf0GLg@mail.gmail.com>
	<CAP71Wjz1n_Csm762xbsxUK-3i3OYm-rfh=9Ccf28USLgJjRiFQ@mail.gmail.com>
	<CAMRc=Md1Udxq0eOUzNH=Pr3corUEa88_wdTJJFyurjMvJcfaAQ@mail.gmail.com>
Message-ID: <CAMKF1spHPHW7xk5icpG5qVhYTSjuawWidw24o=tVWEve8_MDkg@mail.gmail.com>

On Thu, Mar 12, 2020 at 10:51 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
>
> ?r., 11 mar 2020 o 14:28 Nicolas Dechesne
> <nicolas.dechesne at linaro.org> napisa?(a):
> >
> > hi Bartosz,
> >
> > On Wed, Mar 11, 2020 at 9:04 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
> >>
> >> wt., 3 mar 2020 o 14:56 Bartosz Golaszewski <brgl at bgdev.pl> napisa?(a):
> >> >
> >> > If this is not something that should be part of meta-openembedded - is
> >> > there any way to have it hosted at https://git.yoctoproject.org/cgit/
> >> > as an official yocto layer? I'm sorry if this is a dumb question, I
> >> > don't know exactly what the policy is for that.
> >> >
> >>
> >> Hi Khem,
> >>
> >> gentle ping on this. What is the procedure of hosting a layer at OE?
> >
>
> Hi Nicolas,
>
> thanks for the response.
>
> >
> > it depends what you mean here.
> >
> > 1. Hosting on git.yoctoproject.org is mostly for layers supported by YP membership, these layers are under the responsibility of the YP TSC [1]
> > 2. Hosting on git.openembedded.org is under the responsibility of the OE TSC [2]
> >
>
> I'm not sure what that means exactly in terms of making a layer
> official. I can only guess that non-members can't make their layers
> part of the project for political reasons.

I would suggest to send the proposal to oe-tsc mailing list
tsc at lists.openembedded.org

>
> > We recently started an initiative using gitlab, to host layers: https://gitlab.com/openembedded/community, though it's not picking up much for now. But that would be another option, Paul B. or myself could give you access

openembedded gitlab presence as an organization is new and being
experimented with eventually
it might or might not become more prominent.

> >
>
> Yes, that is one way, but I just don't like githubs, gitlabs and other
> bitbuckets. I prefer regular mailing list flow + cgit whenever
> possible.
>
> > You might want to host the layer on your own (github, gitlab or anywhere else). I understand why you think that hosting on yoctoproject.org would make it 'more' official, however hundreds of layers are 'self hosted' and it's usually not a big concern.
> >
>
> They are also scattered all over and significant part of them are not
> being actively maintained. Hosting it at some official git would at
> least mean that if I ever stop working on it, someone else could take
> over without moving the git tree. It would also make it more visible
> and make it possible for the development to happen on the official
> mailing list.
>
> Anyway: is the material I described in this thread something that
> could be committed to various existing parts of meta-openembedded
> without creating a new layer?
>
> > In any case you should register your layer in the OE layer index.
> >
>
> Sure.
>
> >
> > [1] https://wiki.yoctoproject.org/wiki/TSC
> > [2] https://www.openembedded.org/wiki/TSC
>
> Thanks,
> Bartosz Golaszewski

From pjtexier at koncepto.io  Thu Mar 12 22:00:49 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Thu, 12 Mar 2020 23:00:49 +0100
Subject: [oe] [meta-oe][PATCH] cryptsetup: upgrade 2.3.0 -> 2.3.1
Message-ID: <1584050449-21380-1-git-send-email-pjtexier@koncepto.io>

This is a bug-fix release, see full changelog:

 - https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.3/v2.3.1-ReleaseNotes

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 .../cryptsetup/{cryptsetup_2.3.0.bb => cryptsetup_2.3.1.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.3.0.bb => cryptsetup_2.3.1.bb} (96%)

diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb
similarity index 96%
rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb
rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb
index 0e36ed4..ec375fe 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb
@@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \
 "
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[md5sum] = "48be3bd7c557d051f638047d280e93ee"
-SRC_URI[sha256sum] = "395690de99509428354d3cd15cf023bed01487e6f1565b2181e013dc847bbc85"
+SRC_URI[md5sum] = "cef482c0579f34d9524311ac70c0875f"
+SRC_URI[sha256sum] = "92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2"
 
 inherit autotools gettext pkgconfig
 
-- 
2.7.4


From wangmy at cn.fujitsu.com  Fri Mar 13 11:10:22 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Fri, 13 Mar 2020 04:10:22 -0700
Subject: [oe]  [meta-oe][zeus][PATCH] libssh2: CVE-2019-17498.patch
Message-ID: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>

Security Advisory

References:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17498

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../libssh2/libssh2/CVE-2019-17498.patch      | 131 ++++++++++++++++++
 .../recipes-support/libssh2/libssh2_1.8.2.bb  |   1 +
 2 files changed, 132 insertions(+)
 create mode 100644 meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch

diff --git a/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch b/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
new file mode 100644
index 000000000..f60764c92
--- /dev/null
+++ b/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
@@ -0,0 +1,131 @@
+From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001
+From: Will Cosgrove <will at panic.com>
+Date: Fri, 30 Aug 2019 09:57:38 -0700
+Subject: [PATCH] packet.c: improve message parsing (#402)
+
+* packet.c: improve parsing of packets
+
+file: packet.c
+
+notes:
+Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST.
+
+Upstream-Status: Accepted
+CVE: CVE-2019-17498
+
+Reference to upstream patch:
+https://github.com/libssh2/libssh2/commit/dedcbd106f8e52d5586b0205bc7677e4c9868f9c
+
+---
+ src/packet.c | 68 ++++++++++++++++++++++------------------------------
+ 1 file changed, 29 insertions(+), 39 deletions(-)
+
+diff --git a/src/packet.c b/src/packet.c
+index 38ab6294..2e01bfc5 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -416,8 +416,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
+                     size_t datalen, int macstate)
+ {
+     int rc = 0;
+-    char *message = NULL;
+-    char *language = NULL;
++    unsigned char *message = NULL;
++    unsigned char *language = NULL;
+     size_t message_len = 0;
+     size_t language_len = 0;
+     LIBSSH2_CHANNEL *channelp = NULL;
+@@ -469,33 +469,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
+ 
+         case SSH_MSG_DISCONNECT:
+             if(datalen >= 5) {
+-                size_t reason = _libssh2_ntohu32(data + 1);
++                uint32_t reason = 0;
++                struct string_buf buf;
++                buf.data = (unsigned char *)data;
++                buf.dataptr = buf.data;
++                buf.len = datalen;
++                buf.dataptr++; /* advance past type */
+ 
+-                if(datalen >= 9) {
+-                    message_len = _libssh2_ntohu32(data + 5);
++                _libssh2_get_u32(&buf, &reason);
++                _libssh2_get_string(&buf, &message, &message_len);
++                _libssh2_get_string(&buf, &language, &language_len);
+ 
+-                    if(message_len < datalen-13) {
+-                        /* 9 = packet_type(1) + reason(4) + message_len(4) */
+-                        message = (char *) data + 9;
+-
+-                        language_len =
+-                            _libssh2_ntohu32(data + 9 + message_len);
+-                        language = (char *) data + 9 + message_len + 4;
+-
+-                        if(language_len > (datalen-13-message_len)) {
+-                            /* bad input, clear info */
+-                            language = message = NULL;
+-                            language_len = message_len = 0;
+-                        }
+-                    }
+-                    else
+-                        /* bad size, clear it */
+-                        message_len = 0;
+-                }
+                 if(session->ssh_msg_disconnect) {
+-                    LIBSSH2_DISCONNECT(session, reason, message,
+-                                       message_len, language, language_len);
++                    LIBSSH2_DISCONNECT(session, reason, (const char *)message,
++                                       message_len, (const char *)language,
++                                       language_len);
+                 }
++
+                 _libssh2_debug(session, LIBSSH2_TRACE_TRANS,
+                                "Disconnect(%d): %s(%s)", reason,
+                                message, language);
+@@ -534,23 +526,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
+                 int always_display = data[1];
+ 
+                 if(datalen >= 6) {
+-                    message_len = _libssh2_ntohu32(data + 2);
+-
+-                    if(message_len <= (datalen - 10)) {
+-                        /* 6 = packet_type(1) + display(1) + message_len(4) */
+-                        message = (char *) data + 6;
+-                        language_len = _libssh2_ntohu32(data + 6 +
+-                                                        message_len);
+-
+-                        if(language_len <= (datalen - 10 - message_len))
+-                            language = (char *) data + 10 + message_len;
+-                    }
++                    struct string_buf buf;
++                    buf.data = (unsigned char *)data;
++                    buf.dataptr = buf.data;
++                    buf.len = datalen;
++                    buf.dataptr += 2; /* advance past type & always display */
++
++                    _libssh2_get_string(&buf, &message, &message_len);
++                    _libssh2_get_string(&buf, &language, &language_len);
+                 }
+ 
+                 if(session->ssh_msg_debug) {
+-                    LIBSSH2_DEBUG(session, always_display, message,
+-                                  message_len, language, language_len);
++                    LIBSSH2_DEBUG(session, always_display,
++                                  (const char *)message,
++                                  message_len, (const char *)language,
++                                  language_len);
+                 }
+             }
++
+             /*
+              * _libssh2_debug will actually truncate this for us so
+              * that it's not an inordinate about of data
+@@ -576,7 +566,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
+                 uint32_t len = 0;
+                 unsigned char want_reply = 0;
+                 len = _libssh2_ntohu32(data + 1);
+-                if(datalen >= (6 + len)) {
++                if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) {
+                     want_reply = data[5 + len];
+                     _libssh2_debug(session,
+                                    LIBSSH2_TRACE_CONN,
diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb b/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
index fe853cde4..a17ae5b7c 100644
--- a/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
+++ b/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
@@ -17,6 +17,7 @@ inherit autotools pkgconfig
 EXTRA_OECONF += "\
                  --with-libz \
                  --with-libz-prefix=${STAGING_LIBDIR} \
+                 file://CVE-2019-17498.patch \
                 "
 
 # only one of openssl and gcrypt could be set
-- 
2.17.1




From wangmy at cn.fujitsu.com  Fri Mar 13 11:10:23 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Fri, 13 Mar 2020 04:10:23 -0700
Subject: [oe] [meta-oe][zeus][PATCH] opensc: CVE-2019-19479 CVE-2019-19480
In-Reply-To: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584097824-54462-2-git-send-email-wangmy@cn.fujitsu.com>

Security Advisory

References
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19479
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19480

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../opensc/opensc/CVE-2019-19479.patch        | 30 ++++++++++++++++
 .../opensc/opensc/CVE-2019-19480.patch        | 34 +++++++++++++++++++
 .../recipes-support/opensc/opensc_0.19.0.bb   |  2 ++
 3 files changed, 66 insertions(+)
 create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
 create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch

diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
new file mode 100644
index 000000000..73222ee1a
--- /dev/null
+++ b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
@@ -0,0 +1,30 @@
+From c3f23b836e5a1766c36617fe1da30d22f7b63de2 Mon Sep 17 00:00:00 2001
+From: Frank Morgner <frankmorgner at gmail.com>
+Date: Sun, 3 Nov 2019 04:45:28 +0100
+Subject: [PATCH] fixed  UNKNOWN READ
+
+Upstream-Status: Accepted <or Backport>
+CVE: CVE-2019-19479 
+   
+Reported by OSS-Fuzz
+https://oss-fuzz.com/testcase-detail/5681169970757632
+
+Reference to upstream patch:
+https://github.com/OpenSC/OpenSC/commit/c3f23b836e5a1766c36617fe1da30d22f7b63de2
+---
+ src/libopensc/card-setcos.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libopensc/card-setcos.c b/src/libopensc/card-setcos.c
+index 4cf328ad6a..1b4e8f3e23 100644
+--- a/src/libopensc/card-setcos.c
++++ b/src/libopensc/card-setcos.c
+@@ -868,7 +868,7 @@ static void parse_sec_attr_44(sc_file_t *file, const u8 *buf, size_t len)
+ 			}
+ 
+ 			/* Encryption key present ? */
+-			iPinCount = iACLen - 1;		
++			iPinCount = iACLen > 0 ? iACLen - 1 : 0;
+ 
+ 			if (buf[iOffset] & 0x20) {
+ 				int iSC;
diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
new file mode 100644
index 000000000..12c1f0b4a
--- /dev/null
+++ b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
@@ -0,0 +1,34 @@
+From 6ce6152284c47ba9b1d4fe8ff9d2e6a3f5ee02c7 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen at redhat.com>
+Date: Wed, 23 Oct 2019 09:22:44 +0200
+Subject: [PATCH] pkcs15-prkey: Simplify cleaning memory after failure
+
+https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18478
+
+Upstream-Status: Accepted
+CVE: CVE-2019-19480
+
+Reference to upstream patch:
+https://github.com/OpenSC/OpenSC/commit/6ce6152284c47ba9b1d4fe8ff9d2e6a3f5ee02c7
+---
+ src/libopensc/pkcs15-prkey.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/libopensc/pkcs15-prkey.c b/src/libopensc/pkcs15-prkey.c
+index d3eee983..4b249582 100644
+--- a/src/libopensc/pkcs15-prkey.c
++++ b/src/libopensc/pkcs15-prkey.c
+@@ -258,6 +258,10 @@ int sc_pkcs15_decode_prkdf_entry(struct sc_pkcs15_card *p15card,
+ 	memset(gostr3410_params, 0, sizeof(gostr3410_params));
+ 
+ 	r = sc_asn1_decode_choice(ctx, asn1_prkey, *buf, *buflen, buf, buflen);
++	if (r < 0) {
++	        /* This might have allocated something. If so, clear it now */
++	        free(info.subject.value);
++        }
+ 	if (r == SC_ERROR_ASN1_END_OF_CONTENTS)
+ 		return r;
+ 	LOG_TEST_RET(ctx, r, "PrKey DF ASN.1 decoding failed");
+-- 
+2.17.1
+
diff --git a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
index bc1722e39..d26825a06 100644
--- a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
+++ b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
@@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47"
 SRC_URI = "git://github.com/OpenSC/OpenSC \
            file://0001-Remove-redundant-logging.patch \
+           file://CVE-2019-19479.patch \
+           file://CVE-2019-19480.patch \
           "
 DEPENDS = "openct pcsc-lite virtual/libiconv openssl"
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Fri Mar 13 11:10:24 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Fri, 13 Mar 2020 04:10:24 -0700
Subject: [oe] [meta-oe][zeus][PATCH] php: CVE-2019-11045.patch
	CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch
In-Reply-To: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584097824-54462-3-git-send-email-wangmy@cn.fujitsu.com>

Security Advisory

References:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../php/php/CVE-2019-11045.patch              | 78 +++++++++++++++++++
 .../php/php/CVE-2019-11046.patch              | 59 ++++++++++++++
 .../php/php/CVE-2019-11047.patch              | 57 ++++++++++++++
 .../php/php/CVE-2019-11050.patch              | 53 +++++++++++++
 meta-oe/recipes-devtools/php/php_7.3.9.bb     |  4 +
 5 files changed, 251 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch

diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
new file mode 100644
index 000000000..3b3c187a4
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
@@ -0,0 +1,78 @@
+From a5a15965da23c8e97657278fc8dfbf1dfb20c016 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69 at gmx.de>
+Date: Mon, 25 Nov 2019 16:56:34 +0100
+Subject: [PATCH] Fix #78863: DirectoryIterator class silently truncates after
+ a null byte
+
+Since the constructor of DirectoryIterator and friends is supposed to
+accepts paths (i.e. strings without NUL bytes), we must not accept
+arbitrary strings.
+
+Upstream-Status: Accepted
+CVE: CVE-2019-11045
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=a5a15965da23c8e97657278fc8dfbf1dfb20c016
+http://git.php.net/?p=php-src.git;a=commit;h=d74907b8575e6edb83b728c2a94df434c23e1f79
+---
+ ext/spl/spl_directory.c     |  4 ++--
+ ext/spl/tests/bug78863.phpt | 31 +++++++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+), 2 deletions(-)
+ create mode 100644 ext/spl/tests/bug78863.phpt
+
+diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
+index 91ea2e0265..56e809b1c7 100644
+--- a/ext/spl/spl_directory.c
++++ b/ext/spl/spl_directory.c
+@@ -708,10 +708,10 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto
+ 
+ 	if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_FLAGS)) {
+ 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO;
+-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &path, &len, &flags);
++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &path, &len, &flags);
+ 	} else {
+ 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
+-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &len);
++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &len);
+ 	}
+ 	if (SPL_HAS_FLAG(ctor_flags, SPL_FILE_DIR_SKIPDOTS)) {
+ 		flags |= SPL_FILE_DIR_SKIPDOTS;
+diff --git a/ext/spl/tests/bug78863.phpt b/ext/spl/tests/bug78863.phpt
+new file mode 100644
+index 0000000000..dc88d98dee
+--- /dev/null
++++ b/ext/spl/tests/bug78863.phpt
+@@ -0,0 +1,31 @@
++--TEST--
++Bug #78863 (DirectoryIterator class silently truncates after a null byte)
++--FILE--
++<?php
++$dir = __DIR__ . '/bug78863';
++mkdir($dir);
++touch("$dir/bad");
++mkdir("$dir/sub");
++touch("$dir/sub/good");
++
++$it = new DirectoryIterator(__DIR__ . "/bug78863\0/sub");
++foreach ($it as $fileinfo) {
++    if (!$fileinfo->isDot()) {
++        var_dump($fileinfo->getFilename());
++    }
++}
++?>
++--EXPECTF--
++Fatal error: Uncaught UnexpectedValueException: DirectoryIterator::__construct() expects parameter 1 to be a valid path, string given in %s:%d
++Stack trace:
++#0 %s(%d): DirectoryIterator->__construct('%s')
++#1 {main}
++  thrown in %s on line %d
++--CLEAN--
++<?php
++$dir = __DIR__ . '/bug78863';
++unlink("$dir/sub/good");
++rmdir("$dir/sub");
++unlink("$dir/bad");
++rmdir($dir);
++?>
+-- 
+2.11.0
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
new file mode 100644
index 000000000..711b8525a
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
@@ -0,0 +1,59 @@
+From 2d07f00b73d8f94099850e0f5983e1cc5817c196 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69 at gmx.de>
+Date: Sat, 30 Nov 2019 12:26:37 +0100
+Subject: [PATCH] Fix #78878: Buffer underflow in bc_shift_addsub
+
+We must not rely on `isdigit()` to detect digits, since we only support
+decimal ASCII digits in the following processing.
+
+(cherry picked from commit eb23c6008753b1cdc5359dead3a096dce46c9018)
+
+Upstream-Status: Accepted
+CVE: CVE-2019-11046
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=eb23c6008753b1cdc5359dead3a096dce46c9018
+http://git.php.net/?p=php-src.git;a=commit;h=2d07f00b73d8f94099850e0f5983e1cc5817c196
+---
+ ext/bcmath/libbcmath/src/str2num.c |  4 ++--
+ ext/bcmath/tests/bug78878.phpt     | 13 +++++++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100644 ext/bcmath/tests/bug78878.phpt
+
+diff --git a/ext/bcmath/libbcmath/src/str2num.c b/ext/bcmath/libbcmath/src/str2num.c
+index f38d341570..03aec15930 100644
+--- a/ext/bcmath/libbcmath/src/str2num.c
++++ b/ext/bcmath/libbcmath/src/str2num.c
+@@ -57,9 +57,9 @@ bc_str2num (bc_num *num, char *str, int scale)
+   zero_int = FALSE;
+   if ( (*ptr == '+') || (*ptr == '-'))  ptr++;  /* Sign */
+   while (*ptr == '0') ptr++;			/* Skip leading zeros. */
+-  while (isdigit((int)*ptr)) ptr++, digits++;	/* digits */
++  while (*ptr >= '0' && *ptr <= '9') ptr++, digits++;	/* digits */
+   if (*ptr == '.') ptr++;			/* decimal point */
+-  while (isdigit((int)*ptr)) ptr++, strscale++;	/* digits */
++  while (*ptr >= '0' && *ptr <= '9') ptr++, strscale++;	/* digits */
+   if ((*ptr != '\0') || (digits+strscale == 0))
+     {
+       *num = bc_copy_num (BCG(_zero_));
+diff --git a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt
+new file mode 100644
+index 0000000000..2c9d72b946
+--- /dev/null
++++ b/ext/bcmath/tests/bug78878.phpt
+@@ -0,0 +1,13 @@
++--TEST--
++Bug #78878 (Buffer underflow in bc_shift_addsub)
++--SKIPIF--
++<?php
++if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
++?>
++--FILE--
++<?php
++print @bcmul("\xB26483605105519922841849335928742092", bcpowmod(2, 65535, -4e-4));
++?>
++--EXPECT--
++bc math warning: non-zero scale in modulus
++0
+-- 
+2.11.0
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
new file mode 100644
index 000000000..e2922bf8f
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
@@ -0,0 +1,57 @@
+From d348cfb96f2543565691010ade5e0346338be5a7 Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas at php.net>
+Date: Mon, 16 Dec 2019 00:10:39 -0800
+Subject: [PATCH] Fixed bug #78910
+
+Upstream-Status: Accepted
+CVE-2019-11047
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=d348cfb96f2543565691010ade5e0346338be5a7
+http://git.php.net/?p=php-src.git;a=commit;h=57325460d2bdee01a13d8e6cf03345c90543ff4f
+---
+ ext/exif/exif.c              |  3 ++-
+ ext/exif/tests/bug78910.phpt | 17 +++++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+ create mode 100644 ext/exif/tests/bug78910.phpt
+
+diff --git a/ext/exif/exif.c b/ext/exif/exif.c
+index 2804807e..a5780113 100644
+--- a/ext/exif/exif.c
++++ b/ext/exif/exif.c
+@@ -3138,7 +3138,8 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
+ 		/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s)", maker_note->make?maker_note->make:"");*/
+ 		if (maker_note->make && (!ImageInfo->make || strcmp(maker_note->make, ImageInfo->make)))
+ 			continue;
+-		if (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
++		if (maker_note->id_string && value_len >= maker_note->id_string_len
++				&& strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
+ 			continue;
+ 		break;
+ 	}
+diff --git a/ext/exif/tests/bug78910.phpt b/ext/exif/tests/bug78910.phpt
+new file mode 100644
+index 00000000..f5b1c32c
+--- /dev/null
++++ b/ext/exif/tests/bug78910.phpt
+@@ -0,0 +1,17 @@
++--TEST--
++Bug #78910: Heap-buffer-overflow READ in exif (OSS-Fuzz #19044)
++--FILE--
++<?php
++
++var_dump(exif_read_data('data:image/jpg;base64,TU0AKgAAAAwgICAgAAIBDwAEAAAAAgAAACKSfCAgAAAAAEZVSklGSUxN'));
++
++?>
++--EXPECTF--
++Notice: exif_read_data(): Read from TIFF: tag(0x927C, MakerNote  ): Illegal format code 0x2020, switching to BYTE in %s on line %d
++
++Warning: exif_read_data(): Process tag(x927C=MakerNote  ): Illegal format code 0x2020, suppose BYTE in %s on line %d
++
++Warning: exif_read_data(): IFD data too short: 0x0000 offset 0x000C in %s on line %d
++
++Warning: exif_read_data(): Invalid TIFF file in %s on line %d
++bool(false)
+-- 
+2.17.1
+
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
new file mode 100644
index 000000000..700b99bd9
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
@@ -0,0 +1,53 @@
+From c14eb8de974fc8a4d74f3515424c293bc7a40fba Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas at php.net>
+Date: Mon, 16 Dec 2019 01:14:38 -0800
+Subject: [PATCH] Fix bug #78793
+
+Upstream-Status: Accepted
+CVE-2019-11050
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=c14eb8de974fc8a4d74f3515424c293bc7a40fba
+http://git.php.net/?p=php-src.git;a=commit;h=1b3b4a0d367b6f0b67e9f73d82f53db6c6b722b2
+---
+ ext/exif/exif.c              |  5 +++--
+ ext/exif/tests/bug78793.phpt | 12 ++++++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100644 ext/exif/tests/bug78793.phpt
+
+diff --git a/ext/exif/exif.c b/ext/exif/exif.c
+index c0be05922f..7fe055f381 100644
+--- a/ext/exif/exif.c
++++ b/ext/exif/exif.c
+@@ -3240,8 +3240,9 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
+ 	}
+ 
+ 	for (de=0;de<NumDirEntries;de++) {
+-		if (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,
+-								  offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {
++		size_t offset = 2 + 12 * de;
++		if (!exif_process_IFD_TAG(ImageInfo, dir_start + offset,
++								  offset_base, data_len - offset, displacement, section_index, 0, maker_note->tag_table)) {
+ 			return FALSE;
+ 		}
+ 	}
+diff --git a/ext/exif/tests/bug78793.phpt b/ext/exif/tests/bug78793.phpt
+new file mode 100644
+index 0000000000..033f255ace
+--- /dev/null
++++ b/ext/exif/tests/bug78793.phpt
+@@ -0,0 +1,12 @@
++--TEST--
++Bug #78793: Use-after-free in exif parsing under memory sanitizer
++--FILE--
++<?php
++$f = "ext/exif/tests/bug77950.tiff";
++for ($i = 0; $i < 10; $i++) {
++    @exif_read_data($f);
++}
++?>
++===DONE===
++--EXPECT--
++===DONE===
+-- 
+2.11.0
diff --git a/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-oe/recipes-devtools/php/php_7.3.9.bb
index e886cb1a2..670c3321c 100644
--- a/meta-oe/recipes-devtools/php/php_7.3.9.bb
+++ b/meta-oe/recipes-devtools/php/php_7.3.9.bb
@@ -9,6 +9,10 @@ SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
             file://debian-php-fixheader.patch \
             file://CVE-2019-6978.patch \
             file://CVE-2019-11043.patch \
+            file://CVE-2019-11045.patch \
+            file://CVE-2019-11046.patch \
+            file://CVE-2019-11047.patch \
+            file://CVE-2019-11050.patch \
            "
 SRC_URI_append_class-target = " \
                                 file://pear-makefile.patch \
-- 
2.17.1




From zangrc.fnst at cn.fujitsu.com  Fri Mar 13 06:58:41 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Fri, 13 Mar 2020 14:58:41 +0800
Subject: [oe]  [zeus] [meta-networking] [PATCH] wireshark: CVE-2019-19553
Message-ID: <20200313065841.17365-1-zangrc.fnst@cn.fujitsu.com>

Security Advisory
References:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19553

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 ..._identifier_id-after-dissecting-Cont.patch | 204 ++++++++++++++++++
 .../wireshark/wireshark_3.0.6.bb              |   3 +-
 2 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch

diff --git a/meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch b/meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch
new file mode 100644
index 000000000..08060db04
--- /dev/null
+++ b/meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch
@@ -0,0 +1,204 @@
+From e1731e2bc1d2a78b67e18fa66e7440acb9bea563 Mon Sep 17 00:00:00 2001
+From: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
+Date: Fri, 13 Mar 2020 13:54:50 +0800
+Subject: [PATCH] CMS: reset object_identifier_id after dissecting ContentInfo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Bug: 15961
+Change-Id: I3d6b3e96103b69f88fcb512da81fa20ff6a1c40e
+Reviewed-on: https://code.wireshark.org/review/34960
+Petri-Dish: Pascal Quantin <pascal at wireshark.org>
+Tested-by: Petri Dish Buildbot
+Reviewed-by: Stig Bj??rlykke <stig at bjorlykke.org>
+Reviewed-by: Roland Knall <rknall at gmail.com>
+(cherry picked from commit 23850a3342d64b9c9808f14c20bfea6d22b7dc08)
+Conflicts:
+	epan/dissectors/packet-cms.c
+Reviewed-on: https://code.wireshark.org/review/34975
+Reviewed-by: Pascal Quantin <pascal at wireshark.org>
+---
+ epan/dissectors/asn1/cms/cms.cnf              |  1 +
+ .../dissectors/asn1/cms/packet-cms-template.c |  2 +-
+ epan/dissectors/packet-cms.c                  | 31 ++++++++++---------
+ 3 files changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/epan/dissectors/asn1/cms/cms.cnf b/epan/dissectors/asn1/cms/cms.cnf
+index ab94f8c..8feef01 100644
+--- a/epan/dissectors/asn1/cms/cms.cnf
++++ b/epan/dissectors/asn1/cms/cms.cnf
+@@ -122,6 +122,7 @@ FirmwarePackageLoadError/version		fwErrorVersion
+   top_tree = tree;
+   %(DEFAULT_BODY)s
+   content_tvb = NULL;
++  object_identifier_id = NULL;
+   top_tree = NULL;
+ 
+ #.FN_PARS ContentType
+diff --git a/epan/dissectors/asn1/cms/packet-cms-template.c b/epan/dissectors/asn1/cms/packet-cms-template.c
+index 2e803ec..931fd4f 100644
+--- a/epan/dissectors/asn1/cms/packet-cms-template.c
++++ b/epan/dissectors/asn1/cms/packet-cms-template.c
+@@ -43,7 +43,7 @@ static int hf_cms_ci_contentType = -1;
+ static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
+ 
+ 
+-static const char *object_identifier_id;
++static const char *object_identifier_id = NULL;
+ static tvbuff_t *content_tvb = NULL;
+ 
+ static proto_tree *top_tree=NULL;
+diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
+index 690513d..2a6942f 100644
+--- a/epan/dissectors/packet-cms.c
++++ b/epan/dissectors/packet-cms.c
+@@ -311,7 +311,7 @@ static gint ett_cms_FirmwarePackageMessageDigest = -1;
+ static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
+ 
+ 
+-static const char *object_identifier_id;
++static const char *object_identifier_id = NULL;
+ static tvbuff_t *content_tvb = NULL;
+ 
+ static proto_tree *top_tree=NULL;
+@@ -373,7 +373,7 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
+ 
+ int
+ dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 131 "./asn1/cms/cms.cnf"
++#line 132 "./asn1/cms/cms.cnf"
+   	const char *name = NULL;
+ 
+ 	  offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
+@@ -393,7 +393,7 @@ dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
+ 
+ static int
+ dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 141 "./asn1/cms/cms.cnf"
++#line 142 "./asn1/cms/cms.cnf"
+   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
+ 
+ 
+@@ -417,6 +417,7 @@ dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
+                                    ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
+ 
+   content_tvb = NULL;
++  object_identifier_id = NULL;
+   top_tree = NULL;
+ 
+ 
+@@ -470,7 +471,7 @@ dissect_cms_DigestAlgorithmIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb
+ 
+ static int
+ dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 145 "./asn1/cms/cms.cnf"
++#line 146 "./asn1/cms/cms.cnf"
+ 
+   offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &content_tvb);
+ 
+@@ -504,7 +505,7 @@ dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
+ 
+ static int
+ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 175 "./asn1/cms/cms.cnf"
++#line 176 "./asn1/cms/cms.cnf"
+   const char *name = NULL;
+ 
+     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
+@@ -524,7 +525,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
+ 
+ static int
+ dissect_cms_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 185 "./asn1/cms/cms.cnf"
++#line 186 "./asn1/cms/cms.cnf"
+ 
+   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
+ 
+@@ -786,7 +787,7 @@ dissect_cms_T_otherRevInfoFormat(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
+ 
+ static int
+ dissect_cms_T_otherRevInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 169 "./asn1/cms/cms.cnf"
++#line 170 "./asn1/cms/cms.cnf"
+   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
+ 
+ 
+@@ -1123,7 +1124,7 @@ dissect_cms_T_keyAttrId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
+ 
+ static int
+ dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 164 "./asn1/cms/cms.cnf"
++#line 165 "./asn1/cms/cms.cnf"
+   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
+ 
+ 
+@@ -1311,7 +1312,7 @@ dissect_cms_T_oriType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
+ 
+ static int
+ dissect_cms_T_oriValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 158 "./asn1/cms/cms.cnf"
++#line 159 "./asn1/cms/cms.cnf"
+   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
+ 
+ 
+@@ -1388,14 +1389,14 @@ dissect_cms_ContentEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbu
+ 
+ static int
+ dissect_cms_EncryptedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 235 "./asn1/cms/cms.cnf"
++#line 236 "./asn1/cms/cms.cnf"
+ 	tvbuff_t *encrypted_tvb;
+ 	proto_item *item;
+ 
+   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                        &encrypted_tvb);
+ 
+-#line 240 "./asn1/cms/cms.cnf"
++#line 241 "./asn1/cms/cms.cnf"
+ 
+ 	item = actx->created_item;
+ 
+@@ -1553,7 +1554,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
+ 
+ static int
+ dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 189 "./asn1/cms/cms.cnf"
++#line 190 "./asn1/cms/cms.cnf"
+   proto_item *pi;
+   int old_offset = offset;
+ 
+@@ -1637,7 +1638,7 @@ dissect_cms_KeyWrapAlgorithm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
+ 
+ static int
+ dissect_cms_RC2ParameterVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 225 "./asn1/cms/cms.cnf"
++#line 226 "./asn1/cms/cms.cnf"
+   guint32 length = 0;
+ 
+     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
+@@ -1715,7 +1716,7 @@ dissect_cms_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
+ 
+ static int
+ dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 207 "./asn1/cms/cms.cnf"
++#line 208 "./asn1/cms/cms.cnf"
+   const char *name = NULL;
+ 
+     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
+@@ -1736,7 +1737,7 @@ dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
+ 
+ static int
+ dissect_cms_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+-#line 218 "./asn1/cms/cms.cnf"
++#line 219 "./asn1/cms/cms.cnf"
+ 
+   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
+ 
+-- 
+2.20.1
+
diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
index ccaa0c94a..9bac5bde4 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
@@ -8,7 +8,8 @@ DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bi
 
 DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
 
-SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz"
+SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz \
+	file://0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch"
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-- 
2.20.1




From liwei.song at windriver.com  Fri Mar 13 10:16:29 2020
From: liwei.song at windriver.com (Liwei Song)
Date: Fri, 13 Mar 2020 18:16:29 +0800
Subject: [oe] [meta-oe][PATCH 1/1] fio: disable compiler optimizations for
	x86 arch
Message-ID: <20200313101629.18495-1-liwei.song@windriver.com>

with compiler optimizations enabled, "fio --help" will failed with
"Illegal instruction" on Intel Denverton board.
Enable it on condition that MACHINE_FEATURES include x86.

Related commits:
https://git.openembedded.org/meta-openembedded/commit/?id=c58d9d500f90246d2d879e720fdfa5bbbc731c7f
https://git.openembedded.org/meta-openembedded/commit/?id=739349da0826221f98648b64b693f9ae33e7d4ea

Signed-off-by: Liwei Song <liwei.song at windriver.com>
---
 meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb
index b65ab19a3efe..759d1087c055 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb
@@ -34,6 +34,7 @@ S = "${WORKDIR}/git"
 DISABLE_STATIC = ""
 
 EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'"
+EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}"
 
 do_configure() {
     ./configure ${EXTRA_OECONF}
-- 
2.17.1


From Haiqing.Bai at windriver.com  Fri Mar 13 10:19:23 2020
From: Haiqing.Bai at windriver.com (Haiqing Bai)
Date: Fri, 13 Mar 2020 18:19:23 +0800
Subject: [oe] [meta-python][zeus][PATCH] python-urllib3/python3-urllib3: fix
	CVE-2020-7212
Message-ID: <1584094764-17831-1-git-send-email-Haiqing.Bai@windriver.com>

Optimize _encode_invalid_chars for a denial of service (CPU consumption)

Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
---
 .../python/python-urllib3/CVE-2020-7212.patch      | 54 ++++++++++++++++++++++
 .../python/python-urllib3_1.25.6.bb                |  2 +
 .../python/python3-urllib3/CVE-2020-7212.patch     | 54 ++++++++++++++++++++++
 .../python/python3-urllib3_1.25.6.bb               |  2 +
 4 files changed, 112 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch
 create mode 100644 meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch

diff --git a/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch b/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch
new file mode 100644
index 0000000..a2bb0fb
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch
@@ -0,0 +1,54 @@
+From aff951b7a41eb5b958b32c49eaa00da02adc9c2d Mon Sep 17 00:00:00 2001
+From: Quentin Pradet <quentin.pradet at gmail.com>
+Date: Tue, 21 Jan 2020 22:32:56 +0400
+Subject: [PATCH] Optimize _encode_invalid_chars (#1787)
+
+Co-authored-by: Seth Michael Larson <sethmichaellarson at gmail.com>
+
+Upstream-Status: Backport
+[from git://github.com/urllib3/urllib3.git commit:a2697e7c6b]
+Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
+---
+ src/urllib3/util/url.py | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py
+index 9675f74..e353937 100644
+--- a/src/urllib3/util/url.py
++++ b/src/urllib3/util/url.py
+@@ -216,18 +216,15 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
+ 
+     component = six.ensure_text(component)
+ 
++    # Normalize existing percent-encoded bytes.
+     # Try to see if the component we're encoding is already percent-encoded
+     # so we can skip all '%' characters but still encode all others.
+-    percent_encodings = PERCENT_RE.findall(component)
+-
+-    # Normalize existing percent-encoded bytes.
+-    for enc in percent_encodings:
+-        if not enc.isupper():
+-            component = component.replace(enc, enc.upper())
++    component, percent_encodings = PERCENT_RE.subn(
++        lambda match: match.group(0).upper(), component
++    )
+ 
+     uri_bytes = component.encode("utf-8", "surrogatepass")
+-    is_percent_encoded = len(percent_encodings) == uri_bytes.count(b"%")
+-
++    is_percent_encoded = percent_encodings == uri_bytes.count(b"%")
+     encoded_component = bytearray()
+ 
+     for i in range(0, len(uri_bytes)):
+@@ -237,7 +234,7 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
+         if (is_percent_encoded and byte == b"%") or (
+             byte_ord < 128 and byte.decode() in allowed_chars
+         ):
+-            encoded_component.extend(byte)
++            encoded_component += byte
+             continue
+         encoded_component.extend(b"%" + (hex(byte_ord)[2:].encode().zfill(2).upper()))
+ 
+-- 
+2.23.0
+
diff --git a/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb b/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
index 6c81f1d..9f2d2c8 100644
--- a/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
+++ b/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
@@ -1,2 +1,4 @@
 inherit pypi setuptools
 require python-urllib3.inc
+
+SRC_URI += "file://CVE-2020-7212.patch"
diff --git a/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch
new file mode 100644
index 0000000..a2bb0fb
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch
@@ -0,0 +1,54 @@
+From aff951b7a41eb5b958b32c49eaa00da02adc9c2d Mon Sep 17 00:00:00 2001
+From: Quentin Pradet <quentin.pradet at gmail.com>
+Date: Tue, 21 Jan 2020 22:32:56 +0400
+Subject: [PATCH] Optimize _encode_invalid_chars (#1787)
+
+Co-authored-by: Seth Michael Larson <sethmichaellarson at gmail.com>
+
+Upstream-Status: Backport
+[from git://github.com/urllib3/urllib3.git commit:a2697e7c6b]
+Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
+---
+ src/urllib3/util/url.py | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py
+index 9675f74..e353937 100644
+--- a/src/urllib3/util/url.py
++++ b/src/urllib3/util/url.py
+@@ -216,18 +216,15 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
+ 
+     component = six.ensure_text(component)
+ 
++    # Normalize existing percent-encoded bytes.
+     # Try to see if the component we're encoding is already percent-encoded
+     # so we can skip all '%' characters but still encode all others.
+-    percent_encodings = PERCENT_RE.findall(component)
+-
+-    # Normalize existing percent-encoded bytes.
+-    for enc in percent_encodings:
+-        if not enc.isupper():
+-            component = component.replace(enc, enc.upper())
++    component, percent_encodings = PERCENT_RE.subn(
++        lambda match: match.group(0).upper(), component
++    )
+ 
+     uri_bytes = component.encode("utf-8", "surrogatepass")
+-    is_percent_encoded = len(percent_encodings) == uri_bytes.count(b"%")
+-
++    is_percent_encoded = percent_encodings == uri_bytes.count(b"%")
+     encoded_component = bytearray()
+ 
+     for i in range(0, len(uri_bytes)):
+@@ -237,7 +234,7 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
+         if (is_percent_encoded and byte == b"%") or (
+             byte_ord < 128 and byte.decode() in allowed_chars
+         ):
+-            encoded_component.extend(byte)
++            encoded_component += byte
+             continue
+         encoded_component.extend(b"%" + (hex(byte_ord)[2:].encode().zfill(2).upper()))
+ 
+-- 
+2.23.0
+
diff --git a/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb b/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
index 19eb702..e3583a0 100644
--- a/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
+++ b/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
@@ -1,2 +1,4 @@
 inherit pypi setuptools3
 require python-urllib3.inc
+
+SRC_URI += "file://CVE-2020-7212.patch"
-- 
1.9.1


From brgl at bgdev.pl  Fri Mar 13 15:05:38 2020
From: brgl at bgdev.pl (Bartosz Golaszewski)
Date: Fri, 13 Mar 2020 16:05:38 +0100
Subject: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta
 images in a new layer
In-Reply-To: <CAMKF1spHPHW7xk5icpG5qVhYTSjuawWidw24o=tVWEve8_MDkg@mail.gmail.com>
References: <20200228150345.11829-1-brgl@bgdev.pl>
	<CAP9ODKqbfrnLUBzE+WkGceSo+qBimGPUFUcgRuZmS3vwJZqpwA@mail.gmail.com>
	<CAMRc=MftVskWMFZQhbFKZLwNAR9a1+4zbayWTbXFuSJgG-ZgbA@mail.gmail.com>
	<CAP9ODKpVW6qxw7+5oA7auBMW1ApLdqjicZf8Ahe3RhYG8QjmgQ@mail.gmail.com>
	<CAMRc=MeJ0R81s-ui7J78pe89JE6c-_wx3RGUZx-tzMLc3pzthQ@mail.gmail.com>
	<dd3d6ea7-2bac-6a06-823d-fd070f547784@gmail.com>
	<CAMRc=MevN3tAfBkLZuOiW0BVbOWkq_T_HiD6XTMwh5d32xrGeQ@mail.gmail.com>
	<CAMRc=MehBSu1RpPkzP=xiFqt3wpJrf4FhV889jcPxUHPnf0GLg@mail.gmail.com>
	<CAP71Wjz1n_Csm762xbsxUK-3i3OYm-rfh=9Ccf28USLgJjRiFQ@mail.gmail.com>
	<CAMRc=Md1Udxq0eOUzNH=Pr3corUEa88_wdTJJFyurjMvJcfaAQ@mail.gmail.com>
	<CAMKF1spHPHW7xk5icpG5qVhYTSjuawWidw24o=tVWEve8_MDkg@mail.gmail.com>
Message-ID: <CAMRc=McjtuhBVSzFyXvQCNq9Y2mUSH6-_WrF06b0xJuRyd8YXQ@mail.gmail.com>

czw., 12 mar 2020 o 19:13 Khem Raj <raj.khem at gmail.com> napisa?(a):
> > >
> > > it depends what you mean here.
> > >
> > > 1. Hosting on git.yoctoproject.org is mostly for layers supported by YP membership, these layers are under the responsibility of the YP TSC [1]
> > > 2. Hosting on git.openembedded.org is under the responsibility of the OE TSC [2]
> > >
> >
> > I'm not sure what that means exactly in terms of making a layer
> > official. I can only guess that non-members can't make their layers
> > part of the project for political reasons.
>
> I would suggest to send the proposal to oe-tsc mailing list
> tsc at lists.openembedded.org
>

Thanks. I'll do this as soon as I have more things to show in this layer.

Bartosz

From akuster808 at gmail.com  Fri Mar 13 15:35:15 2020
From: akuster808 at gmail.com (akuster808)
Date: Fri, 13 Mar 2020 08:35:15 -0700
Subject: [oe] [zeus] [meta-networking] [PATCH] wireshark: CVE-2019-19553
In-Reply-To: <20200313065841.17365-1-zangrc.fnst@cn.fujitsu.com>
References: <20200313065841.17365-1-zangrc.fnst@cn.fujitsu.com>
Message-ID: <753761b4-5d17-4453-8a7a-58310b5da746@gmail.com>



On 3/12/20 11:58 PM, Zang Ruochen wrote:
> Security Advisory
> References:
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19553
Thanks for the CVE fix.

Wireshark 3.0.x series are bug fix only so updating the 3.0.9 would be
preferred.

3.0.9
wnpa-sec-2020-03 <https://www.wireshark.org/security/wnpa-sec-2020-03>
LTE RRC dissector memory leak. Bug 16341
<https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16341>.
wnpa-sec-2020-04 <https://www.wireshark.org/security/wnpa-sec-2020-04>
WiMax DLMAP dissector crash. Bug 16368
<https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16368>.
wnpa-sec-2020-05 <https://www.wireshark.org/security/wnpa-sec-2020-05>
EAP dissector crash. Bug 16397
<https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16397>.

3.0.8
wnpa-sec-2020-02 <https://www.wireshark.org/security/wnpa-sec-2020-02>
BT ATT dissector crash. Bug 16258
<https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16258>.
CVE-2020-7045
<https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7045>.
3.0.7
wnpa-sec-2019-22 <https://www.wireshark.org/security/wnpa-sec-2019-22>
CMS dissector crash. Bug 15961
<https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15961>.
CVE-2019-19553
<https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19553>.


- armin
>
> Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
> ---
>  ..._identifier_id-after-dissecting-Cont.patch | 204 ++++++++++++++++++
>  .../wireshark/wireshark_3.0.6.bb              |   3 +-
>  2 files changed, 206 insertions(+), 1 deletion(-)
>  create mode 100644 meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch
>
> diff --git a/meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch b/meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch
> new file mode 100644
> index 000000000..08060db04
> --- /dev/null
> +++ b/meta-networking/recipes-support/wireshark/wireshark/0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch
> @@ -0,0 +1,204 @@
> +From e1731e2bc1d2a78b67e18fa66e7440acb9bea563 Mon Sep 17 00:00:00 2001
> +From: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
> +Date: Fri, 13 Mar 2020 13:54:50 +0800
> +Subject: [PATCH] CMS: reset object_identifier_id after dissecting ContentInfo
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=utf8
> +Content-Transfer-Encoding: 8bit
> +
> +Bug: 15961
> +Change-Id: I3d6b3e96103b69f88fcb512da81fa20ff6a1c40e
> +Reviewed-on: https://code.wireshark.org/review/34960
> +Petri-Dish: Pascal Quantin <pascal at wireshark.org>
> +Tested-by: Petri Dish Buildbot
> +Reviewed-by: Stig Bj??rlykke <stig at bjorlykke.org>
> +Reviewed-by: Roland Knall <rknall at gmail.com>
> +(cherry picked from commit 23850a3342d64b9c9808f14c20bfea6d22b7dc08)
> +Conflicts:
> +	epan/dissectors/packet-cms.c
> +Reviewed-on: https://code.wireshark.org/review/34975
> +Reviewed-by: Pascal Quantin <pascal at wireshark.org>
> +---
> + epan/dissectors/asn1/cms/cms.cnf              |  1 +
> + .../dissectors/asn1/cms/packet-cms-template.c |  2 +-
> + epan/dissectors/packet-cms.c                  | 31 ++++++++++---------
> + 3 files changed, 18 insertions(+), 16 deletions(-)
> +
> +diff --git a/epan/dissectors/asn1/cms/cms.cnf b/epan/dissectors/asn1/cms/cms.cnf
> +index ab94f8c..8feef01 100644
> +--- a/epan/dissectors/asn1/cms/cms.cnf
> ++++ b/epan/dissectors/asn1/cms/cms.cnf
> +@@ -122,6 +122,7 @@ FirmwarePackageLoadError/version		fwErrorVersion
> +   top_tree = tree;
> +   %(DEFAULT_BODY)s
> +   content_tvb = NULL;
> ++  object_identifier_id = NULL;
> +   top_tree = NULL;
> + 
> + #.FN_PARS ContentType
> +diff --git a/epan/dissectors/asn1/cms/packet-cms-template.c b/epan/dissectors/asn1/cms/packet-cms-template.c
> +index 2e803ec..931fd4f 100644
> +--- a/epan/dissectors/asn1/cms/packet-cms-template.c
> ++++ b/epan/dissectors/asn1/cms/packet-cms-template.c
> +@@ -43,7 +43,7 @@ static int hf_cms_ci_contentType = -1;
> + static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
> + 
> + 
> +-static const char *object_identifier_id;
> ++static const char *object_identifier_id = NULL;
> + static tvbuff_t *content_tvb = NULL;
> + 
> + static proto_tree *top_tree=NULL;
> +diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
> +index 690513d..2a6942f 100644
> +--- a/epan/dissectors/packet-cms.c
> ++++ b/epan/dissectors/packet-cms.c
> +@@ -311,7 +311,7 @@ static gint ett_cms_FirmwarePackageMessageDigest = -1;
> + static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
> + 
> + 
> +-static const char *object_identifier_id;
> ++static const char *object_identifier_id = NULL;
> + static tvbuff_t *content_tvb = NULL;
> + 
> + static proto_tree *top_tree=NULL;
> +@@ -373,7 +373,7 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
> + 
> + int
> + dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 131 "./asn1/cms/cms.cnf"
> ++#line 132 "./asn1/cms/cms.cnf"
> +   	const char *name = NULL;
> + 
> + 	  offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
> +@@ -393,7 +393,7 @@ dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
> + 
> + static int
> + dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 141 "./asn1/cms/cms.cnf"
> ++#line 142 "./asn1/cms/cms.cnf"
> +   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
> + 
> + 
> +@@ -417,6 +417,7 @@ dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
> +                                    ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
> + 
> +   content_tvb = NULL;
> ++  object_identifier_id = NULL;
> +   top_tree = NULL;
> + 
> + 
> +@@ -470,7 +471,7 @@ dissect_cms_DigestAlgorithmIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb
> + 
> + static int
> + dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 145 "./asn1/cms/cms.cnf"
> ++#line 146 "./asn1/cms/cms.cnf"
> + 
> +   offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &content_tvb);
> + 
> +@@ -504,7 +505,7 @@ dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
> + 
> + static int
> + dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 175 "./asn1/cms/cms.cnf"
> ++#line 176 "./asn1/cms/cms.cnf"
> +   const char *name = NULL;
> + 
> +     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
> +@@ -524,7 +525,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
> + 
> + static int
> + dissect_cms_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 185 "./asn1/cms/cms.cnf"
> ++#line 186 "./asn1/cms/cms.cnf"
> + 
> +   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
> + 
> +@@ -786,7 +787,7 @@ dissect_cms_T_otherRevInfoFormat(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
> + 
> + static int
> + dissect_cms_T_otherRevInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 169 "./asn1/cms/cms.cnf"
> ++#line 170 "./asn1/cms/cms.cnf"
> +   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
> + 
> + 
> +@@ -1123,7 +1124,7 @@ dissect_cms_T_keyAttrId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
> + 
> + static int
> + dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 164 "./asn1/cms/cms.cnf"
> ++#line 165 "./asn1/cms/cms.cnf"
> +   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
> + 
> + 
> +@@ -1311,7 +1312,7 @@ dissect_cms_T_oriType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
> + 
> + static int
> + dissect_cms_T_oriValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 158 "./asn1/cms/cms.cnf"
> ++#line 159 "./asn1/cms/cms.cnf"
> +   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
> + 
> + 
> +@@ -1388,14 +1389,14 @@ dissect_cms_ContentEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbu
> + 
> + static int
> + dissect_cms_EncryptedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 235 "./asn1/cms/cms.cnf"
> ++#line 236 "./asn1/cms/cms.cnf"
> + 	tvbuff_t *encrypted_tvb;
> + 	proto_item *item;
> + 
> +   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
> +                                        &encrypted_tvb);
> + 
> +-#line 240 "./asn1/cms/cms.cnf"
> ++#line 241 "./asn1/cms/cms.cnf"
> + 
> + 	item = actx->created_item;
> + 
> +@@ -1553,7 +1554,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
> + 
> + static int
> + dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 189 "./asn1/cms/cms.cnf"
> ++#line 190 "./asn1/cms/cms.cnf"
> +   proto_item *pi;
> +   int old_offset = offset;
> + 
> +@@ -1637,7 +1638,7 @@ dissect_cms_KeyWrapAlgorithm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
> + 
> + static int
> + dissect_cms_RC2ParameterVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 225 "./asn1/cms/cms.cnf"
> ++#line 226 "./asn1/cms/cms.cnf"
> +   guint32 length = 0;
> + 
> +     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
> +@@ -1715,7 +1716,7 @@ dissect_cms_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
> + 
> + static int
> + dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 207 "./asn1/cms/cms.cnf"
> ++#line 208 "./asn1/cms/cms.cnf"
> +   const char *name = NULL;
> + 
> +     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
> +@@ -1736,7 +1737,7 @@ dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
> + 
> + static int
> + dissect_cms_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
> +-#line 218 "./asn1/cms/cms.cnf"
> ++#line 219 "./asn1/cms/cms.cnf"
> + 
> +   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
> + 
> +-- 
> +2.20.1
> +
> diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
> index ccaa0c94a..9bac5bde4 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
> @@ -8,7 +8,8 @@ DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bi
>  
>  DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
>  
> -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz"
> +SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz \
> +	file://0001-CMS-reset-object_identifier_id-after-dissecting-Cont.patch"
>  
>  UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
>  


From akuster808 at gmail.com  Fri Mar 13 15:36:22 2020
From: akuster808 at gmail.com (akuster808)
Date: Fri, 13 Mar 2020 08:36:22 -0700
Subject: [oe] [meta-python][zeus][PATCH] python-urllib3/python3-urllib3:
 fix CVE-2020-7212
In-Reply-To: <1584094764-17831-1-git-send-email-Haiqing.Bai@windriver.com>
References: <1584094764-17831-1-git-send-email-Haiqing.Bai@windriver.com>
Message-ID: <652c9f72-5751-7494-c6e8-245e8e6af43e@gmail.com>



On 3/13/20 3:19 AM, Haiqing Bai wrote:
> Optimize _encode_invalid_chars for a denial of service (CPU consumption)

is this fix in master?


>
> Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> ---
>  .../python/python-urllib3/CVE-2020-7212.patch      | 54 ++++++++++++++++++++++
>  .../python/python-urllib3_1.25.6.bb                |  2 +
>  .../python/python3-urllib3/CVE-2020-7212.patch     | 54 ++++++++++++++++++++++
>  .../python/python3-urllib3_1.25.6.bb               |  2 +
>  4 files changed, 112 insertions(+)
>  create mode 100644 meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch
>  create mode 100644 meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch
>
> diff --git a/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch b/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch
> new file mode 100644
> index 0000000..a2bb0fb
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch
> @@ -0,0 +1,54 @@
> +From aff951b7a41eb5b958b32c49eaa00da02adc9c2d Mon Sep 17 00:00:00 2001
> +From: Quentin Pradet <quentin.pradet at gmail.com>
> +Date: Tue, 21 Jan 2020 22:32:56 +0400
> +Subject: [PATCH] Optimize _encode_invalid_chars (#1787)
> +
> +Co-authored-by: Seth Michael Larson <sethmichaellarson at gmail.com>
> +
> +Upstream-Status: Backport
> +[from git://github.com/urllib3/urllib3.git commit:a2697e7c6b]
> +Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> +---
> + src/urllib3/util/url.py | 15 ++++++---------
> + 1 file changed, 6 insertions(+), 9 deletions(-)
> +
> +diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py
> +index 9675f74..e353937 100644
> +--- a/src/urllib3/util/url.py
> ++++ b/src/urllib3/util/url.py
> +@@ -216,18 +216,15 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> + 
> +     component = six.ensure_text(component)
> + 
> ++    # Normalize existing percent-encoded bytes.
> +     # Try to see if the component we're encoding is already percent-encoded
> +     # so we can skip all '%' characters but still encode all others.
> +-    percent_encodings = PERCENT_RE.findall(component)
> +-
> +-    # Normalize existing percent-encoded bytes.
> +-    for enc in percent_encodings:
> +-        if not enc.isupper():
> +-            component = component.replace(enc, enc.upper())
> ++    component, percent_encodings = PERCENT_RE.subn(
> ++        lambda match: match.group(0).upper(), component
> ++    )
> + 
> +     uri_bytes = component.encode("utf-8", "surrogatepass")
> +-    is_percent_encoded = len(percent_encodings) == uri_bytes.count(b"%")
> +-
> ++    is_percent_encoded = percent_encodings == uri_bytes.count(b"%")
> +     encoded_component = bytearray()
> + 
> +     for i in range(0, len(uri_bytes)):
> +@@ -237,7 +234,7 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> +         if (is_percent_encoded and byte == b"%") or (
> +             byte_ord < 128 and byte.decode() in allowed_chars
> +         ):
> +-            encoded_component.extend(byte)
> ++            encoded_component += byte
> +             continue
> +         encoded_component.extend(b"%" + (hex(byte_ord)[2:].encode().zfill(2).upper()))
> + 
> +-- 
> +2.23.0
> +
> diff --git a/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb b/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
> index 6c81f1d..9f2d2c8 100644
> --- a/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
> +++ b/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
> @@ -1,2 +1,4 @@
>  inherit pypi setuptools
>  require python-urllib3.inc
> +
> +SRC_URI += "file://CVE-2020-7212.patch"
> diff --git a/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch
> new file mode 100644
> index 0000000..a2bb0fb
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patch
> @@ -0,0 +1,54 @@
> +From aff951b7a41eb5b958b32c49eaa00da02adc9c2d Mon Sep 17 00:00:00 2001
> +From: Quentin Pradet <quentin.pradet at gmail.com>
> +Date: Tue, 21 Jan 2020 22:32:56 +0400
> +Subject: [PATCH] Optimize _encode_invalid_chars (#1787)
> +
> +Co-authored-by: Seth Michael Larson <sethmichaellarson at gmail.com>
> +
> +Upstream-Status: Backport
> +[from git://github.com/urllib3/urllib3.git commit:a2697e7c6b]
> +Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> +---
> + src/urllib3/util/url.py | 15 ++++++---------
> + 1 file changed, 6 insertions(+), 9 deletions(-)
> +
> +diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py
> +index 9675f74..e353937 100644
> +--- a/src/urllib3/util/url.py
> ++++ b/src/urllib3/util/url.py
> +@@ -216,18 +216,15 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> + 
> +     component = six.ensure_text(component)
> + 
> ++    # Normalize existing percent-encoded bytes.
> +     # Try to see if the component we're encoding is already percent-encoded
> +     # so we can skip all '%' characters but still encode all others.
> +-    percent_encodings = PERCENT_RE.findall(component)
> +-
> +-    # Normalize existing percent-encoded bytes.
> +-    for enc in percent_encodings:
> +-        if not enc.isupper():
> +-            component = component.replace(enc, enc.upper())
> ++    component, percent_encodings = PERCENT_RE.subn(
> ++        lambda match: match.group(0).upper(), component
> ++    )
> + 
> +     uri_bytes = component.encode("utf-8", "surrogatepass")
> +-    is_percent_encoded = len(percent_encodings) == uri_bytes.count(b"%")
> +-
> ++    is_percent_encoded = percent_encodings == uri_bytes.count(b"%")
> +     encoded_component = bytearray()
> + 
> +     for i in range(0, len(uri_bytes)):
> +@@ -237,7 +234,7 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> +         if (is_percent_encoded and byte == b"%") or (
> +             byte_ord < 128 and byte.decode() in allowed_chars
> +         ):
> +-            encoded_component.extend(byte)
> ++            encoded_component += byte
> +             continue
> +         encoded_component.extend(b"%" + (hex(byte_ord)[2:].encode().zfill(2).upper()))
> + 
> +-- 
> +2.23.0
> +
> diff --git a/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb b/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
> index 19eb702..e3583a0 100644
> --- a/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
> +++ b/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
> @@ -1,2 +1,4 @@
>  inherit pypi setuptools3
>  require python-urllib3.inc
> +
> +SRC_URI += "file://CVE-2020-7212.patch"


From akuster808 at gmail.com  Fri Mar 13 15:36:43 2020
From: akuster808 at gmail.com (akuster808)
Date: Fri, 13 Mar 2020 08:36:43 -0700
Subject: [oe] [meta-oe][zeus][PATCH] libssh2: CVE-2019-17498.patch
In-Reply-To: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1f663de1-6dc9-c9fb-c14b-082de2934777@gmail.com>



On 3/13/20 4:10 AM, Wang Mingyu wrote:
> Security Advisory
>
> References:
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17498
is this fix in master?
>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  .../libssh2/libssh2/CVE-2019-17498.patch      | 131 ++++++++++++++++++
>  .../recipes-support/libssh2/libssh2_1.8.2.bb  |   1 +
>  2 files changed, 132 insertions(+)
>  create mode 100644 meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
>
> diff --git a/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch b/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
> new file mode 100644
> index 000000000..f60764c92
> --- /dev/null
> +++ b/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
> @@ -0,0 +1,131 @@
> +From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001
> +From: Will Cosgrove <will at panic.com>
> +Date: Fri, 30 Aug 2019 09:57:38 -0700
> +Subject: [PATCH] packet.c: improve message parsing (#402)
> +
> +* packet.c: improve parsing of packets
> +
> +file: packet.c
> +
> +notes:
> +Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST.
> +
> +Upstream-Status: Accepted
> +CVE: CVE-2019-17498
> +
> +Reference to upstream patch:
> +https://github.com/libssh2/libssh2/commit/dedcbd106f8e52d5586b0205bc7677e4c9868f9c
> +
> +---
> + src/packet.c | 68 ++++++++++++++++++++++------------------------------
> + 1 file changed, 29 insertions(+), 39 deletions(-)
> +
> +diff --git a/src/packet.c b/src/packet.c
> +index 38ab6294..2e01bfc5 100644
> +--- a/src/packet.c
> ++++ b/src/packet.c
> +@@ -416,8 +416,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> +                     size_t datalen, int macstate)
> + {
> +     int rc = 0;
> +-    char *message = NULL;
> +-    char *language = NULL;
> ++    unsigned char *message = NULL;
> ++    unsigned char *language = NULL;
> +     size_t message_len = 0;
> +     size_t language_len = 0;
> +     LIBSSH2_CHANNEL *channelp = NULL;
> +@@ -469,33 +469,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> + 
> +         case SSH_MSG_DISCONNECT:
> +             if(datalen >= 5) {
> +-                size_t reason = _libssh2_ntohu32(data + 1);
> ++                uint32_t reason = 0;
> ++                struct string_buf buf;
> ++                buf.data = (unsigned char *)data;
> ++                buf.dataptr = buf.data;
> ++                buf.len = datalen;
> ++                buf.dataptr++; /* advance past type */
> + 
> +-                if(datalen >= 9) {
> +-                    message_len = _libssh2_ntohu32(data + 5);
> ++                _libssh2_get_u32(&buf, &reason);
> ++                _libssh2_get_string(&buf, &message, &message_len);
> ++                _libssh2_get_string(&buf, &language, &language_len);
> + 
> +-                    if(message_len < datalen-13) {
> +-                        /* 9 = packet_type(1) + reason(4) + message_len(4) */
> +-                        message = (char *) data + 9;
> +-
> +-                        language_len =
> +-                            _libssh2_ntohu32(data + 9 + message_len);
> +-                        language = (char *) data + 9 + message_len + 4;
> +-
> +-                        if(language_len > (datalen-13-message_len)) {
> +-                            /* bad input, clear info */
> +-                            language = message = NULL;
> +-                            language_len = message_len = 0;
> +-                        }
> +-                    }
> +-                    else
> +-                        /* bad size, clear it */
> +-                        message_len = 0;
> +-                }
> +                 if(session->ssh_msg_disconnect) {
> +-                    LIBSSH2_DISCONNECT(session, reason, message,
> +-                                       message_len, language, language_len);
> ++                    LIBSSH2_DISCONNECT(session, reason, (const char *)message,
> ++                                       message_len, (const char *)language,
> ++                                       language_len);
> +                 }
> ++
> +                 _libssh2_debug(session, LIBSSH2_TRACE_TRANS,
> +                                "Disconnect(%d): %s(%s)", reason,
> +                                message, language);
> +@@ -534,23 +526,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> +                 int always_display = data[1];
> + 
> +                 if(datalen >= 6) {
> +-                    message_len = _libssh2_ntohu32(data + 2);
> +-
> +-                    if(message_len <= (datalen - 10)) {
> +-                        /* 6 = packet_type(1) + display(1) + message_len(4) */
> +-                        message = (char *) data + 6;
> +-                        language_len = _libssh2_ntohu32(data + 6 +
> +-                                                        message_len);
> +-
> +-                        if(language_len <= (datalen - 10 - message_len))
> +-                            language = (char *) data + 10 + message_len;
> +-                    }
> ++                    struct string_buf buf;
> ++                    buf.data = (unsigned char *)data;
> ++                    buf.dataptr = buf.data;
> ++                    buf.len = datalen;
> ++                    buf.dataptr += 2; /* advance past type & always display */
> ++
> ++                    _libssh2_get_string(&buf, &message, &message_len);
> ++                    _libssh2_get_string(&buf, &language, &language_len);
> +                 }
> + 
> +                 if(session->ssh_msg_debug) {
> +-                    LIBSSH2_DEBUG(session, always_display, message,
> +-                                  message_len, language, language_len);
> ++                    LIBSSH2_DEBUG(session, always_display,
> ++                                  (const char *)message,
> ++                                  message_len, (const char *)language,
> ++                                  language_len);
> +                 }
> +             }
> ++
> +             /*
> +              * _libssh2_debug will actually truncate this for us so
> +              * that it's not an inordinate about of data
> +@@ -576,7 +566,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> +                 uint32_t len = 0;
> +                 unsigned char want_reply = 0;
> +                 len = _libssh2_ntohu32(data + 1);
> +-                if(datalen >= (6 + len)) {
> ++                if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) {
> +                     want_reply = data[5 + len];
> +                     _libssh2_debug(session,
> +                                    LIBSSH2_TRACE_CONN,
> diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb b/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
> index fe853cde4..a17ae5b7c 100644
> --- a/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
> +++ b/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
> @@ -17,6 +17,7 @@ inherit autotools pkgconfig
>  EXTRA_OECONF += "\
>                   --with-libz \
>                   --with-libz-prefix=${STAGING_LIBDIR} \
> +                 file://CVE-2019-17498.patch \
>                  "
>  
>  # only one of openssl and gcrypt could be set


From akuster808 at gmail.com  Fri Mar 13 15:37:34 2020
From: akuster808 at gmail.com (akuster808)
Date: Fri, 13 Mar 2020 08:37:34 -0700
Subject: [oe] [meta-oe][zeus][PATCH] opensc: CVE-2019-19479
	CVE-2019-19480
In-Reply-To: <1584097824-54462-2-git-send-email-wangmy@cn.fujitsu.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
	<1584097824-54462-2-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <230ee0cf-428b-7c16-50c9-ec699e390d5f@gmail.com>



On 3/13/20 4:10 AM, Wang Mingyu wrote:
> Security Advisory
>
> References
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19479
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19480

Is this fix in master?

>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  .../opensc/opensc/CVE-2019-19479.patch        | 30 ++++++++++++++++
>  .../opensc/opensc/CVE-2019-19480.patch        | 34 +++++++++++++++++++
>  .../recipes-support/opensc/opensc_0.19.0.bb   |  2 ++
>  3 files changed, 66 insertions(+)
>  create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
>  create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
>
> diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
> new file mode 100644
> index 000000000..73222ee1a
> --- /dev/null
> +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
> @@ -0,0 +1,30 @@
> +From c3f23b836e5a1766c36617fe1da30d22f7b63de2 Mon Sep 17 00:00:00 2001
> +From: Frank Morgner <frankmorgner at gmail.com>
> +Date: Sun, 3 Nov 2019 04:45:28 +0100
> +Subject: [PATCH] fixed  UNKNOWN READ
> +
> +Upstream-Status: Accepted <or Backport>
> +CVE: CVE-2019-19479 
> +   
> +Reported by OSS-Fuzz
> +https://oss-fuzz.com/testcase-detail/5681169970757632
> +
> +Reference to upstream patch:
> +https://github.com/OpenSC/OpenSC/commit/c3f23b836e5a1766c36617fe1da30d22f7b63de2
Missing signed-off-by
> +---
> + src/libopensc/card-setcos.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/libopensc/card-setcos.c b/src/libopensc/card-setcos.c
> +index 4cf328ad6a..1b4e8f3e23 100644
> +--- a/src/libopensc/card-setcos.c
> ++++ b/src/libopensc/card-setcos.c
> +@@ -868,7 +868,7 @@ static void parse_sec_attr_44(sc_file_t *file, const u8 *buf, size_t len)
> + 			}
> + 
> + 			/* Encryption key present ? */
> +-			iPinCount = iACLen - 1;		
> ++			iPinCount = iACLen > 0 ? iACLen - 1 : 0;
> + 
> + 			if (buf[iOffset] & 0x20) {
> + 				int iSC;
> diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
> new file mode 100644
> index 000000000..12c1f0b4a
> --- /dev/null
> +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
> @@ -0,0 +1,34 @@
> +From 6ce6152284c47ba9b1d4fe8ff9d2e6a3f5ee02c7 Mon Sep 17 00:00:00 2001
> +From: Jakub Jelen <jjelen at redhat.com>
> +Date: Wed, 23 Oct 2019 09:22:44 +0200
> +Subject: [PATCH] pkcs15-prkey: Simplify cleaning memory after failure
> +
> +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18478
> +
> +Upstream-Status: Accepted
> +CVE: CVE-2019-19480
> +
> +Reference to upstream patch:
> +https://github.com/OpenSC/OpenSC/commit/6ce6152284c47ba9b1d4fe8ff9d2e6a3f5ee02c7
> +---
> + src/libopensc/pkcs15-prkey.c | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/src/libopensc/pkcs15-prkey.c b/src/libopensc/pkcs15-prkey.c
> +index d3eee983..4b249582 100644
> +--- a/src/libopensc/pkcs15-prkey.c
> ++++ b/src/libopensc/pkcs15-prkey.c
> +@@ -258,6 +258,10 @@ int sc_pkcs15_decode_prkdf_entry(struct sc_pkcs15_card *p15card,
> + 	memset(gostr3410_params, 0, sizeof(gostr3410_params));
> + 
> + 	r = sc_asn1_decode_choice(ctx, asn1_prkey, *buf, *buflen, buf, buflen);
> ++	if (r < 0) {
> ++	        /* This might have allocated something. If so, clear it now */
> ++	        free(info.subject.value);
> ++        }
> + 	if (r == SC_ERROR_ASN1_END_OF_CONTENTS)
> + 		return r;
> + 	LOG_TEST_RET(ctx, r, "PrKey DF ASN.1 decoding failed");
> +-- 
> +2.17.1
> +
> diff --git a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
> index bc1722e39..d26825a06 100644
> --- a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
> +++ b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
> @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
>  SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47"
>  SRC_URI = "git://github.com/OpenSC/OpenSC \
>             file://0001-Remove-redundant-logging.patch \
> +           file://CVE-2019-19479.patch \
> +           file://CVE-2019-19480.patch \
>            "
>  DEPENDS = "openct pcsc-lite virtual/libiconv openssl"
>  


From akuster808 at gmail.com  Fri Mar 13 15:39:12 2020
From: akuster808 at gmail.com (akuster808)
Date: Fri, 13 Mar 2020 08:39:12 -0700
Subject: [oe] [meta-oe][zeus][PATCH] php: CVE-2019-11045.patch
 CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch
In-Reply-To: <1584097824-54462-3-git-send-email-wangmy@cn.fujitsu.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
	<1584097824-54462-3-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <5787a0ee-36c6-16d3-e440-4b063a7e3522@gmail.com>



On 3/13/20 4:10 AM, Wang Mingyu wrote:
> Security Advisory
>
> References:
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050

are these fixes in master?
>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  .../php/php/CVE-2019-11045.patch              | 78 +++++++++++++++++++
>  .../php/php/CVE-2019-11046.patch              | 59 ++++++++++++++
>  .../php/php/CVE-2019-11047.patch              | 57 ++++++++++++++
>  .../php/php/CVE-2019-11050.patch              | 53 +++++++++++++
>  meta-oe/recipes-devtools/php/php_7.3.9.bb     |  4 +
>  5 files changed, 251 insertions(+)
>  create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
>  create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
>  create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
>  create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
>
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
> new file mode 100644
> index 000000000..3b3c187a4
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
> @@ -0,0 +1,78 @@
> +From a5a15965da23c8e97657278fc8dfbf1dfb20c016 Mon Sep 17 00:00:00 2001
> +From: "Christoph M. Becker" <cmbecker69 at gmx.de>
> +Date: Mon, 25 Nov 2019 16:56:34 +0100
> +Subject: [PATCH] Fix #78863: DirectoryIterator class silently truncates after
> + a null byte
> +
> +Since the constructor of DirectoryIterator and friends is supposed to
> +accepts paths (i.e. strings without NUL bytes), we must not accept
> +arbitrary strings.
> +
> +Upstream-Status: Accepted
Accepted mean you sent the fix upstream and they took it.
is this a "Backport"

Missing "Signed-off-by: "

> +CVE: CVE-2019-11045
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=a5a15965da23c8e97657278fc8dfbf1dfb20c016
> +http://git.php.net/?p=php-src.git;a=commit;h=d74907b8575e6edb83b728c2a94df434c23e1f79
> +---
> + ext/spl/spl_directory.c     |  4 ++--
> + ext/spl/tests/bug78863.phpt | 31 +++++++++++++++++++++++++++++++
> + 2 files changed, 33 insertions(+), 2 deletions(-)
> + create mode 100644 ext/spl/tests/bug78863.phpt
> +
> +diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
> +index 91ea2e0265..56e809b1c7 100644
> +--- a/ext/spl/spl_directory.c
> ++++ b/ext/spl/spl_directory.c
> +@@ -708,10 +708,10 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto
> + 
> + 	if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_FLAGS)) {
> + 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO;
> +-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &path, &len, &flags);
> ++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &path, &len, &flags);
> + 	} else {
> + 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
> +-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &len);
> ++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &len);
> + 	}
> + 	if (SPL_HAS_FLAG(ctor_flags, SPL_FILE_DIR_SKIPDOTS)) {
> + 		flags |= SPL_FILE_DIR_SKIPDOTS;
> +diff --git a/ext/spl/tests/bug78863.phpt b/ext/spl/tests/bug78863.phpt
> +new file mode 100644
> +index 0000000000..dc88d98dee
> +--- /dev/null
> ++++ b/ext/spl/tests/bug78863.phpt
> +@@ -0,0 +1,31 @@
> ++--TEST--
> ++Bug #78863 (DirectoryIterator class silently truncates after a null byte)
> ++--FILE--
> ++<?php
> ++$dir = __DIR__ . '/bug78863';
> ++mkdir($dir);
> ++touch("$dir/bad");
> ++mkdir("$dir/sub");
> ++touch("$dir/sub/good");
> ++
> ++$it = new DirectoryIterator(__DIR__ . "/bug78863\0/sub");
> ++foreach ($it as $fileinfo) {
> ++    if (!$fileinfo->isDot()) {
> ++        var_dump($fileinfo->getFilename());
> ++    }
> ++}
> ++?>
> ++--EXPECTF--
> ++Fatal error: Uncaught UnexpectedValueException: DirectoryIterator::__construct() expects parameter 1 to be a valid path, string given in %s:%d
> ++Stack trace:
> ++#0 %s(%d): DirectoryIterator->__construct('%s')
> ++#1 {main}
> ++  thrown in %s on line %d
> ++--CLEAN--
> ++<?php
> ++$dir = __DIR__ . '/bug78863';
> ++unlink("$dir/sub/good");
> ++rmdir("$dir/sub");
> ++unlink("$dir/bad");
> ++rmdir($dir);
> ++?>
> +-- 
> +2.11.0
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
> new file mode 100644
> index 000000000..711b8525a
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
> @@ -0,0 +1,59 @@
> +From 2d07f00b73d8f94099850e0f5983e1cc5817c196 Mon Sep 17 00:00:00 2001
> +From: "Christoph M. Becker" <cmbecker69 at gmx.de>
> +Date: Sat, 30 Nov 2019 12:26:37 +0100
> +Subject: [PATCH] Fix #78878: Buffer underflow in bc_shift_addsub
> +
> +We must not rely on `isdigit()` to detect digits, since we only support
> +decimal ASCII digits in the following processing.
> +
> +(cherry picked from commit eb23c6008753b1cdc5359dead3a096dce46c9018)
> +
> +Upstream-Status: Accepted
> +CVE: CVE-2019-11046
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=eb23c6008753b1cdc5359dead3a096dce46c9018
> +http://git.php.net/?p=php-src.git;a=commit;h=2d07f00b73d8f94099850e0f5983e1cc5817c196
> +---
> + ext/bcmath/libbcmath/src/str2num.c |  4 ++--
> + ext/bcmath/tests/bug78878.phpt     | 13 +++++++++++++
> + 2 files changed, 15 insertions(+), 2 deletions(-)
> + create mode 100644 ext/bcmath/tests/bug78878.phpt
> +
> +diff --git a/ext/bcmath/libbcmath/src/str2num.c b/ext/bcmath/libbcmath/src/str2num.c
> +index f38d341570..03aec15930 100644
> +--- a/ext/bcmath/libbcmath/src/str2num.c
> ++++ b/ext/bcmath/libbcmath/src/str2num.c
> +@@ -57,9 +57,9 @@ bc_str2num (bc_num *num, char *str, int scale)
> +   zero_int = FALSE;
> +   if ( (*ptr == '+') || (*ptr == '-'))  ptr++;  /* Sign */
> +   while (*ptr == '0') ptr++;			/* Skip leading zeros. */
> +-  while (isdigit((int)*ptr)) ptr++, digits++;	/* digits */
> ++  while (*ptr >= '0' && *ptr <= '9') ptr++, digits++;	/* digits */
> +   if (*ptr == '.') ptr++;			/* decimal point */
> +-  while (isdigit((int)*ptr)) ptr++, strscale++;	/* digits */
> ++  while (*ptr >= '0' && *ptr <= '9') ptr++, strscale++;	/* digits */
> +   if ((*ptr != '\0') || (digits+strscale == 0))
> +     {
> +       *num = bc_copy_num (BCG(_zero_));
> +diff --git a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt
> +new file mode 100644
> +index 0000000000..2c9d72b946
> +--- /dev/null
> ++++ b/ext/bcmath/tests/bug78878.phpt
> +@@ -0,0 +1,13 @@
> ++--TEST--
> ++Bug #78878 (Buffer underflow in bc_shift_addsub)
> ++--SKIPIF--
> ++<?php
> ++if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
> ++?>
> ++--FILE--
> ++<?php
> ++print @bcmul("\xB26483605105519922841849335928742092", bcpowmod(2, 65535, -4e-4));
> ++?>
> ++--EXPECT--
> ++bc math warning: non-zero scale in modulus
> ++0
> +-- 
> +2.11.0
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
> new file mode 100644
> index 000000000..e2922bf8f
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
> @@ -0,0 +1,57 @@
> +From d348cfb96f2543565691010ade5e0346338be5a7 Mon Sep 17 00:00:00 2001
> +From: Stanislav Malyshev <stas at php.net>
> +Date: Mon, 16 Dec 2019 00:10:39 -0800
> +Subject: [PATCH] Fixed bug #78910
> +
> +Upstream-Status: Accepted
> +CVE-2019-11047
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=d348cfb96f2543565691010ade5e0346338be5a7
> +http://git.php.net/?p=php-src.git;a=commit;h=57325460d2bdee01a13d8e6cf03345c90543ff4f
> +---
> + ext/exif/exif.c              |  3 ++-
> + ext/exif/tests/bug78910.phpt | 17 +++++++++++++++++
> + 2 files changed, 19 insertions(+), 1 deletion(-)
> + create mode 100644 ext/exif/tests/bug78910.phpt
> +
> +diff --git a/ext/exif/exif.c b/ext/exif/exif.c
> +index 2804807e..a5780113 100644
> +--- a/ext/exif/exif.c
> ++++ b/ext/exif/exif.c
> +@@ -3138,7 +3138,8 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
> + 		/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s)", maker_note->make?maker_note->make:"");*/
> + 		if (maker_note->make && (!ImageInfo->make || strcmp(maker_note->make, ImageInfo->make)))
> + 			continue;
> +-		if (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
> ++		if (maker_note->id_string && value_len >= maker_note->id_string_len
> ++				&& strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
> + 			continue;
> + 		break;
> + 	}
> +diff --git a/ext/exif/tests/bug78910.phpt b/ext/exif/tests/bug78910.phpt
> +new file mode 100644
> +index 00000000..f5b1c32c
> +--- /dev/null
> ++++ b/ext/exif/tests/bug78910.phpt
> +@@ -0,0 +1,17 @@
> ++--TEST--
> ++Bug #78910: Heap-buffer-overflow READ in exif (OSS-Fuzz #19044)
> ++--FILE--
> ++<?php
> ++
> ++var_dump(exif_read_data('data:image/jpg;base64,TU0AKgAAAAwgICAgAAIBDwAEAAAAAgAAACKSfCAgAAAAAEZVSklGSUxN'));
> ++
> ++?>
> ++--EXPECTF--
> ++Notice: exif_read_data(): Read from TIFF: tag(0x927C, MakerNote  ): Illegal format code 0x2020, switching to BYTE in %s on line %d
> ++
> ++Warning: exif_read_data(): Process tag(x927C=MakerNote  ): Illegal format code 0x2020, suppose BYTE in %s on line %d
> ++
> ++Warning: exif_read_data(): IFD data too short: 0x0000 offset 0x000C in %s on line %d
> ++
> ++Warning: exif_read_data(): Invalid TIFF file in %s on line %d
> ++bool(false)
> +-- 
> +2.17.1
> +
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
> new file mode 100644
> index 000000000..700b99bd9
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
> @@ -0,0 +1,53 @@
> +From c14eb8de974fc8a4d74f3515424c293bc7a40fba Mon Sep 17 00:00:00 2001
> +From: Stanislav Malyshev <stas at php.net>
> +Date: Mon, 16 Dec 2019 01:14:38 -0800
> +Subject: [PATCH] Fix bug #78793
> +
> +Upstream-Status: Accepted
> +CVE-2019-11050
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=c14eb8de974fc8a4d74f3515424c293bc7a40fba
> +http://git.php.net/?p=php-src.git;a=commit;h=1b3b4a0d367b6f0b67e9f73d82f53db6c6b722b2
> +---
> + ext/exif/exif.c              |  5 +++--
> + ext/exif/tests/bug78793.phpt | 12 ++++++++++++
> + 2 files changed, 15 insertions(+), 2 deletions(-)
> + create mode 100644 ext/exif/tests/bug78793.phpt
> +
> +diff --git a/ext/exif/exif.c b/ext/exif/exif.c
> +index c0be05922f..7fe055f381 100644
> +--- a/ext/exif/exif.c
> ++++ b/ext/exif/exif.c
> +@@ -3240,8 +3240,9 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
> + 	}
> + 
> + 	for (de=0;de<NumDirEntries;de++) {
> +-		if (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,
> +-								  offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {
> ++		size_t offset = 2 + 12 * de;
> ++		if (!exif_process_IFD_TAG(ImageInfo, dir_start + offset,
> ++								  offset_base, data_len - offset, displacement, section_index, 0, maker_note->tag_table)) {
> + 			return FALSE;
> + 		}
> + 	}
> +diff --git a/ext/exif/tests/bug78793.phpt b/ext/exif/tests/bug78793.phpt
> +new file mode 100644
> +index 0000000000..033f255ace
> +--- /dev/null
> ++++ b/ext/exif/tests/bug78793.phpt
> +@@ -0,0 +1,12 @@
> ++--TEST--
> ++Bug #78793: Use-after-free in exif parsing under memory sanitizer
> ++--FILE--
> ++<?php
> ++$f = "ext/exif/tests/bug77950.tiff";
> ++for ($i = 0; $i < 10; $i++) {
> ++    @exif_read_data($f);
> ++}
> ++?>
> ++===DONE===
> ++--EXPECT--
> ++===DONE===
> +-- 
> +2.11.0
> diff --git a/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-oe/recipes-devtools/php/php_7.3.9.bb
> index e886cb1a2..670c3321c 100644
> --- a/meta-oe/recipes-devtools/php/php_7.3.9.bb
> +++ b/meta-oe/recipes-devtools/php/php_7.3.9.bb
> @@ -9,6 +9,10 @@ SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
>              file://debian-php-fixheader.patch \
>              file://CVE-2019-6978.patch \
>              file://CVE-2019-11043.patch \
> +            file://CVE-2019-11045.patch \
> +            file://CVE-2019-11046.patch \
> +            file://CVE-2019-11047.patch \
> +            file://CVE-2019-11050.patch \
>             "
>  SRC_URI_append_class-target = " \
>                                  file://pear-makefile.patch \


From raj.khem at gmail.com  Fri Mar 13 17:58:41 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Fri, 13 Mar 2020 10:58:41 -0700
Subject: [oe] [meta-oe][PATCH] sysdig: Use luajit and build fixes on aarch64
Message-ID: <20200313175841.1142001-1-raj.khem@gmail.com>

latest luajit now supports aarch64

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../sysdig/sysdig/aarch64.patch               | 359 ++++++++++++++++++
 meta-oe/recipes-extended/sysdig/sysdig_git.bb |   3 +-
 2 files changed, 360 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch

diff --git a/meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch b/meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch
new file mode 100644
index 0000000000..f16b0eca50
--- /dev/null
+++ b/meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch
@@ -0,0 +1,359 @@
+Check if legacy syscalls exist
+
+A lot of legacy syscalls are replaced with *at and are not implemented in newer
+architectures like aarch64
+
+Upstream-Status: Submitted [https://github.com/draios/sysdig/pull/1601]
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+--- a/driver/syscall_table.c
++++ b/driver/syscall_table.c
+@@ -42,26 +42,46 @@ or GPL2.txt for full copies of the licen
+  * SYSCALL TABLE
+  */
+ const struct syscall_evt_pair g_syscall_table[SYSCALL_TABLE_SIZE] = {
++#ifdef __NR_open
+ 	[__NR_open - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_OPEN_E, PPME_SYSCALL_OPEN_X},
++#endif
++#ifdef __NR_creat
+ 	[__NR_creat - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_CREAT_E, PPME_SYSCALL_CREAT_X},
++#endif
+ 	[__NR_close - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_CLOSE_E, PPME_SYSCALL_CLOSE_X},
+ 	[__NR_brk - SYSCALL_TABLE_ID0] =                        {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_BRK_4_E, PPME_SYSCALL_BRK_4_X},
+ 	[__NR_read - SYSCALL_TABLE_ID0] =                       {UF_USED, PPME_SYSCALL_READ_E, PPME_SYSCALL_READ_X},
+ 	[__NR_write - SYSCALL_TABLE_ID0] =                      {UF_USED, PPME_SYSCALL_WRITE_E, PPME_SYSCALL_WRITE_X},
+ 	[__NR_execve - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_EXECVE_19_E, PPME_SYSCALL_EXECVE_19_X},
+ 	[__NR_clone - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_CLONE_20_E, PPME_SYSCALL_CLONE_20_X},
++#ifdef __NR_fork
+ 	[__NR_fork - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_FORK_20_E, PPME_SYSCALL_FORK_20_X},
++#endif
++#ifdef __NR_vfork
+ 	[__NR_vfork - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_VFORK_20_E, PPME_SYSCALL_VFORK_20_X},
++#endif
++#ifdef __NR_pipe
+ 	[__NR_pipe - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_PIPE_E, PPME_SYSCALL_PIPE_X},
++#endif
+ 	[__NR_pipe2 - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_PIPE_E, PPME_SYSCALL_PIPE_X},
++#ifdef __NR_eventfd
+ 	[__NR_eventfd - SYSCALL_TABLE_ID0] =                    {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_EVENTFD_E, PPME_SYSCALL_EVENTFD_X},
++#endif
+ 	[__NR_eventfd2 - SYSCALL_TABLE_ID0] =                   {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_EVENTFD_E, PPME_SYSCALL_EVENTFD_X},
+ 	[__NR_futex - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_FUTEX_E, PPME_SYSCALL_FUTEX_X},
++#ifdef __NR_stat
+ 	[__NR_stat - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_STAT_E, PPME_SYSCALL_STAT_X},
++#endif
++#ifdef __NR_lstat
+ 	[__NR_lstat - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_LSTAT_E, PPME_SYSCALL_LSTAT_X},
++#endif
+ 	[__NR_fstat - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_FSTAT_E, PPME_SYSCALL_FSTAT_X},
++#ifdef __NR_epoll_wait
+ 	[__NR_epoll_wait - SYSCALL_TABLE_ID0] =                 {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_EPOLLWAIT_E, PPME_SYSCALL_EPOLLWAIT_X},
++#endif
++#ifdef __NR_poll
+ 	[__NR_poll - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_POLL_E, PPME_SYSCALL_POLL_X},
++#endif
+ #ifdef __NR_select
+ 	[__NR_select - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_SELECT_E, PPME_SYSCALL_SELECT_X},
+ #endif
+@@ -70,13 +90,21 @@ const struct syscall_evt_pair g_syscall_
+ 	[__NR_getcwd - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_GETCWD_E, PPME_SYSCALL_GETCWD_X},
+ 	[__NR_chdir - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_CHDIR_E, PPME_SYSCALL_CHDIR_X},
+ 	[__NR_fchdir - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_FCHDIR_E, PPME_SYSCALL_FCHDIR_X},
++#ifdef __NR_mkdir
+ 	[__NR_mkdir - SYSCALL_TABLE_ID0] =                      {UF_USED, PPME_SYSCALL_MKDIR_2_E, PPME_SYSCALL_MKDIR_2_X},
++#endif
++#ifdef __NR_rmdir
+ 	[__NR_rmdir - SYSCALL_TABLE_ID0] =                      {UF_USED, PPME_SYSCALL_RMDIR_2_E, PPME_SYSCALL_RMDIR_2_X},
++#endif
+ 	[__NR_openat - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_OPENAT_2_E, PPME_SYSCALL_OPENAT_2_X},
+ 	[__NR_mkdirat - SYSCALL_TABLE_ID0] =                    {UF_USED, PPME_SYSCALL_MKDIRAT_E, PPME_SYSCALL_MKDIRAT_X},
++#ifdef __NR_link
+ 	[__NR_link - SYSCALL_TABLE_ID0] =                       {UF_USED, PPME_SYSCALL_LINK_2_E, PPME_SYSCALL_LINK_2_X},
++#endif
+ 	[__NR_linkat - SYSCALL_TABLE_ID0] =                     {UF_USED, PPME_SYSCALL_LINKAT_2_E, PPME_SYSCALL_LINKAT_2_X},
++#ifdef __NR_unlink
+ 	[__NR_unlink - SYSCALL_TABLE_ID0] =                     {UF_USED, PPME_SYSCALL_UNLINK_2_E, PPME_SYSCALL_UNLINK_2_X},
++#endif
+ 	[__NR_unlinkat - SYSCALL_TABLE_ID0] =                   {UF_USED, PPME_SYSCALL_UNLINKAT_2_E, PPME_SYSCALL_UNLINKAT_2_X},
+ 	[__NR_pread64 - SYSCALL_TABLE_ID0] =                    {UF_USED, PPME_SYSCALL_PREAD_E, PPME_SYSCALL_PREAD_X},
+ 	[__NR_pwrite64 - SYSCALL_TABLE_ID0] =                   {UF_USED, PPME_SYSCALL_PWRITE_E, PPME_SYSCALL_PWRITE_X},
+@@ -85,16 +113,22 @@ const struct syscall_evt_pair g_syscall_
+ 	[__NR_preadv - SYSCALL_TABLE_ID0] =                     {UF_USED, PPME_SYSCALL_PREADV_E, PPME_SYSCALL_PREADV_X},
+ 	[__NR_pwritev - SYSCALL_TABLE_ID0] =                    {UF_USED, PPME_SYSCALL_PWRITEV_E, PPME_SYSCALL_PWRITEV_X},
+ 	[__NR_dup - SYSCALL_TABLE_ID0] =                        {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_DUP_E, PPME_SYSCALL_DUP_X},
++#ifdef __NR_dup2
+ 	[__NR_dup2 - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_DUP_E, PPME_SYSCALL_DUP_X},
++#endif
+ 	[__NR_dup3 - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_DUP_E, PPME_SYSCALL_DUP_X},
++#ifdef __NR_signalfd
+ 	[__NR_signalfd - SYSCALL_TABLE_ID0] =                   {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_SIGNALFD_E, PPME_SYSCALL_SIGNALFD_X},
++#endif
+ 	[__NR_signalfd4 - SYSCALL_TABLE_ID0] =                  {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_SIGNALFD_E, PPME_SYSCALL_SIGNALFD_X},
+ 	[__NR_kill - SYSCALL_TABLE_ID0] =                       {UF_USED, PPME_SYSCALL_KILL_E, PPME_SYSCALL_KILL_X},
+ 	[__NR_tkill - SYSCALL_TABLE_ID0] =                      {UF_USED, PPME_SYSCALL_TKILL_E, PPME_SYSCALL_TKILL_X},
+ 	[__NR_tgkill - SYSCALL_TABLE_ID0] =                     {UF_USED, PPME_SYSCALL_TGKILL_E, PPME_SYSCALL_TGKILL_X},
+ 	[__NR_nanosleep - SYSCALL_TABLE_ID0] =                  {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_NANOSLEEP_E, PPME_SYSCALL_NANOSLEEP_X},
+ 	[__NR_timerfd_create - SYSCALL_TABLE_ID0] =             {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_TIMERFD_CREATE_E, PPME_SYSCALL_TIMERFD_CREATE_X},
++#ifdef __NR_inotify_init
+ 	[__NR_inotify_init - SYSCALL_TABLE_ID0] =               {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_INOTIFY_INIT_E, PPME_SYSCALL_INOTIFY_INIT_X},
++#endif
+ 	[__NR_inotify_init1 - SYSCALL_TABLE_ID0] =              {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_INOTIFY_INIT_E, PPME_SYSCALL_INOTIFY_INIT_X},
+ 	[__NR_fchmodat - SYSCALL_TABLE_ID0] =                   {UF_USED, PPME_SYSCALL_FCHMODAT_E, PPME_SYSCALL_FCHMODAT_X},
+ 	[__NR_fchmod - SYSCALL_TABLE_ID0] =                     {UF_USED, PPME_SYSCALL_FCHMOD_E, PPME_SYSCALL_FCHMOD_X},
+@@ -114,14 +148,22 @@ const struct syscall_evt_pair g_syscall_
+ #endif
+ /* [__NR_old_select - SYSCALL_TABLE_ID0] =	{UF_USED, PPME_GENERIC_E, PPME_GENERIC_X}, */
+ 	[__NR_pselect6 - SYSCALL_TABLE_ID0] =                   {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
++#ifdef __NR_epoll_create
+ 	[__NR_epoll_create - SYSCALL_TABLE_ID0] =               {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
++#endif
+ 	[__NR_epoll_ctl - SYSCALL_TABLE_ID0] =                  {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
++#ifdef __NR_uselib
+ 	[__NR_uselib - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
++#endif
+ 	[__NR_sched_setparam - SYSCALL_TABLE_ID0] =             {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
+ 	[__NR_sched_getparam - SYSCALL_TABLE_ID0] =             {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
+ 	[__NR_syslog - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
++#ifdef __NR_chmod
+ 	[__NR_chmod - SYSCALL_TABLE_ID0] =                      {UF_USED, PPME_SYSCALL_CHMOD_E, PPME_SYSCALL_CHMOD_X},
++#endif
++#ifdef __NR_lchown
+ 	[__NR_lchown - SYSCALL_TABLE_ID0] =                     {UF_USED, PPME_GENERIC_E, PPME_GENERIC_X},
++#endif
+ #ifdef __NR_utime
+ 	[__NR_utime - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
+ #endif
+@@ -131,8 +173,9 @@ const struct syscall_evt_pair g_syscall_
+ #ifdef __NR_alarm
+ 	[__NR_alarm - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
+ #endif
++#ifdef __NR_pause
+ 	[__NR_pause - SYSCALL_TABLE_ID0] =                      {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X},
+-
++#endif
+ #ifndef __NR_socketcall
+ 	[__NR_socket - SYSCALL_TABLE_ID0] =                     {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SOCKET_SOCKET_E, PPME_SOCKET_SOCKET_X},
+ 	[__NR_bind - SYSCALL_TABLE_ID0] =                       {UF_USED | UF_NEVER_DROP, PPME_SOCKET_BIND_E,  PPME_SOCKET_BIND_X},
+@@ -184,9 +227,13 @@ const struct syscall_evt_pair g_syscall_
+ 	[__NR_process_vm_writev - SYSCALL_TABLE_ID0] =          {UF_USED, PPME_GENERIC_E, PPME_GENERIC_X},
+ #endif
+ 
++#ifdef __NR_rename
+ 	[__NR_rename - SYSCALL_TABLE_ID0] =                     {UF_USED, PPME_SYSCALL_RENAME_E, PPME_SYSCALL_RENAME_X},
++#endif
+ 	[__NR_renameat - SYSCALL_TABLE_ID0] =                   {UF_USED, PPME_SYSCALL_RENAMEAT_E, PPME_SYSCALL_RENAMEAT_X},
++#ifdef __NR_symlink
+ 	[__NR_symlink - SYSCALL_TABLE_ID0] =                    {UF_USED, PPME_SYSCALL_SYMLINK_E, PPME_SYSCALL_SYMLINK_X},
++#endif
+ 	[__NR_symlinkat - SYSCALL_TABLE_ID0] =                  {UF_USED, PPME_SYSCALL_SYMLINKAT_E, PPME_SYSCALL_SYMLINKAT_X},
+ 	[__NR_sendfile - SYSCALL_TABLE_ID0] =                   {UF_USED, PPME_SYSCALL_SENDFILE_E, PPME_SYSCALL_SENDFILE_X},
+ #ifdef __NR_sendfile64
+@@ -255,7 +302,9 @@ const struct syscall_evt_pair g_syscall_
+ #ifdef __NR_getresgid32
+ 	[__NR_getresgid32 - SYSCALL_TABLE_ID0] =                {UF_USED, PPME_SYSCALL_GETRESGID_E, PPME_SYSCALL_GETRESGID_X },
+ #endif
++#ifdef __NR_getdents
+ 	[__NR_getdents - SYSCALL_TABLE_ID0] =                   {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_GETDENTS_E, PPME_SYSCALL_GETDENTS_X},
++#endif
+ 	[__NR_getdents64 - SYSCALL_TABLE_ID0] =                 {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_GETDENTS64_E, PPME_SYSCALL_GETDENTS64_X},
+ #ifdef __NR_setns
+ 	[__NR_setns - SYSCALL_TABLE_ID0] =                      {UF_USED, PPME_SYSCALL_SETNS_E, PPME_SYSCALL_SETNS_X},
+@@ -298,19 +347,33 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_exit - SYSCALL_TABLE_ID0] = PPM_SC_EXIT,
+ 	[__NR_read - SYSCALL_TABLE_ID0] = PPM_SC_READ,
+ 	[__NR_write - SYSCALL_TABLE_ID0] = PPM_SC_WRITE,
++#ifdef __NR_open
+ 	[__NR_open - SYSCALL_TABLE_ID0] = PPM_SC_OPEN,
++#endif
+ 	[__NR_close - SYSCALL_TABLE_ID0] = PPM_SC_CLOSE,
++#ifdef __NR_creat
+ 	[__NR_creat - SYSCALL_TABLE_ID0] = PPM_SC_CREAT,
++#endif
++#ifdef __NR_link
+ 	[__NR_link - SYSCALL_TABLE_ID0] = PPM_SC_LINK,
++#endif
++#ifdef __NR_unlink
+ 	[__NR_unlink - SYSCALL_TABLE_ID0] = PPM_SC_UNLINK,
++#endif
+ 	[__NR_chdir - SYSCALL_TABLE_ID0] = PPM_SC_CHDIR,
+ #ifdef __NR_time
+ 	[__NR_time - SYSCALL_TABLE_ID0] = PPM_SC_TIME,
+ #endif
++#ifdef __NR_mknod
+ 	[__NR_mknod - SYSCALL_TABLE_ID0] = PPM_SC_MKNOD,
++#endif
++#ifdef __NR_chmod
+ 	[__NR_chmod - SYSCALL_TABLE_ID0] = PPM_SC_CHMOD,
++#endif
+ /* [__NR_lchown16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_LCHOWN16, */
++#ifdef __NR_stat
+ 	[__NR_stat - SYSCALL_TABLE_ID0] = PPM_SC_STAT,
++#endif
+ 	[__NR_lseek - SYSCALL_TABLE_ID0] = PPM_SC_LSEEK,
+ 	[__NR_getpid - SYSCALL_TABLE_ID0] = PPM_SC_GETPID,
+ 	[__NR_mount - SYSCALL_TABLE_ID0] = PPM_SC_MOUNT,
+@@ -322,17 +385,27 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_alarm - SYSCALL_TABLE_ID0] = PPM_SC_ALARM,
+ #endif
+ 	[__NR_fstat - SYSCALL_TABLE_ID0] = PPM_SC_FSTAT,
++#ifdef __NR_pause
+ 	[__NR_pause - SYSCALL_TABLE_ID0] = PPM_SC_PAUSE,
++#endif
+ #ifdef __NR_utime
+ 	[__NR_utime - SYSCALL_TABLE_ID0] = PPM_SC_UTIME,
+ #endif
+ 	[__NR_sync - SYSCALL_TABLE_ID0] = PPM_SC_SYNC,
+ 	[__NR_kill - SYSCALL_TABLE_ID0] = PPM_SC_KILL,
++#ifdef __NR_rename
+ 	[__NR_rename - SYSCALL_TABLE_ID0] = PPM_SC_RENAME,
++#endif
++#ifdef __NR_mkdir
+ 	[__NR_mkdir - SYSCALL_TABLE_ID0] = PPM_SC_MKDIR,
++#endif
++#ifdef __NR_rmdir
+ 	[__NR_rmdir - SYSCALL_TABLE_ID0] = PPM_SC_RMDIR,
++#endif
+ 	[__NR_dup - SYSCALL_TABLE_ID0] = PPM_SC_DUP,
++#ifdef __NR_pipe
+ 	[__NR_pipe - SYSCALL_TABLE_ID0] = PPM_SC_PIPE,
++#endif
+ 	[__NR_times - SYSCALL_TABLE_ID0] = PPM_SC_TIMES,
+ 	[__NR_brk - SYSCALL_TABLE_ID0] = PPM_SC_BRK,
+ /* [__NR_setgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETGID16, */
+@@ -345,10 +418,16 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_setpgid - SYSCALL_TABLE_ID0] = PPM_SC_SETPGID,
+ 	[__NR_umask - SYSCALL_TABLE_ID0] = PPM_SC_UMASK,
+ 	[__NR_chroot - SYSCALL_TABLE_ID0] = PPM_SC_CHROOT,
++#ifdef __NR_ustat
+ 	[__NR_ustat - SYSCALL_TABLE_ID0] = PPM_SC_USTAT,
++#endif
++#ifdef __NR_dup2
+ 	[__NR_dup2 - SYSCALL_TABLE_ID0] = PPM_SC_DUP2,
++#endif
+ 	[__NR_getppid - SYSCALL_TABLE_ID0] = PPM_SC_GETPPID,
++#ifdef __NR_getpgrp
+ 	[__NR_getpgrp - SYSCALL_TABLE_ID0] = PPM_SC_GETPGRP,
++#endif
+ 	[__NR_setsid - SYSCALL_TABLE_ID0] = PPM_SC_SETSID,
+ 	[__NR_sethostname - SYSCALL_TABLE_ID0] = PPM_SC_SETHOSTNAME,
+ 	[__NR_setrlimit - SYSCALL_TABLE_ID0] = PPM_SC_SETRLIMIT,
+@@ -359,10 +438,18 @@ const enum ppm_syscall_code g_syscall_co
+ /* [__NR_getgroups16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_GETGROUPS16, */
+ /* [__NR_setgroups16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETGROUPS16, */
+ /* [__NR_old_select - SYSCALL_TABLE_ID0] = PPM_SC_NR_OLD_SELECT, */
++#ifdef __NR_symlink
+ 	[__NR_symlink - SYSCALL_TABLE_ID0] = PPM_SC_SYMLINK,
++#endif
++#ifdef __NR_lstat
+ 	[__NR_lstat - SYSCALL_TABLE_ID0] = PPM_SC_LSTAT,
++#endif
++#ifdef __NR_readlink
+ 	[__NR_readlink - SYSCALL_TABLE_ID0] = PPM_SC_READLINK,
++#endif
++#ifdef __NR_uselib
+ 	[__NR_uselib - SYSCALL_TABLE_ID0] = PPM_SC_USELIB,
++#endif
+ 	[__NR_swapon - SYSCALL_TABLE_ID0] = PPM_SC_SWAPON,
+ 	[__NR_reboot - SYSCALL_TABLE_ID0] = PPM_SC_REBOOT,
+ /* [__NR_old_readdir - SYSCALL_TABLE_ID0] = PPM_SC_NR_OLD_READDIR, */
+@@ -399,12 +486,16 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_delete_module - SYSCALL_TABLE_ID0] = PPM_SC_DELETE_MODULE,
+ 	[__NR_getpgid - SYSCALL_TABLE_ID0] = PPM_SC_GETPGID,
+ 	[__NR_fchdir - SYSCALL_TABLE_ID0] = PPM_SC_FCHDIR,
++#ifdef __NR_sysfs
+ 	[__NR_sysfs - SYSCALL_TABLE_ID0] = PPM_SC_SYSFS,
++#endif
+ 	[__NR_personality - SYSCALL_TABLE_ID0] = PPM_SC_PERSONALITY,
+ /* [__NR_setfsuid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETFSUID16, */
+ /* [__NR_setfsgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETFSGID16, */
+ /* [__NR_llseek - SYSCALL_TABLE_ID0] = PPM_SC_NR_LLSEEK, */
++#ifdef __NR_getdents
+ 	[__NR_getdents - SYSCALL_TABLE_ID0] = PPM_SC_GETDENTS,
++#endif
+ #ifdef __NR_select
+ 	[__NR_select - SYSCALL_TABLE_ID0] = PPM_SC_SELECT,
+ #endif
+@@ -431,7 +522,9 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_mremap - SYSCALL_TABLE_ID0] = PPM_SC_MREMAP,
+ /* [__NR_setresuid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETRESUID16, */
+ /* [__NR_getresuid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_GETRESUID16, */
++#ifdef __NR_poll
+ 	[__NR_poll - SYSCALL_TABLE_ID0] = PPM_SC_POLL,
++#endif
+ /* [__NR_setresgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETRESGID16, */
+ /* [__NR_getresgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_GETRESGID16, */
+ 	[__NR_prctl - SYSCALL_TABLE_ID0] = PPM_SC_PRCTL,
+@@ -453,13 +546,17 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_getrlimit - SYSCALL_TABLE_ID0] = PPM_SC_GETRLIMIT,
+ #endif
+ /* [__NR_mmap_pgoff - SYSCALL_TABLE_ID0] = PPM_SC_NR_MMAP_PGOFF, */
++#ifdef __NR_lchown
+ 	[__NR_lchown - SYSCALL_TABLE_ID0] = PPM_SC_LCHOWN,
++#endif
+ 	[__NR_setreuid - SYSCALL_TABLE_ID0] = PPM_SC_SETREUID,
+ 	[__NR_setregid - SYSCALL_TABLE_ID0] = PPM_SC_SETREGID,
+ 	[__NR_getgroups - SYSCALL_TABLE_ID0] = PPM_SC_GETGROUPS,
+ 	[__NR_setgroups - SYSCALL_TABLE_ID0] = PPM_SC_SETGROUPS,
+ 	[__NR_fchown - SYSCALL_TABLE_ID0] = PPM_SC_FCHOWN,
++#ifdef __NR_chown
+ 	[__NR_chown - SYSCALL_TABLE_ID0] = PPM_SC_CHOWN,
++#endif
+ 	[__NR_setfsuid - SYSCALL_TABLE_ID0] = PPM_SC_SETFSUID,
+ 	[__NR_setfsgid - SYSCALL_TABLE_ID0] = PPM_SC_SETFSGID,
+ 	[__NR_pivot_root - SYSCALL_TABLE_ID0] = PPM_SC_PIVOT_ROOT,
+@@ -494,9 +591,13 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_io_submit - SYSCALL_TABLE_ID0] = PPM_SC_IO_SUBMIT,
+ 	[__NR_io_cancel - SYSCALL_TABLE_ID0] = PPM_SC_IO_CANCEL,
+ 	[__NR_exit_group - SYSCALL_TABLE_ID0] = PPM_SC_EXIT_GROUP,
++#ifdef __NR_epoll_create
+ 	[__NR_epoll_create - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_CREATE,
++#endif
+ 	[__NR_epoll_ctl - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_CTL,
++#ifdef __NR_epoll_wait
+ 	[__NR_epoll_wait - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_WAIT,
++#endif
+ 	[__NR_remap_file_pages - SYSCALL_TABLE_ID0] = PPM_SC_REMAP_FILE_PAGES,
+ 	[__NR_set_tid_address - SYSCALL_TABLE_ID0] = PPM_SC_SET_TID_ADDRESS,
+ 	[__NR_timer_create - SYSCALL_TABLE_ID0] = PPM_SC_TIMER_CREATE,
+@@ -509,7 +610,9 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_clock_getres - SYSCALL_TABLE_ID0] = PPM_SC_CLOCK_GETRES,
+ 	[__NR_clock_nanosleep - SYSCALL_TABLE_ID0] = PPM_SC_CLOCK_NANOSLEEP,
+ 	[__NR_tgkill - SYSCALL_TABLE_ID0] = PPM_SC_TGKILL,
++#ifdef __NR_utimes
+ 	[__NR_utimes - SYSCALL_TABLE_ID0] = PPM_SC_UTIMES,
++#endif
+ 	[__NR_mq_open - SYSCALL_TABLE_ID0] = PPM_SC_MQ_OPEN,
+ 	[__NR_mq_unlink - SYSCALL_TABLE_ID0] = PPM_SC_MQ_UNLINK,
+ 	[__NR_mq_timedsend - SYSCALL_TABLE_ID0] = PPM_SC_MQ_TIMEDSEND,
+@@ -523,14 +626,18 @@ const enum ppm_syscall_code g_syscall_co
+ 	[__NR_keyctl - SYSCALL_TABLE_ID0] = PPM_SC_KEYCTL,
+ 	[__NR_ioprio_set - SYSCALL_TABLE_ID0] = PPM_SC_IOPRIO_SET,
+ 	[__NR_ioprio_get - SYSCALL_TABLE_ID0] = PPM_SC_IOPRIO_GET,
++#ifdef __NR_inotify_init
+ 	[__NR_inotify_init - SYSCALL_TABLE_ID0] = PPM_SC_INOTIFY_INIT,
++#endif
+ 	[__NR_inotify_add_watch - SYSCALL_TABLE_ID0] = PPM_SC_INOTIFY_ADD_WATCH,
+ 	[__NR_inotify_rm_watch - SYSCALL_TABLE_ID0] = PPM_SC_INOTIFY_RM_WATCH,
+ 	[__NR_openat - SYSCALL_TABLE_ID0] = PPM_SC_OPENAT,
+ 	[__NR_mkdirat - SYSCALL_TABLE_ID0] = PPM_SC_MKDIRAT,
+ 	[__NR_mknodat - SYSCALL_TABLE_ID0] = PPM_SC_MKNODAT,
+ 	[__NR_fchownat - SYSCALL_TABLE_ID0] = PPM_SC_FCHOWNAT,
++#ifdef __NR_futimesat
+ 	[__NR_futimesat - SYSCALL_TABLE_ID0] = PPM_SC_FUTIMESAT,
++#endif
+ 	[__NR_unlinkat - SYSCALL_TABLE_ID0] = PPM_SC_UNLINKAT,
+ 	[__NR_renameat - SYSCALL_TABLE_ID0] = PPM_SC_RENAMEAT,
+ 	[__NR_linkat - SYSCALL_TABLE_ID0] = PPM_SC_LINKAT,
+@@ -551,9 +658,13 @@ const enum ppm_syscall_code g_syscall_co
+ #endif
+ 	[__NR_epoll_pwait - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_PWAIT,
+ 	[__NR_utimensat - SYSCALL_TABLE_ID0] = PPM_SC_UTIMENSAT,
++#ifdef __NR_signalfd
+ 	[__NR_signalfd - SYSCALL_TABLE_ID0] = PPM_SC_SIGNALFD,
++#endif
+ 	[__NR_timerfd_create - SYSCALL_TABLE_ID0] = PPM_SC_TIMERFD_CREATE,
++#ifdef __NR_eventfd
+ 	[__NR_eventfd - SYSCALL_TABLE_ID0] = PPM_SC_EVENTFD,
++#endif
+ 	[__NR_timerfd_settime - SYSCALL_TABLE_ID0] = PPM_SC_TIMERFD_SETTIME,
+ 	[__NR_timerfd_gettime - SYSCALL_TABLE_ID0] = PPM_SC_TIMERFD_GETTIME,
+ 	[__NR_signalfd4 - SYSCALL_TABLE_ID0] = PPM_SC_SIGNALFD4,
diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb
index ce1a4245ba..11eb5db9e4 100644
--- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb
+++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb
@@ -12,7 +12,6 @@ inherit cmake pkgconfig
 JIT ?= "jit"
 JIT_mipsarchn32 = ""
 JIT_mipsarchn64 = ""
-JIT_aarch64 = ""
 
 DEPENDS += "lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native"
 RDEPENDS_${PN} = "bash"
@@ -21,8 +20,8 @@ SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \
            file://0001-fix-build-with-LuaJIT-2.1-betas.patch \
            file://0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch \
            file://fix-uint64-const.patch \
+           file://aarch64.patch \
           "
-# v0.26.4
 SRCREV = "9fa0d129668fdabf256446be4be35838888052d9"
 PV = "0.26.5"
 
-- 
2.25.1


From pjtexier at koncepto.io  Fri Mar 13 18:57:48 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Fri, 13 Mar 2020 19:57:48 +0100
Subject: [oe] [meta-oe][PATCH] python-requests: upgrade 2.22 -> 2.23
Message-ID: <1584125871-11210-1-git-send-email-pjtexier@koncepto.io>

License-Update: copyright years updated

-Copyright 2018 Kenneth Reitz
+Copyright 2019 Kenneth Reitz

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 meta-python/recipes-devtools/python/python-requests.inc             | 6 +++---
 .../{python3-requests_2.22.0.bb => python3-requests_2.23.0.bb}      | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-requests_2.22.0.bb => python3-requests_2.23.0.bb} (100%)

diff --git a/meta-python/recipes-devtools/python/python-requests.inc b/meta-python/recipes-devtools/python/python-requests.inc
index 5fe5dc2..ddca4bc 100644
--- a/meta-python/recipes-devtools/python/python-requests.inc
+++ b/meta-python/recipes-devtools/python/python-requests.inc
@@ -1,12 +1,12 @@
 DESCRIPTION = "Python HTTP for Humans."
 HOMEPAGE = "http://python-requests.org"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a8d5a1d1c2d53025e2282c511033f6f7"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=19b6be66ed463d93fa88c29f7860bcd7"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/python-requests:"
 
-SRC_URI[md5sum] = "ee28bee2de76e9198fc41e48f3a7dd47"
-SRC_URI[sha256sum] = "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4"
+SRC_URI[md5sum] = "abfdc28db1065bbd0bc32592ac9d27a6"
+SRC_URI[sha256sum] = "b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
 
 inherit pypi
 
diff --git a/meta-python/recipes-devtools/python/python3-requests_2.22.0.bb b/meta-python/recipes-devtools/python/python3-requests_2.23.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-requests_2.22.0.bb
rename to meta-python/recipes-devtools/python/python3-requests_2.23.0.bb
-- 
2.7.4


From pjtexier at koncepto.io  Fri Mar 13 18:57:49 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Fri, 13 Mar 2020 19:57:49 +0100
Subject: [oe] [meta-oe][PATCH] python3-kconfiglib: upgrade 13.7.0 -> 14.1.0
In-Reply-To: <1584125871-11210-1-git-send-email-pjtexier@koncepto.io>
References: <1584125871-11210-1-git-send-email-pjtexier@koncepto.io>
Message-ID: <1584125871-11210-2-git-send-email-pjtexier@koncepto.io>

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 meta-python/recipes-devtools/python/python-kconfiglib.inc             | 4 ++--
 .../{python3-kconfiglib_13.7.0.bb => python3-kconfiglib_14.1.0.bb}    | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-kconfiglib_13.7.0.bb => python3-kconfiglib_14.1.0.bb} (100%)

diff --git a/meta-python/recipes-devtools/python/python-kconfiglib.inc b/meta-python/recipes-devtools/python/python-kconfiglib.inc
index c82b26b..3dc4961 100644
--- a/meta-python/recipes-devtools/python/python-kconfiglib.inc
+++ b/meta-python/recipes-devtools/python/python-kconfiglib.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Kconfiglib is a Kconfig implementation in Python"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=712177a72a3937909543eda3ad1bfb7c"
 
-SRC_URI[md5sum] = "7879aa13d306263e95146439d3959f23"
-SRC_URI[sha256sum] = "8dbb946d41a33cec2b63432393a4920479c8c9fa8d5bbca468c4e8a673be6e36"
+SRC_URI[md5sum] = "4ad68618824d4bad1d1de1d7eb838bba"
+SRC_URI[sha256sum] = "bed2cc2216f538eca4255a83a4588d8823563cdd50114f86cf1a2674e602c93c"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-kconfiglib_13.7.0.bb b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-kconfiglib_13.7.0.bb
rename to meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
-- 
2.7.4


From pjtexier at koncepto.io  Fri Mar 13 18:57:50 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Fri, 13 Mar 2020 19:57:50 +0100
Subject: [oe] [meta-oe][PATCH] iwd: upgrade 1.4 -> 1.5
In-Reply-To: <1584125871-11210-1-git-send-email-pjtexier@koncepto.io>
References: <1584125871-11210-1-git-send-email-pjtexier@koncepto.io>
Message-ID: <1584125871-11210-3-git-send-email-pjtexier@koncepto.io>

Remove patch already in version

Fixes:

ver 1.5:
	Fix issue with handling missing NEW_WIPHY events.
	Fix issue with interface creation and NEW_WIPHY events.
	Fix issue with handling LastConnectedTime property change.
	Fix issue with PEAPv0 interoperability with Windows.

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ----------------------
 .../iwd/{iwd_1.4.bb => iwd_1.5.bb}                 | 10 ++--
 2 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch
 rename meta-oe/recipes-connectivity/iwd/{iwd_1.4.bb => iwd_1.5.bb} (85%)

diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch
deleted file mode 100644
index 733f5fe..0000000
--- a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From fcdddf2b726439e049992878f90da607414a1a47 Mon Sep 17 00:00:00 2001
-From: Denis Kenzior <denkenz at gmail.com>
-Date: Mon, 3 Feb 2020 11:54:28 -0600
-Subject: [PATCH] build: Support missing rawmemchr
-
-rawmemchr is a GNU extension in glibc that does not exist in musl.
-
-Upstream-status: Backport of https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=fcdddf2b726439e049992878f90da607414a1a47
-
-Signed-off-by: Robert Joslyn <robert.joslyn at redrectangle.org>
-
----
- configure.ac  |  1 +
- src/missing.h | 10 ++++++++++
- src/wiphy.c   |  1 +
- 3 files changed, 12 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 5ae1401cae17..2d373a47ba68 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -128,6 +128,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}",
- 			[Directory for Ethernet daemon storage files])
- 
- AC_CHECK_FUNCS(explicit_bzero)
-+AC_CHECK_FUNCS(rawmemchr)
- 
- AC_CHECK_HEADERS(linux/types.h linux/if_alg.h)
- 
-diff --git a/src/missing.h b/src/missing.h
-index 2bb210ae3c81..2cc80aee5d38 100644
---- a/src/missing.h
-+++ b/src/missing.h
-@@ -27,3 +27,13 @@ static inline void explicit_bzero(void *s, size_t n)
-         __asm__ __volatile__ ("" : : "r"(s) : "memory");
- }
- #endif
-+
-+#ifndef HAVE_RAWMEMCHR
-+static inline void *rawmemchr(const void *s, int c)
-+{
-+_Pragma("GCC diagnostic push")
-+_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"")
-+	return memchr(s, c, (size_t) -1);
-+_Pragma("GCC diagnostic pop")
-+}
-+#endif
-diff --git a/src/wiphy.c b/src/wiphy.c
-index 1da479db2dab..511bb27f52b8 100644
---- a/src/wiphy.c
-+++ b/src/wiphy.c
-@@ -37,6 +37,7 @@
- 
- #include "linux/nl80211.h"
- 
-+#include "src/missing.h"
- #include "src/iwd.h"
- #include "src/module.h"
- #include "src/ie.h"
--- 
-2.21.0
-
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb
similarity index 85%
rename from meta-oe/recipes-connectivity/iwd/iwd_1.4.bb
rename to meta-oe/recipes-connectivity/iwd/iwd_1.5.bb
index f758781..4d4c699 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
 
 DEPENDS = "ell"
 
-SRC_URI = " \
-    git://git.kernel.org/pub/scm/network/wireless/iwd.git \
-    file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \
-    file://0001-build-Support-missing-rawmemchr.patch \
-"
-SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261"
+SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
+           file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \
+           "
+SRCREV = "1ee7b985aaa294447d073bfe1242744784278a8e"
 S = "${WORKDIR}/git"
 
 inherit autotools manpages pkgconfig python3native systemd
-- 
2.7.4


From pjtexier at koncepto.io  Fri Mar 13 18:57:51 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Fri, 13 Mar 2020 19:57:51 +0100
Subject: [oe] [meta-oe][PATCH] libqmi: upgrade 1.24.4 -> 1.24.6
In-Reply-To: <1584125871-11210-1-git-send-email-pjtexier@koncepto.io>
References: <1584125871-11210-1-git-send-email-pjtexier@koncepto.io>
Message-ID: <1584125871-11210-4-git-send-email-pjtexier@koncepto.io>

Overview of changes in libqmi 1.24.6
----------------------------------------

 * libqmi-glib:
   ** Fixed the close operation logic to make sure that a reopen done right
      away doesn't close the wrong endpoint.
   ** Updated string reading logic to make sure that all strings are valid
      UTF-8.
   ** Updated string reading logic to attempt parsing as GSM7 or UCS2 if the
      initial UTF-8 validation fails.
   *+ Renamed TLV 0x15 in the "WDA Get Data Format" message, and added new
      compat methods for the old name.
   ** Fixed the format of the NITZ information TLV, and added new compat
      methods for the old name.
   ** Fixed the format of the Home Network 3GPP2 TLV, and added new compat
      methods for the old name.

 * Several other minor improvements and fixes.

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 .../libqmi/{libqmi_1.24.4.bb => libqmi_1.24.6.bb}                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.4.bb => libqmi_1.24.6.bb} (85%)

diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb
similarity index 85%
rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb
rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb
index 5512828..a86215a 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb
@@ -14,8 +14,8 @@ inherit autotools pkgconfig bash-completion
 SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
            "
 
-SRC_URI[md5sum] = "be6539fde54fec1fc9d852db201c8560"
-SRC_URI[sha256sum] = "0316badec92ff32f51fe6278e6046968d2272a26608995deedd8e4afb563918a"
+SRC_URI[md5sum] = "5d50233394a33e43dee3e70e197323e5"
+SRC_URI[sha256sum] = "1325257bc16de7b2b443fa689826c993474bdbd6e78c7a1e60e527269b44d8c9"
 
 PACKAGECONFIG ??= "udev mbim"
 PACKAGECONFIG[udev] = ",--without-udev,libgudev"
-- 
2.7.4


From mhalstead at linuxfoundation.org  Fri Mar 13 23:58:30 2020
From: mhalstead at linuxfoundation.org (Michael Halstead)
Date: Fri, 13 Mar 2020 16:58:30 -0700
Subject: [oe] Mailing list platform change March 20th
Message-ID: <CADfgfobNNXr9HSOiwyamzbZ4q1uc8wgD5PzobDF56cDyYui-HQ@mail.gmail.com>

We are moving our lists from Mailman to Groups.io. E-mail to lists will be
delayed during the move window. We are aiming to complete the migration
during business hours in the Pacific time zone.

A new account will be created for you on the Groups.io platform if you
don't already have one.

You can read more about the change on the wiki:
https://www.openembedded.org/wiki/GroupsMigration

If there are serious issues we will rollback the changes. We will e-mail
all lists when work is complete.

--
Michael Halstead
Linux Foundation / Yocto Project
Systems Operations Engineer

From Haiqing.Bai at windriver.com  Sat Mar 14 03:21:23 2020
From: Haiqing.Bai at windriver.com (Bai, Haiqing)
Date: Sat, 14 Mar 2020 03:21:23 +0000
Subject: [oe] [meta-python][zeus][PATCH] python-urllib3/python3-urllib3:
 fix CVE-2020-7212
In-Reply-To: <652c9f72-5751-7494-c6e8-245e8e6af43e@gmail.com>
References: <1584094764-17831-1-git-send-email-Haiqing.Bai@windriver.com>
	<652c9f72-5751-7494-c6e8-245e8e6af43e@gmail.com>
Message-ID: <C2A454FDE6C23F41BD5011E2458C46C9FA265549@ALA-MBD.corp.ad.wrs.com>

 Hello,  this rr is only for zeus branch.  Thank you so much. 

-----Original Message-----
From: akuster808 <akuster808 at gmail.com> 
Sent: Friday, March 13, 2020 11:36 PM
To: Bai, Haiqing <Haiqing.Bai at windriver.com>; openembedded-devel at lists.openembedded.org
Subject: Re: [oe] [meta-python][zeus][PATCH] python-urllib3/python3-urllib3: fix CVE-2020-7212



On 3/13/20 3:19 AM, Haiqing Bai wrote:
> Optimize _encode_invalid_chars for a denial of service (CPU 
> consumption)

is this fix in master?


>
> Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> ---
>  .../python/python-urllib3/CVE-2020-7212.patch      | 54 ++++++++++++++++++++++
>  .../python/python-urllib3_1.25.6.bb                |  2 +
>  .../python/python3-urllib3/CVE-2020-7212.patch     | 54 ++++++++++++++++++++++
>  .../python/python3-urllib3_1.25.6.bb               |  2 +
>  4 files changed, 112 insertions(+)
>  create mode 100644 
> meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.patch
>  create mode 100644 
> meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.patc
> h
>
> diff --git 
> a/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.pat
> ch 
> b/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212.pat
> ch
> new file mode 100644
> index 0000000..a2bb0fb
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python-urllib3/CVE-2020-7212
> +++ .patch
> @@ -0,0 +1,54 @@
> +From aff951b7a41eb5b958b32c49eaa00da02adc9c2d Mon Sep 17 00:00:00 
> +2001
> +From: Quentin Pradet <quentin.pradet at gmail.com>
> +Date: Tue, 21 Jan 2020 22:32:56 +0400
> +Subject: [PATCH] Optimize _encode_invalid_chars (#1787)
> +
> +Co-authored-by: Seth Michael Larson <sethmichaellarson at gmail.com>
> +
> +Upstream-Status: Backport
> +[from git://github.com/urllib3/urllib3.git commit:a2697e7c6b]
> +Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> +---
> + src/urllib3/util/url.py | 15 ++++++---------
> + 1 file changed, 6 insertions(+), 9 deletions(-)
> +
> +diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py index 
> +9675f74..e353937 100644
> +--- a/src/urllib3/util/url.py
> ++++ b/src/urllib3/util/url.py
> +@@ -216,18 +216,15 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> + 
> +     component = six.ensure_text(component)
> + 
> ++    # Normalize existing percent-encoded bytes.
> +     # Try to see if the component we're encoding is already percent-encoded
> +     # so we can skip all '%' characters but still encode all others.
> +-    percent_encodings = PERCENT_RE.findall(component)
> +-
> +-    # Normalize existing percent-encoded bytes.
> +-    for enc in percent_encodings:
> +-        if not enc.isupper():
> +-            component = component.replace(enc, enc.upper())
> ++    component, percent_encodings = PERCENT_RE.subn(
> ++        lambda match: match.group(0).upper(), component
> ++    )
> + 
> +     uri_bytes = component.encode("utf-8", "surrogatepass")
> +-    is_percent_encoded = len(percent_encodings) == uri_bytes.count(b"%")
> +-
> ++    is_percent_encoded = percent_encodings == uri_bytes.count(b"%")
> +     encoded_component = bytearray()
> + 
> +     for i in range(0, len(uri_bytes)):
> +@@ -237,7 +234,7 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> +         if (is_percent_encoded and byte == b"%") or (
> +             byte_ord < 128 and byte.decode() in allowed_chars
> +         ):
> +-            encoded_component.extend(byte)
> ++            encoded_component += byte
> +             continue
> +         encoded_component.extend(b"%" + 
> + (hex(byte_ord)[2:].encode().zfill(2).upper()))
> + 
> +--
> +2.23.0
> +
> diff --git 
> a/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb 
> b/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
> index 6c81f1d..9f2d2c8 100644
> --- a/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
> +++ b/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb
> @@ -1,2 +1,4 @@
>  inherit pypi setuptools
>  require python-urllib3.inc
> +
> +SRC_URI += "file://CVE-2020-7212.patch"
> diff --git 
> a/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.pa
> tch 
> b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-7212.pa
> tch
> new file mode 100644
> index 0000000..a2bb0fb
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-721
> +++ 2.patch
> @@ -0,0 +1,54 @@
> +From aff951b7a41eb5b958b32c49eaa00da02adc9c2d Mon Sep 17 00:00:00 
> +2001
> +From: Quentin Pradet <quentin.pradet at gmail.com>
> +Date: Tue, 21 Jan 2020 22:32:56 +0400
> +Subject: [PATCH] Optimize _encode_invalid_chars (#1787)
> +
> +Co-authored-by: Seth Michael Larson <sethmichaellarson at gmail.com>
> +
> +Upstream-Status: Backport
> +[from git://github.com/urllib3/urllib3.git commit:a2697e7c6b]
> +Signed-off-by: Haiqing Bai <Haiqing.Bai at windriver.com>
> +---
> + src/urllib3/util/url.py | 15 ++++++---------
> + 1 file changed, 6 insertions(+), 9 deletions(-)
> +
> +diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py index 
> +9675f74..e353937 100644
> +--- a/src/urllib3/util/url.py
> ++++ b/src/urllib3/util/url.py
> +@@ -216,18 +216,15 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> + 
> +     component = six.ensure_text(component)
> + 
> ++    # Normalize existing percent-encoded bytes.
> +     # Try to see if the component we're encoding is already percent-encoded
> +     # so we can skip all '%' characters but still encode all others.
> +-    percent_encodings = PERCENT_RE.findall(component)
> +-
> +-    # Normalize existing percent-encoded bytes.
> +-    for enc in percent_encodings:
> +-        if not enc.isupper():
> +-            component = component.replace(enc, enc.upper())
> ++    component, percent_encodings = PERCENT_RE.subn(
> ++        lambda match: match.group(0).upper(), component
> ++    )
> + 
> +     uri_bytes = component.encode("utf-8", "surrogatepass")
> +-    is_percent_encoded = len(percent_encodings) == uri_bytes.count(b"%")
> +-
> ++    is_percent_encoded = percent_encodings == uri_bytes.count(b"%")
> +     encoded_component = bytearray()
> + 
> +     for i in range(0, len(uri_bytes)):
> +@@ -237,7 +234,7 @@ def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
> +         if (is_percent_encoded and byte == b"%") or (
> +             byte_ord < 128 and byte.decode() in allowed_chars
> +         ):
> +-            encoded_component.extend(byte)
> ++            encoded_component += byte
> +             continue
> +         encoded_component.extend(b"%" + 
> + (hex(byte_ord)[2:].encode().zfill(2).upper()))
> + 
> +--
> +2.23.0
> +
> diff --git 
> a/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb 
> b/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
> index 19eb702..e3583a0 100644
> --- a/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
> +++ b/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb
> @@ -1,2 +1,4 @@
>  inherit pypi setuptools3
>  require python-urllib3.inc
> +
> +SRC_URI += "file://CVE-2020-7212.patch"


From wangmy at cn.fujitsu.com  Sat Mar 14 09:15:18 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Sat, 14 Mar 2020 02:15:18 -0700
Subject: [oe]  [meta-oe][PATCH] postgresql: 12.1 -> 12.2
Message-ID: <1584177319-73191-1-git-send-email-wangmy@cn.fujitsu.com>

-License-Update: Copyright year updated to 2020.

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb | 12 ------------
 meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb
 create mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb

diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb b/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb
deleted file mode 100644
index 486851941..000000000
--- a/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require postgresql.inc
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78"
-
-SRC_URI += "\
-   file://not-check-libperl.patch \
-   file://0001-Add-support-for-RISC-V.patch \
-   file://0001-Improve-reproducibility.patch \
-"
-
-SRC_URI[md5sum] = "2ee1bd4ec5f49363a3f456f07e599b41"
-SRC_URI[sha256sum] = "a09bf3abbaf6763980d0f8acbb943b7629a8b20073de18d867aecdb7988483ed"
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb
new file mode 100644
index 000000000..0613e50c7
--- /dev/null
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb
@@ -0,0 +1,12 @@
+require postgresql.inc
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc4ce21960f0c561460d750bc270d11f"
+
+SRC_URI += "\
+   file://not-check-libperl.patch \
+   file://0001-Add-support-for-RISC-V.patch \
+   file://0001-Improve-reproducibility.patch \
+"
+
+SRC_URI[md5sum] = "a88ceea8ecf2741307f663e4539b58b7"
+SRC_URI[sha256sum] = "ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de"
-- 
2.17.1




From wangmy at cn.fujitsu.com  Sat Mar 14 09:15:19 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Sat, 14 Mar 2020 02:15:19 -0700
Subject: [oe]  [meta-oe][PATCH] sg3-utils: upgrade 1.44 -> 1.45
In-Reply-To: <1584177319-73191-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584177319-73191-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584177319-73191-2-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../sg3-utils/{sg3-utils_1.44.bb => sg3-utils_1.45.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/sg3-utils/{sg3-utils_1.44.bb => sg3-utils_1.45.bb} (81%)

diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb
similarity index 81%
rename from meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb
rename to meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb
index 4909035b3..22995b773 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb
@@ -14,8 +14,8 @@ MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc"
 
 UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz"
 
-SRC_URI[md5sum] = "c11d2b3ca4cc2fd01796473e5330afed"
-SRC_URI[sha256sum] = "8dae684d22e71b11353a48b16c95597af90f0cbe9bbd57f98d7f5544da5cae7b"
+SRC_URI[md5sum] = "2e71d7cd925dcc48acb24afaaaac7990"
+SRC_URI[sha256sum] = "0b87c971af52af7cebebcce343eac6bd3d73febb3c72af9ce41a4552f1605a61"
 
 inherit autotools-brokensep
 
-- 
2.17.1




From git at andred.net  Sat Mar 14 19:50:35 2020
From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=)
Date: Sat, 14 Mar 2020 19:50:35 +0000
Subject: [oe] [meta-oe][PATCH] smem: remove numpy dependency on armv4 and
	armv5
Message-ID: <20200314195035.28224-1-git@andred.net>

numpy doesn't build on those.

Signed-off-by: Andr? Draszik <git at andred.net>
---
 meta-oe/recipes-support/smem/smem_1.5.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/recipes-support/smem/smem_1.5.bb
index 90db9c3f3..77179906e 100644
--- a/meta-oe/recipes-support/smem/smem_1.5.bb
+++ b/meta-oe/recipes-support/smem/smem_1.5.bb
@@ -35,6 +35,9 @@ do_install() {
 
 RDEPENDS_${PN} = "python3-core python3-compression"
 RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
+# numpy doesn't work on those.
+RRECOMMENDS_${PN}_remove_armv4 = "python3-matplotlib python3-numpy"
+RRECOMMENDS_${PN}_remove_armv5 = "python3-matplotlib python3-numpy"
 
 PACKAGE_BEFORE_PN = "smemcap"
 
-- 
2.23.0.rc1


From schnitzeltony at gmail.com  Sat Mar 14 22:04:39 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Sat, 14 Mar 2020 23:04:39 +0100
Subject: [oe] [PATCH 1/2] pipewire: upgrade 0.2.7 -> 0.3.1
Message-ID: <20200314220440.5983-1-schnitzeltony@gmail.com>

* as long as we have not upgradeed mutter to 3.36 we have to keep pipewire
  0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
* license was changed to MIT
* additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES
  or if not available by pipewire's defaults
* vulkan was disabled for now

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../pipewire/pipewire-0.2_git.bb              | 65 +++++++++++++++++++
 .../pipewire/pipewire_git.bb                  | 32 +++++----
 2 files changed, 86 insertions(+), 11 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb

diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
new file mode 100644
index 000000000..bcb3015f8
--- /dev/null
+++ b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
@@ -0,0 +1,65 @@
+SUMMARY = "Multimedia processing server for Linux"
+AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
+HOMEPAGE = "https://pipewire.org"
+SECTION = "multimedia"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
+    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+DEPENDS = "alsa-lib dbus udev"
+SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
+PV = "0.2.7"
+
+SRC_URI = "git://github.com/PipeWire/pipewire"
+
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig systemd manpages
+
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+    gstreamer \
+"
+
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
+PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
+
+PACKAGES =+ "\
+    ${PN}-spa-plugins \
+    ${PN}-alsa \
+    ${PN}-config \
+    gstreamer1.0-${PN} \
+    lib${PN} \
+    lib${PN}-modules \
+"
+
+RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
+
+FILES_${PN} = "\
+    ${sysconfdir}/pipewire/pipewire.conf \
+    ${bindir}/pipewire* \
+    ${systemd_user_unitdir}/* \
+"
+FILES_lib${PN} = "\
+    ${libdir}/libpipewire-*.so.* \
+"
+FILES_lib${PN}-modules = "\
+    ${libdir}/pipewire-*/* \
+"
+FILES_${PN}-spa-plugins = "\
+    ${bindir}/spa-* \
+    ${libdir}/spa/* \
+"
+FILES_${PN}-alsa = "\
+    ${libdir}/alsa-lib/* \
+    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
+"
+FILES_gstreamer1.0-${PN} = "\
+    ${libdir}/gstreamer-1.0/* \
+"
+
+CONFFILES_${PN} = "\
+    ${sysconfdir}/pipewire/pipewire.conf \
+"
diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
index bcb3015f8..95da2df09 100644
--- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
+++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
@@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux"
 AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
 HOMEPAGE = "https://pipewire.org"
 SECTION = "multimedia"
-LICENSE = "LGPL-2.1"
+LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
-    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \
+    file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \
 "
 DEPENDS = "alsa-lib dbus udev"
-SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
-PV = "0.2.7"
+SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac"
+PV = "0.3.1"
 
 SRC_URI = "git://github.com/PipeWire/pipewire"
 
@@ -18,13 +18,20 @@ S = "${WORKDIR}/git"
 inherit meson pkgconfig systemd manpages
 
 PACKAGECONFIG ??= "\
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
-    gstreamer \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \
+    jack gstreamer \
 "
 
-PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
-PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
+# disable vulkan fo now
+EXTRA_OEMESON = "-Dvulkan=false"
+
+PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc"
+PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack"
+PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
+PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio"
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
 
 PACKAGES =+ "\
     ${PN}-spa-plugins \
@@ -33,28 +40,31 @@ PACKAGES =+ "\
     gstreamer1.0-${PN} \
     lib${PN} \
     lib${PN}-modules \
+    lib${PN}-jack \
 "
 
 RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
 
 FILES_${PN} = "\
     ${sysconfdir}/pipewire/pipewire.conf \
+    ${bindir}/pw-* \
     ${bindir}/pipewire* \
     ${systemd_user_unitdir}/* \
 "
 FILES_lib${PN} = "\
     ${libdir}/libpipewire-*.so.* \
+    ${libdir}/libjack-*.so.* \
+    ${libdir}/libpulse-*.so.* \
 "
 FILES_lib${PN}-modules = "\
     ${libdir}/pipewire-*/* \
 "
 FILES_${PN}-spa-plugins = "\
     ${bindir}/spa-* \
-    ${libdir}/spa/* \
+    ${libdir}/spa-*/* \
 "
 FILES_${PN}-alsa = "\
     ${libdir}/alsa-lib/* \
-    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
 "
 FILES_gstreamer1.0-${PN} = "\
     ${libdir}/gstreamer-1.0/* \
-- 
2.21.1


From schnitzeltony at gmail.com  Sat Mar 14 22:04:40 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Sat, 14 Mar 2020 23:04:40 +0100
Subject: [oe] [PATCH 2/2] mutter: depend on pipewire-0.2 in
	PACKAGECONFIG[remote-desktop]
In-Reply-To: <20200314220440.5983-1-schnitzeltony@gmail.com>
References: <20200314220440.5983-1-schnitzeltony@gmail.com>
Message-ID: <20200314220440.5983-2-schnitzeltony@gmail.com>

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
index 7979802d2..c90559cae 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
@@ -52,7 +52,7 @@ PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_bac
 PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl"
 PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false"
 PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom"
-PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire"
+PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire-0.2"
 PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm"
 PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
 PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
-- 
2.21.1


From git at andred.net  Sun Mar 15 09:44:45 2020
From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik)
Date: Sun, 15 Mar 2020 09:44:45 +0000
Subject: [oe] [meta-oe][PATCH] smem: remove numpy dependency on armv4
 and armv5
In-Reply-To: <20200314195035.28224-1-git@andred.net>
References: <20200314195035.28224-1-git@andred.net>
Message-ID: <d73a82b324129a2fd34caf64708d77199933dcde.camel@andred.net>

Please ignore this patch, it's not that simple...

On Sat, 2020-03-14 at 19:50 +0000, Andr? Draszik wrote:
> numpy doesn't build on those.
> 
> Signed-off-by: Andr? Draszik <git at andred.net>
> ---
>  meta-oe/recipes-support/smem/smem_1.5.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/recipes-support/smem/smem_1.5.bb
> index 90db9c3f3..77179906e 100644
> --- a/meta-oe/recipes-support/smem/smem_1.5.bb
> +++ b/meta-oe/recipes-support/smem/smem_1.5.bb
> @@ -35,6 +35,9 @@ do_install() {
>  
>  RDEPENDS_${PN} = "python3-core python3-compression"
>  RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
> +# numpy doesn't work on those.
> +RRECOMMENDS_${PN}_remove_armv4 = "python3-matplotlib python3-numpy"
> +RRECOMMENDS_${PN}_remove_armv5 = "python3-matplotlib python3-numpy"
>  
>  PACKAGE_BEFORE_PN = "smemcap"
>  


From pjtexier at koncepto.io  Sun Mar 15 13:11:24 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Sun, 15 Mar 2020 14:11:24 +0100
Subject: [oe] [meta-oe][PATCH] xxhash: upgrade 0.7.2 -> 0.7.3
Message-ID: <1584277886-652-1-git-send-email-pjtexier@koncepto.io>

License-Update: change link to https

-BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)

See full changelog https://github.com/Cyan4973/xxHash/releases/tag/v0.7.3

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 meta-oe/recipes-support/xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} (78%)

diff --git a/meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb b/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb
similarity index 78%
rename from meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb
rename to meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb
index df106e4..865adc5 100644
--- a/meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb
+++ b/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb
@@ -3,12 +3,12 @@ DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \
 working at speeds close to RAM limits."
 HOMEPAGE = "http://www.xxhash.com/"
 LICENSE = "BSD-2-Clause & GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3511a67991a5923907dff2ed268026"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=01a7eba4212ef1e882777a38585e7a9b"
 
 SRC_URI = "git://github.com/Cyan4973/xxHash.git"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-SRCREV = "e2f4695899e831171ecd2e780078474712ea61d3"
+SRCREV = "d408e9b0606d07b1ddc5452ffc0ec8512211b174"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4


From pjtexier at koncepto.io  Sun Mar 15 13:11:25 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Sun, 15 Mar 2020 14:11:25 +0100
Subject: [oe] [meta-oe][PATCH] ddrescue: upgrade 1.24 -> 1.25
In-Reply-To: <1584277886-652-1-git-send-email-pjtexier@koncepto.io>
References: <1584277886-652-1-git-send-email-pjtexier@koncepto.io>
Message-ID: <1584277886-652-2-git-send-email-pjtexier@koncepto.io>

See changelog https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 .../recipes-extended/ddrescue/{ddrescue_1.24.bb => ddrescue_1.25.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.24.bb => ddrescue_1.25.bb} (90%)

diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb
similarity index 90%
rename from meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb
rename to meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb
index 52bd11b..cf24354 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
                     file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
-SRC_URI[md5sum] = "8ac89f833c0df221723e33b447e230fe"
-SRC_URI[sha256sum] = "4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087"
+SRC_URI[md5sum] = "99fd7a28bf9953d88534c7ee9ab5bd2a"
+SRC_URI[sha256sum] = "ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063"
 
 # This isn't already added by base.bbclass
 do_unpack[depends] += "lzip-native:do_populate_sysroot"
-- 
2.7.4


From pjtexier at koncepto.io  Sun Mar 15 13:11:26 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Sun, 15 Mar 2020 14:11:26 +0100
Subject: [oe] [meta-oe][PATCH] flashrom: upgrade 1.1 -> 1.2
In-Reply-To: <1584277886-652-1-git-send-email-pjtexier@koncepto.io>
References: <1584277886-652-1-git-send-email-pjtexier@koncepto.io>
Message-ID: <1584277886-652-3-git-send-email-pjtexier@koncepto.io>

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 meta-oe/recipes-bsp/flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-bsp/flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} (77%)

diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb
similarity index 77%
rename from meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb
rename to meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb
index 074a1a5..17445ac 100644
--- a/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb
+++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb
@@ -7,8 +7,8 @@ DEPENDS = "pciutils libusb libusb-compat"
 
 SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \
            "
-SRC_URI[md5sum] = "91bab6c072e38a493bb4eb673e4fe0d6"
-SRC_URI[sha256sum] = "aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19"
+SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956"
+SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b"
 
 S = "${WORKDIR}/flashrom-v${PV}"
 
-- 
2.7.4


From alex.kiernan at gmail.com  Sun Mar 15 16:47:06 2020
From: alex.kiernan at gmail.com (Alex Kiernan)
Date: Sun, 15 Mar 2020 16:47:06 +0000
Subject: [oe] [meta-oe][PATCH] ostree: upgrade 2020.2 -> 2020.3
Message-ID: <20200315164706.7672-1-alex.kiernan@gmail.com>

Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
---

 .../ostree/{ostree_2020.2.bb => ostree_2020.3.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/ostree/{ostree_2020.2.bb => ostree_2020.3.bb} (99%)

diff --git a/meta-oe/recipes-extended/ostree/ostree_2020.2.bb b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb
similarity index 99%
rename from meta-oe/recipes-extended/ostree/ostree_2020.2.bb
rename to meta-oe/recipes-extended/ostree/ostree_2020.3.bb
index 78f4cf588c64..43021c534249 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2020.2.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb
@@ -25,7 +25,7 @@ SRC_URI = " \
     gitsm://github.com/ostreedev/ostree \
     file://run-ptest \
 "
-SRCREV = "c6085ebd5e27da35f43165eb614190665468f13a"
+SRCREV = "6ed48234ba579ff73eb128af237212b0a00f2057"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)"
 
-- 
2.17.1


From raj.khem at gmail.com  Sun Mar 15 23:26:50 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun, 15 Mar 2020 16:26:50 -0700
Subject: [oe] [PATCH 1/2] pipewire: upgrade 0.2.7 -> 0.3.1
In-Reply-To: <20200314220440.5983-1-schnitzeltony@gmail.com>
References: <20200314220440.5983-1-schnitzeltony@gmail.com>
Message-ID: <CAMKF1sqsq6xMRCRAbNibJP1YeJ-aYyYNyQM_3Ef6KcvSwWLo5A@mail.gmail.com>

We need something like below patch to get it going on mips/x86

https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=0ea5b0d3721d04111310ef6c331cbb3c2d68bd5c

On Sat, Mar 14, 2020 at 3:05 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
>
> * as long as we have not upgradeed mutter to 3.36 we have to keep pipewire
>   0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
> * license was changed to MIT
> * additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES
>   or if not available by pipewire's defaults
> * vulkan was disabled for now
>
> Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> ---
>  .../pipewire/pipewire-0.2_git.bb              | 65 +++++++++++++++++++
>  .../pipewire/pipewire_git.bb                  | 32 +++++----
>  2 files changed, 86 insertions(+), 11 deletions(-)
>  create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
>
> diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> new file mode 100644
> index 000000000..bcb3015f8
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> @@ -0,0 +1,65 @@
> +SUMMARY = "Multimedia processing server for Linux"
> +AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
> +HOMEPAGE = "https://pipewire.org"
> +SECTION = "multimedia"
> +LICENSE = "LGPL-2.1"
> +LIC_FILES_CHKSUM = " \
> +    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> +    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> +"
> +DEPENDS = "alsa-lib dbus udev"
> +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> +PV = "0.2.7"
> +
> +SRC_URI = "git://github.com/PipeWire/pipewire"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit meson pkgconfig systemd manpages
> +
> +PACKAGECONFIG ??= "\
> +    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> +    gstreamer \
> +"
> +
> +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
> +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
> +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
> +
> +PACKAGES =+ "\
> +    ${PN}-spa-plugins \
> +    ${PN}-alsa \
> +    ${PN}-config \
> +    gstreamer1.0-${PN} \
> +    lib${PN} \
> +    lib${PN}-modules \
> +"
> +
> +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
> +
> +FILES_${PN} = "\
> +    ${sysconfdir}/pipewire/pipewire.conf \
> +    ${bindir}/pipewire* \
> +    ${systemd_user_unitdir}/* \
> +"
> +FILES_lib${PN} = "\
> +    ${libdir}/libpipewire-*.so.* \
> +"
> +FILES_lib${PN}-modules = "\
> +    ${libdir}/pipewire-*/* \
> +"
> +FILES_${PN}-spa-plugins = "\
> +    ${bindir}/spa-* \
> +    ${libdir}/spa/* \
> +"
> +FILES_${PN}-alsa = "\
> +    ${libdir}/alsa-lib/* \
> +    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
> +"
> +FILES_gstreamer1.0-${PN} = "\
> +    ${libdir}/gstreamer-1.0/* \
> +"
> +
> +CONFFILES_${PN} = "\
> +    ${sysconfdir}/pipewire/pipewire.conf \
> +"
> diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> index bcb3015f8..95da2df09 100644
> --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> @@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux"
>  AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
>  HOMEPAGE = "https://pipewire.org"
>  SECTION = "multimedia"
> -LICENSE = "LGPL-2.1"
> +LICENSE = "MIT"
>  LIC_FILES_CHKSUM = " \
> -    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> -    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> +    file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \
> +    file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \
>  "
>  DEPENDS = "alsa-lib dbus udev"
> -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> -PV = "0.2.7"
> +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac"
> +PV = "0.3.1"
>
>  SRC_URI = "git://github.com/PipeWire/pipewire"
>
> @@ -18,13 +18,20 @@ S = "${WORKDIR}/git"
>  inherit meson pkgconfig systemd manpages
>
>  PACKAGECONFIG ??= "\
> -    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> -    gstreamer \
> +    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
> +    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \
> +    jack gstreamer \
>  "
>
> -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
> -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
> +# disable vulkan fo now
> +EXTRA_OEMESON = "-Dvulkan=false"
> +
> +PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc"
> +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack"
> +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
>  PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
> +PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio"
> +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
>
>  PACKAGES =+ "\
>      ${PN}-spa-plugins \
> @@ -33,28 +40,31 @@ PACKAGES =+ "\
>      gstreamer1.0-${PN} \
>      lib${PN} \
>      lib${PN}-modules \
> +    lib${PN}-jack \
>  "
>
>  RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
>
>  FILES_${PN} = "\
>      ${sysconfdir}/pipewire/pipewire.conf \
> +    ${bindir}/pw-* \
>      ${bindir}/pipewire* \
>      ${systemd_user_unitdir}/* \
>  "
>  FILES_lib${PN} = "\
>      ${libdir}/libpipewire-*.so.* \
> +    ${libdir}/libjack-*.so.* \
> +    ${libdir}/libpulse-*.so.* \
>  "
>  FILES_lib${PN}-modules = "\
>      ${libdir}/pipewire-*/* \
>  "
>  FILES_${PN}-spa-plugins = "\
>      ${bindir}/spa-* \
> -    ${libdir}/spa/* \
> +    ${libdir}/spa-*/* \
>  "
>  FILES_${PN}-alsa = "\
>      ${libdir}/alsa-lib/* \
> -    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
>  "
>  FILES_gstreamer1.0-${PN} = "\
>      ${libdir}/gstreamer-1.0/* \
> --
> 2.21.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From raj.khem at gmail.com  Sun Mar 15 23:35:30 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun, 15 Mar 2020 16:35:30 -0700
Subject: [oe] [PATCH 1/2] pipewire: upgrade 0.2.7 -> 0.3.1
In-Reply-To: <20200314220440.5983-1-schnitzeltony@gmail.com>
References: <20200314220440.5983-1-schnitzeltony@gmail.com>
Message-ID: <CAMKF1sotjDeZvidnX=FDL8u1f2KJ_Y5X-FLM++07jfqV887wxg@mail.gmail.com>

On Sat, Mar 14, 2020 at 3:05 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
>
> * as long as we have not upgradeed mutter to 3.36 we have to keep pipewire
>   0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
> * license was changed to MIT
> * additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES
>   or if not available by pipewire's defaults
> * vulkan was disabled for now
>
> Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> ---
>  .../pipewire/pipewire-0.2_git.bb              | 65 +++++++++++++++++++
>  .../pipewire/pipewire_git.bb                  | 32 +++++----
>  2 files changed, 86 insertions(+), 11 deletions(-)
>  create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
>
> diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> new file mode 100644
> index 000000000..bcb3015f8
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> @@ -0,0 +1,65 @@
> +SUMMARY = "Multimedia processing server for Linux"
> +AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
> +HOMEPAGE = "https://pipewire.org"
> +SECTION = "multimedia"
> +LICENSE = "LGPL-2.1"
> +LIC_FILES_CHKSUM = " \
> +    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> +    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> +"
> +DEPENDS = "alsa-lib dbus udev"
> +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> +PV = "0.2.7"
> +
> +SRC_URI = "git://github.com/PipeWire/pipewire"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit meson pkgconfig systemd manpages
> +
> +PACKAGECONFIG ??= "\
> +    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> +    gstreamer \
> +"
> +
> +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
> +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
> +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
> +
> +PACKAGES =+ "\
> +    ${PN}-spa-plugins \
> +    ${PN}-alsa \
> +    ${PN}-config \
> +    gstreamer1.0-${PN} \
> +    lib${PN} \
> +    lib${PN}-modules \
> +"
> +
> +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
> +
> +FILES_${PN} = "\
> +    ${sysconfdir}/pipewire/pipewire.conf \
> +    ${bindir}/pipewire* \
> +    ${systemd_user_unitdir}/* \
> +"
> +FILES_lib${PN} = "\
> +    ${libdir}/libpipewire-*.so.* \
> +"
> +FILES_lib${PN}-modules = "\
> +    ${libdir}/pipewire-*/* \
> +"
> +FILES_${PN}-spa-plugins = "\
> +    ${bindir}/spa-* \
> +    ${libdir}/spa/* \
> +"
> +FILES_${PN}-alsa = "\
> +    ${libdir}/alsa-lib/* \
> +    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
> +"
> +FILES_gstreamer1.0-${PN} = "\
> +    ${libdir}/gstreamer-1.0/* \
> +"
> +
> +CONFFILES_${PN} = "\
> +    ${sysconfdir}/pipewire/pipewire.conf \
> +"
> diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> index bcb3015f8..95da2df09 100644
> --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> @@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux"
>  AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
>  HOMEPAGE = "https://pipewire.org"
>  SECTION = "multimedia"
> -LICENSE = "LGPL-2.1"
> +LICENSE = "MIT"
>  LIC_FILES_CHKSUM = " \
> -    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> -    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> +    file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \
> +    file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \
>  "
>  DEPENDS = "alsa-lib dbus udev"
> -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> -PV = "0.2.7"
> +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac"
> +PV = "0.3.1"
>
>  SRC_URI = "git://github.com/PipeWire/pipewire"
>
> @@ -18,13 +18,20 @@ S = "${WORKDIR}/git"
>  inherit meson pkgconfig systemd manpages
>
>  PACKAGECONFIG ??= "\
> -    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> -    gstreamer \
> +    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
> +    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \

Perhaps add vulkan as packageconfig too here. I am seeing

WARNING: pipewire-0.3.1-r0 do_configure: QA Issue: pipewire: invalid
PACKAGECONFIG: vulkan [invalid-packageconfig]


> +    jack gstreamer \
>  "
>
> -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
> -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
> +# disable vulkan fo now
> +EXTRA_OEMESON = "-Dvulkan=false"
> +

This should be turned into PACKAGECONFIG

> +PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc"
> +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack"
> +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
>  PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
> +PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio"
> +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
>
>  PACKAGES =+ "\
>      ${PN}-spa-plugins \
> @@ -33,28 +40,31 @@ PACKAGES =+ "\
>      gstreamer1.0-${PN} \
>      lib${PN} \
>      lib${PN}-modules \
> +    lib${PN}-jack \
>  "
>
>  RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
>
>  FILES_${PN} = "\
>      ${sysconfdir}/pipewire/pipewire.conf \
> +    ${bindir}/pw-* \
>      ${bindir}/pipewire* \
>      ${systemd_user_unitdir}/* \
>  "
>  FILES_lib${PN} = "\
>      ${libdir}/libpipewire-*.so.* \
> +    ${libdir}/libjack-*.so.* \
> +    ${libdir}/libpulse-*.so.* \
>  "
>  FILES_lib${PN}-modules = "\
>      ${libdir}/pipewire-*/* \
>  "
>  FILES_${PN}-spa-plugins = "\
>      ${bindir}/spa-* \
> -    ${libdir}/spa/* \
> +    ${libdir}/spa-*/* \
>  "
>  FILES_${PN}-alsa = "\
>      ${libdir}/alsa-lib/* \
> -    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
>  "
>  FILES_gstreamer1.0-${PN} = "\
>      ${libdir}/gstreamer-1.0/* \
> --
> 2.21.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From raj.khem at gmail.com  Sun Mar 15 23:43:56 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun, 15 Mar 2020 16:43:56 -0700
Subject: [oe] [meta-python][PATCH 3/3] python3-matplotlib: fix
	dependencies and license
In-Reply-To: <20200311070359.18480-3-nick83ola@gmail.com>
References: <20200311070359.18480-1-nick83ola@gmail.com>
	<20200311070359.18480-3-nick83ola@gmail.com>
Message-ID: <CAMKF1sqcprj2Yq3vKnrD2s0Firk8YSmjZDMq2s72SqOnVVRA0g@mail.gmail.com>

please rebase on master-next and resend.

On Wed, Mar 11, 2020 at 12:05 AM Nicola Lunghi <nick83ola at gmail.com> wrote:
>
> * The license indicated in the old recipe (and in this) is the PSF not the BSD
> that was indicated before.
> * fixed the dependencies (looking at the recipe at meta-jupiter
> https://github.com/Xilinx/meta-jupyter/tree/master/recipes-python/
> * the setupext script was a leftover from the python2 recipe remove it for now
>   but probably has to be put updated and put back in the future:
>   -> all the module are installed by default and they have different licenses?
>
> Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
> ---
>  .../python-matplotlib/fix_setupext.patch      | 110 ------------------
>  .../python/python3-matplotlib_3.1.1.bb        |  24 ++--
>  2 files changed, 17 insertions(+), 117 deletions(-)
>  delete mode 100644 meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
>
> diff --git a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
> deleted file mode 100644
> index 21b9094a1..000000000
> --- a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
> +++ /dev/null
> @@ -1,110 +0,0 @@
> -This fixes the numpy import problem in setupext.py using a hard-coded path.
> -
> -Index: matplotlib-2.0.2/setupext.py
> -===================================================================
> ---- matplotlib-2.0.2.orig/setupext.py
> -+++ matplotlib-2.0.2/setupext.py
> -@@ -148,6 +148,7 @@ def has_include_file(include_dirs, filen
> -     Returns `True` if `filename` can be found in one of the
> -     directories in `include_dirs`.
> -     """
> -+    return True
> -     if sys.platform == 'win32':
> -         include_dirs += os.environ.get('INCLUDE', '.').split(';')
> -     for dir in include_dirs:
> -@@ -172,7 +173,7 @@ def get_base_dirs():
> -     Returns a list of standard base directories on this platform.
> -     """
> -     if options['basedirlist']:
> --        return options['basedirlist']
> -+        return [os.environ['STAGING_LIBDIR']]
> -
> -     basedir_map = {
> -         'win32': ['win32_static', ],
> -@@ -260,14 +261,6 @@ def make_extension(name, files, *args, *
> -     `distutils.core.Extension` constructor.
> -     """
> -     ext = DelayedExtension(name, files, *args, **kwargs)
> --    for dir in get_base_dirs():
> --        include_dir = os.path.join(dir, 'include')
> --        if os.path.exists(include_dir):
> --            ext.include_dirs.append(include_dir)
> --        for lib in ('lib', 'lib64'):
> --            lib_dir = os.path.join(dir, lib)
> --            if os.path.exists(lib_dir):
> --                ext.library_dirs.append(lib_dir)
> -     ext.include_dirs.append('.')
> -
> -     return ext
> -@@ -314,6 +307,7 @@ class PkgConfig(object):
> -                     "    matplotlib may not be able to find some of its dependencies")
> -
> -     def set_pkgconfig_path(self):
> -+        return
> -         pkgconfig_path = sysconfig.get_config_var('LIBDIR')
> -         if pkgconfig_path is None:
> -             return
> -@@ -875,14 +869,14 @@ class Numpy(SetupPackage):
> -             reload(numpy)
> -
> -         ext = Extension('test', [])
> --        ext.include_dirs.append(numpy.get_include())
> -+        ext.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/'))
> -         if not has_include_file(
> -                 ext.include_dirs, os.path.join("numpy", "arrayobject.h")):
> -             warnings.warn(
> -                 "The C headers for numpy could not be found. "
> -                 "You may need to install the development package")
> -
> --        return [numpy.get_include()]
> -+        return [os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/')]
> -
> -     def check(self):
> -         min_version = extract_versions()['__version__numpy__']
> -Index: matplotlib-2.0.2/setup.py
> -===================================================================
> ---- matplotlib-2.0.2.orig/setup.py
> -+++ matplotlib-2.0.2/setup.py
> -@@ -66,28 +66,6 @@ mpl_packages = [
> -     setupext.Python(),
> -     setupext.Platform(),
> -     'Required dependencies and extensions',
> --    setupext.Numpy(),
> --    setupext.Six(),
> --    setupext.Dateutil(),
> --    setupext.FuncTools32(),
> --    setupext.Subprocess32(),
> --    setupext.Pytz(),
> --    setupext.Cycler(),
> --    setupext.Tornado(),
> --    setupext.Pyparsing(),
> --    setupext.LibAgg(),
> --    setupext.FreeType(),
> --    setupext.FT2Font(),
> --    setupext.Png(),
> --    setupext.Qhull(),
> --    setupext.Image(),
> --    setupext.TTConv(),
> --    setupext.Path(),
> --    setupext.ContourLegacy(),
> --    setupext.Contour(),
> --    setupext.Delaunay(),
> --    setupext.QhullWrap(),
> --    setupext.Tri(),
> -     'Optional subpackages',
> -     setupext.SampleData(),
> -     setupext.Toolkits(),
> -@@ -100,13 +78,8 @@ mpl_packages = [
> -     setupext.BackendMacOSX(),
> -     setupext.BackendQt5(),
> -     setupext.BackendQt4(),
> --    setupext.BackendGtk3Agg(),
> -     setupext.BackendGtk3Cairo(),
> --    setupext.BackendGtkAgg(),
> --    setupext.BackendTkAgg(),
> --    setupext.BackendWxAgg(),
> -     setupext.BackendGtk(),
> --    setupext.BackendAgg(),
> -     setupext.BackendCairo(),
> -     setupext.Windowing(),
> -     'Optional LaTeX dependencies',
> diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
> index 824680c24..1fb234c8e 100644
> --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
> +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
> @@ -4,16 +4,26 @@ Matplotlib is a Python 2D plotting library which produces \
>  publication-quality figures in a variety of hardcopy formats \
>  and interactive environments across platforms."
>  HOMEPAGE = "https://github.com/matplotlib/matplotlib"
> -LICENSE = "BSD-2-Clause"
> -LIC_FILES_CHKSUM = "file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74"
> -
> -DEPENDS = "python3-numpy-native python3-numpy freetype libpng python3-dateutil python3-pytz"
> -RDEPENDS_${PN} = "python3-numpy freetype libpng python3-dateutil python3-pytz"
> +LICENSE = "PSF"
> +LIC_FILES_CHKSUM = "\
> +    file://setup.py;beginline=275;endline=275;md5=2a114620e4e6843aa7568d5902501753 \
> +    file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \
> +"
> +DEPENDS = "python3-numpy-native freetype libpng"
>
>  SRC_URI[md5sum] = "f894af5564a588e880644123237251b7"
>  SRC_URI[sha256sum] = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812080c93"
>
> -PYPI_PACKAGE = "matplotlib"
> -inherit pypi setuptools3
> +inherit pypi setuptools3 pkgconfig
> +
> +EXTRA_OECONF = "--disable-docs"
> +
> +RDEPENDS_${PN} += "\
> +    python3-numpy \
> +    python3-pyparsing \
> +    python3-cycler \
> +    python3-dateutil \
> +    python3-kiwisolver \
> +"
>
>  BBCLASSEXTEND = "native"
> --
> 2.20.1
>

From raj.khem at gmail.com  Mon Mar 16 00:06:54 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun, 15 Mar 2020 17:06:54 -0700
Subject: [oe] [meta-oe][PATCH] flashrom: Fix build with clang
Message-ID: <20200316000654.1093220-1-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...typecast-enum-conversions-explicitly.patch | 69 +++++++++++++++++++
 meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb  |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch

diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch
new file mode 100644
index 0000000000..7ac53650f2
--- /dev/null
+++ b/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch
@@ -0,0 +1,69 @@
+From 8a236330f2af56bde21e9f69208ea3e59f529f0c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Sun, 15 Mar 2020 17:02:30 -0700
+Subject: [PATCH] typecast enum conversions explicitly
+
+clang complains like below
+
+libflashrom.c:191:43: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion]
+                        supported_boards[i].working = binfo[i].working;
+                                                    ~ ~~~~~~~~~^~~~~~~
+libflashrom.c:229:46: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion]
+                        supported_chipsets[i].status = chipset[i].status;
+                                                     ~ ~~~~~~~~~~~^~~~~~
+
+However these enums are exactly same so they can be typecasted
+
+libflashrom.h
+
+/** @ingroup flashrom-query */
+enum flashrom_test_state {
+        FLASHROM_TESTED_OK  = 0,
+        FLASHROM_TESTED_NT  = 1,
+        FLASHROM_TESTED_BAD = 2,
+        FLASHROM_TESTED_DEP = 3,
+        FLASHROM_TESTED_NA  = 4,
+};
+
+flash.h
+
+enum test_state {
+          OK = 0,
+          NT = 1, /* Not tested */
+          BAD,    /* Known to not work */
+          DEP,    /* Support depends on configuration (e.g. Intel flash descriptor) */
+          NA,     /* Not applicable (e.g. write support on ROM chips) */
+  };
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ libflashrom.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libflashrom.c b/libflashrom.c
+index 0dec22e..7956685 100644
+--- a/libflashrom.c
++++ b/libflashrom.c
+@@ -188,7 +188,7 @@ struct flashrom_board_info *flashrom_supported_boards(void)
+ 		for (; i < boards_known_size; ++i) {
+ 			supported_boards[i].vendor = binfo[i].vendor;
+ 			supported_boards[i].name = binfo[i].name;
+-			supported_boards[i].working = binfo[i].working;
++			supported_boards[i].working = (enum flashrom_test_state)binfo[i].working;
+ 		}
+ 	} else {
+ 		msg_gerr("Memory allocation error!\n");
+@@ -226,7 +226,7 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void)
+ 			supported_chipsets[i].chipset = chipset[i].device_name;
+ 			supported_chipsets[i].vendor_id = chipset[i].vendor_id;
+ 			supported_chipsets[i].chipset_id = chipset[i].device_id;
+-			supported_chipsets[i].status = chipset[i].status;
++			supported_chipsets[i].status = (enum flashrom_test_state)chipset[i].status;
+ 	  }
+ 	} else {
+ 		msg_gerr("Memory allocation error!\n");
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb
index 17445ac2da..642cec1598 100644
--- a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb
+++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "pciutils libusb libusb-compat"
 
 SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \
+           file://0001-typecast-enum-conversions-explicitly.patch \
            "
 SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956"
 SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b"
-- 
2.25.1


From schnitzeltony at gmail.com  Mon Mar 16 05:49:08 2020
From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=)
Date: Mon, 16 Mar 2020 06:49:08 +0100
Subject: [oe] [PATCH 1/2] pipewire: upgrade 0.2.7 -> 0.3.1
In-Reply-To: <CAMKF1sotjDeZvidnX=FDL8u1f2KJ_Y5X-FLM++07jfqV887wxg@mail.gmail.com>
References: <20200314220440.5983-1-schnitzeltony@gmail.com>
	<CAMKF1sotjDeZvidnX=FDL8u1f2KJ_Y5X-FLM++07jfqV887wxg@mail.gmail.com>
Message-ID: <CALbNGRQUKLFzvAUF2djkp2nuqnYD1CaHMT8fELiAPxNtkwTWbQ@mail.gmail.com>

On Mon, Mar 16, 2020 at 12:35 AM Khem Raj <raj.khem at gmail.com> wrote:
>
> On Sat, Mar 14, 2020 at 3:05 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
> >
> > * as long as we have not upgradeed mutter to 3.36 we have to keep pipewire
> >   0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
> > * license was changed to MIT
> > * additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES
> >   or if not available by pipewire's defaults
> > * vulkan was disabled for now
> >
> > Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> > ---
> >  .../pipewire/pipewire-0.2_git.bb              | 65 +++++++++++++++++++
> >  .../pipewire/pipewire_git.bb                  | 32 +++++----
> >  2 files changed, 86 insertions(+), 11 deletions(-)
> >  create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> >
> > diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> > new file mode 100644
> > index 000000000..bcb3015f8
> > --- /dev/null
> > +++ b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> > @@ -0,0 +1,65 @@
> > +SUMMARY = "Multimedia processing server for Linux"
> > +AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
> > +HOMEPAGE = "https://pipewire.org"
> > +SECTION = "multimedia"
> > +LICENSE = "LGPL-2.1"
> > +LIC_FILES_CHKSUM = " \
> > +    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> > +    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> > +"
> > +DEPENDS = "alsa-lib dbus udev"
> > +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> > +PV = "0.2.7"
> > +
> > +SRC_URI = "git://github.com/PipeWire/pipewire"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +inherit meson pkgconfig systemd manpages
> > +
> > +PACKAGECONFIG ??= "\
> > +    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> > +    gstreamer \
> > +"
> > +
> > +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
> > +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
> > +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
> > +
> > +PACKAGES =+ "\
> > +    ${PN}-spa-plugins \
> > +    ${PN}-alsa \
> > +    ${PN}-config \
> > +    gstreamer1.0-${PN} \
> > +    lib${PN} \
> > +    lib${PN}-modules \
> > +"
> > +
> > +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
> > +
> > +FILES_${PN} = "\
> > +    ${sysconfdir}/pipewire/pipewire.conf \
> > +    ${bindir}/pipewire* \
> > +    ${systemd_user_unitdir}/* \
> > +"
> > +FILES_lib${PN} = "\
> > +    ${libdir}/libpipewire-*.so.* \
> > +"
> > +FILES_lib${PN}-modules = "\
> > +    ${libdir}/pipewire-*/* \
> > +"
> > +FILES_${PN}-spa-plugins = "\
> > +    ${bindir}/spa-* \
> > +    ${libdir}/spa/* \
> > +"
> > +FILES_${PN}-alsa = "\
> > +    ${libdir}/alsa-lib/* \
> > +    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
> > +"
> > +FILES_gstreamer1.0-${PN} = "\
> > +    ${libdir}/gstreamer-1.0/* \
> > +"
> > +
> > +CONFFILES_${PN} = "\
> > +    ${sysconfdir}/pipewire/pipewire.conf \
> > +"
> > diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> > index bcb3015f8..95da2df09 100644
> > --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> > +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> > @@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux"
> >  AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
> >  HOMEPAGE = "https://pipewire.org"
> >  SECTION = "multimedia"
> > -LICENSE = "LGPL-2.1"
> > +LICENSE = "MIT"
> >  LIC_FILES_CHKSUM = " \
> > -    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> > -    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> > +    file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \
> > +    file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \
> >  "
> >  DEPENDS = "alsa-lib dbus udev"
> > -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> > -PV = "0.2.7"
> > +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac"
> > +PV = "0.3.1"
> >
> >  SRC_URI = "git://github.com/PipeWire/pipewire"
> >
> > @@ -18,13 +18,20 @@ S = "${WORKDIR}/git"
> >  inherit meson pkgconfig systemd manpages
> >
> >  PACKAGECONFIG ??= "\
> > -    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> > -    gstreamer \
> > +    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
> > +    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \
>
> Perhaps add vulkan as packageconfig too here. I am seeing
>
> WARNING: pipewire-0.3.1-r0 do_configure: QA Issue: pipewire: invalid
> PACKAGECONFIG: vulkan [invalid-packageconfig]

As you can see I played around with vulkan PACKAGECONFIG but forgot to
remove it's usage. The reasons I decided to disable it by default are

* I am not sure what to (r)depend it needs - there is no
virtual/vulkan. Is it vulkan-loader as gstreamer1.0-plugins-bad does?
* Have no machine to test
* Would take me huge amount of build time - and for me it is just an
optional dependency for mutter (that I never used yet)

So what do you prefer:

* keep disabled (as soon as sombody wants vulkan here he/she/it can take care)
* add untested PACKAGECONFIG (with vulkan-loader in DEPENDS field?)

Cheers

Andreas

From raj.khem at gmail.com  Mon Mar 16 06:18:15 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Sun, 15 Mar 2020 23:18:15 -0700
Subject: [oe] [PATCH 1/2] pipewire: upgrade 0.2.7 -> 0.3.1
In-Reply-To: <CALbNGRQUKLFzvAUF2djkp2nuqnYD1CaHMT8fELiAPxNtkwTWbQ@mail.gmail.com>
References: <20200314220440.5983-1-schnitzeltony@gmail.com>
	<CAMKF1sotjDeZvidnX=FDL8u1f2KJ_Y5X-FLM++07jfqV887wxg@mail.gmail.com>
	<CALbNGRQUKLFzvAUF2djkp2nuqnYD1CaHMT8fELiAPxNtkwTWbQ@mail.gmail.com>
Message-ID: <CAMKF1srEewvC2_OVy3fH2JJbU_1ReN2C=n1+RO5Ok7R9g8WPKg@mail.gmail.com>

On Sun, Mar 15, 2020 at 10:49 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
>
> On Mon, Mar 16, 2020 at 12:35 AM Khem Raj <raj.khem at gmail.com> wrote:
> >
> > On Sat, Mar 14, 2020 at 3:05 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
> > >
> > > * as long as we have not upgradeed mutter to 3.36 we have to keep pipewire
> > >   0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
> > > * license was changed to MIT
> > > * additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES
> > >   or if not available by pipewire's defaults
> > > * vulkan was disabled for now
> > >

perhaps a packageconfig with disabled default explicitly

> > > Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> > > ---
> > >  .../pipewire/pipewire-0.2_git.bb              | 65 +++++++++++++++++++
> > >  .../pipewire/pipewire_git.bb                  | 32 +++++----
> > >  2 files changed, 86 insertions(+), 11 deletions(-)
> > >  create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> > >
> > > diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> > > new file mode 100644
> > > index 000000000..bcb3015f8
> > > --- /dev/null
> > > +++ b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
> > > @@ -0,0 +1,65 @@
> > > +SUMMARY = "Multimedia processing server for Linux"
> > > +AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
> > > +HOMEPAGE = "https://pipewire.org"
> > > +SECTION = "multimedia"
> > > +LICENSE = "LGPL-2.1"
> > > +LIC_FILES_CHKSUM = " \
> > > +    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> > > +    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> > > +"
> > > +DEPENDS = "alsa-lib dbus udev"
> > > +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> > > +PV = "0.2.7"
> > > +
> > > +SRC_URI = "git://github.com/PipeWire/pipewire"
> > > +
> > > +S = "${WORKDIR}/git"
> > > +
> > > +inherit meson pkgconfig systemd manpages
> > > +
> > > +PACKAGECONFIG ??= "\
> > > +    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> > > +    gstreamer \
> > > +"
> > > +
> > > +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
> > > +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
> > > +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
> > > +
> > > +PACKAGES =+ "\
> > > +    ${PN}-spa-plugins \
> > > +    ${PN}-alsa \
> > > +    ${PN}-config \
> > > +    gstreamer1.0-${PN} \
> > > +    lib${PN} \
> > > +    lib${PN}-modules \
> > > +"
> > > +
> > > +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
> > > +
> > > +FILES_${PN} = "\
> > > +    ${sysconfdir}/pipewire/pipewire.conf \
> > > +    ${bindir}/pipewire* \
> > > +    ${systemd_user_unitdir}/* \
> > > +"
> > > +FILES_lib${PN} = "\
> > > +    ${libdir}/libpipewire-*.so.* \
> > > +"
> > > +FILES_lib${PN}-modules = "\
> > > +    ${libdir}/pipewire-*/* \
> > > +"
> > > +FILES_${PN}-spa-plugins = "\
> > > +    ${bindir}/spa-* \
> > > +    ${libdir}/spa/* \
> > > +"
> > > +FILES_${PN}-alsa = "\
> > > +    ${libdir}/alsa-lib/* \
> > > +    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
> > > +"
> > > +FILES_gstreamer1.0-${PN} = "\
> > > +    ${libdir}/gstreamer-1.0/* \
> > > +"
> > > +
> > > +CONFFILES_${PN} = "\
> > > +    ${sysconfdir}/pipewire/pipewire.conf \
> > > +"
> > > diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> > > index bcb3015f8..95da2df09 100644
> > > --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> > > +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
> > > @@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux"
> > >  AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
> > >  HOMEPAGE = "https://pipewire.org"
> > >  SECTION = "multimedia"
> > > -LICENSE = "LGPL-2.1"
> > > +LICENSE = "MIT"
> > >  LIC_FILES_CHKSUM = " \
> > > -    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
> > > -    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> > > +    file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \
> > > +    file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \
> > >  "
> > >  DEPENDS = "alsa-lib dbus udev"
> > > -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
> > > -PV = "0.2.7"
> > > +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac"
> > > +PV = "0.3.1"
> > >
> > >  SRC_URI = "git://github.com/PipeWire/pipewire"
> > >
> > > @@ -18,13 +18,20 @@ S = "${WORKDIR}/git"
> > >  inherit meson pkgconfig systemd manpages
> > >
> > >  PACKAGECONFIG ??= "\
> > > -    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> > > -    gstreamer \
> > > +    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
> > > +    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \
> >
> > Perhaps add vulkan as packageconfig too here. I am seeing
> >
> > WARNING: pipewire-0.3.1-r0 do_configure: QA Issue: pipewire: invalid
> > PACKAGECONFIG: vulkan [invalid-packageconfig]
>
> As you can see I played around with vulkan PACKAGECONFIG but forgot to
> remove it's usage. The reasons I decided to disable it by default are
>
> * I am not sure what to (r)depend it needs - there is no
> virtual/vulkan. Is it vulkan-loader as gstreamer1.0-plugins-bad does?
> * Have no machine to test
> * Would take me huge amount of build time - and for me it is just an
> optional dependency for mutter (that I never used yet)
>
> So what do you prefer:
>
> * keep disabled (as soon as sombody wants vulkan here he/she/it can take care)
> * add untested PACKAGECONFIG (with vulkan-loader in DEPENDS field?)
>
> Cheers
>
> Andreas

From bunk at stusta.de  Mon Mar 16 08:02:39 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Mon, 16 Mar 2020 10:02:39 +0200
Subject: [oe] [meta-oe][PATCH] flashrom: Fix build with clang
In-Reply-To: <20200316000654.1093220-1-raj.khem@gmail.com>
References: <20200316000654.1093220-1-raj.khem@gmail.com>
Message-ID: <20200316080239.GB14992@localhost>

On Sun, Mar 15, 2020 at 05:06:54PM -0700, Khem Raj wrote:
>...
> +clang complains like below
> +
> +libflashrom.c:191:43: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion]
> +                        supported_boards[i].working = binfo[i].working;
> +                                                    ~ ~~~~~~~~~^~~~~~~
> +libflashrom.c:229:46: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion]
> +                        supported_chipsets[i].status = chipset[i].status;

Please patch out the -Werror instead.

>...
> +However these enums are exactly same so they can be typecasted

If they are the same, the correct fix would be to have only one enum.

>...
> +Upstream-Status: Pending
>...
> +-			supported_boards[i].working = binfo[i].working;
> ++			supported_boards[i].working = (enum flashrom_test_state)binfo[i].working;
>...

Working around a compile warning by making the code worse is not
an improvement.

Even worse when this is an OE-only workaround.

cu
Adrian

From peter.kjellerstedt at axis.com  Mon Mar 16 11:41:25 2020
From: peter.kjellerstedt at axis.com (Peter Kjellerstedt)
Date: Mon, 16 Mar 2020 11:41:25 +0000
Subject: [oe] [meta-filesystems][master][zeus][PATCHv2]
	ntfs-3g-ntfsprogs:	Make it support usrmerge properly
In-Reply-To: <20200214164252.2607-1-pkj@axis.com>
References: <20200214164252.2607-1-pkj@axis.com>
Message-ID: <983c5eff211c4fdf904ac586bc84ed36@XBOX03.axis.com>

> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org <openembedded-
> devel-bounces at lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 14 februari 2020 17:43
> To: openembedded-devel at lists.openembedded.org
> Subject: [oe] [meta-filesystems][master][zeus][PATCHv2] ntfs-3g-ntfsprogs:
> Make it support usrmerge properly
> 
> An attempt to solve the problem that some files are installed to /sbin
> even though the usrmerge distro feature is enabled was made in commit
> 97c0af59 ("ntfs-3g-ntfsprogs: support usrmerge"). However, it merely
> just removed the problematic files, which meant that the package was
> rendered unusable.
> 
> Solve the problem properly by moving all files that are installed in
> /sbin to ${base_sbindir} instead.
> 
> Also clear up a cryptic comment.
> 
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
> ---
> 
> PATCHv2: Correct [meta-oe] to [meta-filesystems] in the subject.
> 
>  .../0001-Make-build-support-usrmerge.patch    | 43 -------------------
>  .../ntfs-3g-ntfsprogs_2017.3.23.bb            | 15 +++++--
>  2 files changed, 11 insertions(+), 47 deletions(-)
>  delete mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-
> ntfsprogs/files/0001-Make-build-support-usrmerge.patch
> 
> diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-
> ntfsprogs/files/0001-Make-build-support-usrmerge.patch b/meta-
> filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-
> support-usrmerge.patch
> deleted file mode 100644
> index fce10b999..000000000
> --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-
> Make-build-support-usrmerge.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -From 33f678bf74367aab8ddc2858a9f7797455ea9b9f Mon Sep 17 00:00:00 2001
> -From: Changqing Li <changqing.li at windriver.com>
> -Date: Thu, 29 Aug 2019 10:21:58 +0800
> -Subject: [PATCH] Make build support usrmerge
> -
> -Upstream-Status: Inappropriate[oe-specific]
> -
> -Signed-off-by: Changqing Li <changqing.li at windriver.com>
> ----
> - ntfsprogs/Makefile.am | 2 --
> - src/Makefile.am       | 3 ---
> - 2 files changed, 5 deletions(-)
> -
> -diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
> -index f4f9d1b..1f6a673 100644
> ---- a/ntfsprogs/Makefile.am
> -+++ b/ntfsprogs/Makefile.am
> -@@ -165,8 +165,6 @@ extras:	libs $(EXTRA_PROGRAMS)
> -
> - if ENABLE_MOUNT_HELPER
> - install-exec-hook:
> --	$(INSTALL) -d $(DESTDIR)/sbin
> --	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
> -
> - install-data-hook:
> - 	$(INSTALL) -d $(DESTDIR)$(man8dir)
> -diff --git a/src/Makefile.am b/src/Makefile.am
> -index 8d98408..d0a6a45 100644
> ---- a/src/Makefile.am
> -+++ b/src/Makefile.am
> -@@ -66,9 +66,6 @@ endif
> -
> - if ENABLE_MOUNT_HELPER
> - install-exec-local:	install-rootbinPROGRAMS
> --	$(MKDIR_P) "$(DESTDIR)/sbin"
> --	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
> --	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
> -
> - install-data-local:	install-man8
> - 	$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
> ---
> -2.7.4
> -
> diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
> index 1559bfd3f..6f5cb6cee 100644
> --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
> +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
> @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
> 
>  SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \
>             file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \
> -
> ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-Make-build-support-usrmerge.patch','',d)} \
>  "
>  S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}"
>  SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c"
> @@ -35,10 +34,18 @@ FILES_ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*"
>  FILES_libntfs-3g = "${libdir}/*${SOLIBS}"
> 
>  do_install_append() {
> -    # Standard mount will execute the program /sbin/mount.TYPE
> -    # when called. Add the symbolic to let mount could find ntfs.
> -    ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs
> +    # Standard mount will execute the program /sbin/mount.TYPE when called.
> +    # Add a symbolic link to let mount find ntfs.
> +    ln -sf mount.ntfs-3g ${D}${base_sbindir}/mount.ntfs
>      rmdir ${D}${libdir}/ntfs-3g
> +
> +    # Handle when usrmerge is in effect. Some files are installed to /sbin
> +    # regardless of the value of ${base_sbindir}.
> +    if [ "${base_sbindir}" != /sbin ] && [ -d ${D}/sbin ]; then
> +        mkdir -p ${D}${base_sbindir}
> +        mv ${D}/sbin/* ${D}${base_sbindir}
> +        rmdir ${D}/sbin
> +    fi
>  }
> 
>  # Satisfy the -dev runtime dependency
> --
> 2.21.1

Please backport this to Zeus now that it has been accepted to master.

//Peter


From raj.khem at gmail.com  Mon Mar 16 18:40:16 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon, 16 Mar 2020 11:40:16 -0700
Subject: [oe] [meta-oe][PATCH] flashrom: Fix build with clang
In-Reply-To: <20200316080239.GB14992@localhost>
References: <20200316000654.1093220-1-raj.khem@gmail.com>
	<20200316080239.GB14992@localhost>
Message-ID: <CAMKF1spSV3c41nr59xj2qKSXUtrP22bgYVvZKy6MaZGSOeaCPA@mail.gmail.com>

On Mon, Mar 16, 2020 at 1:02 AM Adrian Bunk <bunk at stusta.de> wrote:
>
> On Sun, Mar 15, 2020 at 05:06:54PM -0700, Khem Raj wrote:
> >...
> > +clang complains like below
> > +
> > +libflashrom.c:191:43: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion]
> > +                        supported_boards[i].working = binfo[i].working;
> > +                                                    ~ ~~~~~~~~~^~~~~~~
> > +libflashrom.c:229:46: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion]
> > +                        supported_chipsets[i].status = chipset[i].status;
>
> Please patch out the -Werror instead.
>

I was basing my solution on an upstream commit
https://github.com/flashrom/flashrom/commit/71b706f5
and I have also proposed my patch upstream lets see what feedback
flashrom devs have
if you are interested you can follow the pull

https://github.com/flashrom/flashrom/pull/133

> >...
> > +However these enums are exactly same so they can be typecasted
>
> If they are the same, the correct fix would be to have only one enum.
>

its not that straight forward and I would leave that to flashrom experts.

> >...
> > +Upstream-Status: Pending
> >...
> > +-                    supported_boards[i].working = binfo[i].working;
> > ++                    supported_boards[i].working = (enum flashrom_test_state)binfo[i].working;
> >...
>
> Working around a compile warning by making the code worse is not
> an improvement.
>

If you think it make it worse, feel free to improve it.

> Even worse when this is an OE-only workaround.
>
> cu
> Adrian

From raj.khem at gmail.com  Mon Mar 16 20:43:50 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Mon, 16 Mar 2020 13:43:50 -0700
Subject: [oe] State of OE world - 2020-03-16
Message-ID: <CAMKF1srmw_yUQv0HQCqn7jzAWJFvNtm5WOJTLt49t=YTDNxwCA@mail.gmail.com>

https://www.openembedded.org/wiki/Bitbake_World_Status_Dunfell#Number_of_issues_-_stats

== Failed tasks 2020-03-16 ==

INFO: jenkins-job.sh-1.8.46 Complete log available at
http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.report.20200316_203849.log

=== common (0) ===

=== common-x86 (0) ===

=== qemuarm (0) ===

=== qemuarm64 (0) ===

=== qemux86 (0) ===

=== qemux86_64 (0) ===

=== Number of failed tasks (0) ===
{| class=wikitable
|-
|| qemuarm || 0 ||
http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.world.qemuarm.20200315_230040.log
||
|-
|| qemuarm64 || 0 ||
http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.world.qemuarm64.20200316_060031.log
||
|-
|| qemux86 || 0 ||
http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.world.qemux86.20200316_060038.log
||
|-
|| qemux86_64 || 0 ||
http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.world.qemux86-64.20200316_060039.log
||
|}

=== PNBLACKLISTs (20) ===


sources/meta-openembedded:
    * meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb:PNBLACKLIST[netkit-rusers]
= "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or
directory"
    * meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb:PNBLACKLIST[drbd]
= "Kernel module Needs forward porting to kernel 5.2+"
    * meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb:PNBLACKLIST[lowpan-tools]
= "WARNING these tools are deprecated! Use wpan-tools instead"
    * meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb:PNBLACKLIST[dnf-plugin-tui]
?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
    * meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb:PNBLACKLIST[nanopb]
= "Needs forward porting to use python3"
    * meta-oe/recipes-extended/socketcan/can-isotp_git.bb:PNBLACKLIST[can-isotp]
= "Kernel module Needs forward porting to kernel 5.2+"
    * meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb:PNBLACKLIST[dnfdragora]
?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does
not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
    * meta-oe/recipes-kernel/bpftool/bpftool.bb:PNBLACKLIST[bpftool] =
"Needs forward porting to kernel 5.2+"


sources/meta-yoe:
    * conf/distro/yoe.inc:PNBLACKLIST[build-appliance-image] = "tries
to include whole downloads directory in /home/builder/poky :/"
    * conf/distro/yoe.inc:PNBLACKLIST[smartrefrigerator] = "Needs
porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[qmlbrowser] = "Needs porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[minehunt] = "Needs porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[homeautomation] = "Needs porting
to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[samegame] = "Needs porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[applicationlauncher] = "Needs
porting to QT > 5.6"
    * conf/distro/yoe.inc:PNBLACKLIST[spacetouch] = "Needs porting to
libplanes 1.0"
    * conf/distro/yoe.inc:PNBLACKLIST[qtviewplanes] = "Needs porting
to libplanes 1.0"
    * conf/distro/yoe.inc:PNBLACKLIST[egt-thermostat] = "Needs porting
to egt 0.8.2+"


sources/openembedded-core:
    * meta/recipes-devtools/dnf/dnf_4.2.2.bb:PNBLACKLIST[dnf] ?=
"${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not
build without package_rpm in PACKAGE_CLASSES due disabled rpm support
in libsolv', d)}"
    * meta/recipes-devtools/libdnf/libdnf_0.28.1.bb:PNBLACKLIST[libdnf]
?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does
not build without package_rpm in PACKAGE_CLASSES due disabled rpm
support in libsolv', d)}"


conf/local.conf:
    * PNBLACKLIST[bigbuckbunny-1080p] = "big and doesn't really need
to be tested so much"
    * PNBLACKLIST[bigbuckbunny-480p] = "big and doesn't really need to
be tested so much"
    * PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to
be tested so much"
    * PNBLACKLIST[tearsofsteel-1080p] = "big and doesn't really need
to be tested so much"
    * PNBLACKLIST[build-appliance-image] = "tries to include whole
downloads directory in /home/builder/poky :/"

=== QA issues (0) ===
{| class=wikitable
!| Count ||Issue
|-
||0 ||already-stripped
|-
||0 ||build-deps
|-
||0 ||compile-host-path
|-
||0 ||file-rdeps
|-
||0 ||host-user-contaminated
|-
||0 ||installed-vs-shipped
|-
||0 ||invalid-pkgconfig
|-
||0 ||ldflags
|-
||0 ||libdir
|-
||0 ||pkgname
|-
||0 ||qa_pseudo
|-
||0 ||symlink-to-sysroot
|-
||0 ||textrel
|-
||0 ||unknown-configure-option
|-
||0 ||version-going-backwards
|}



=== Incorrect PACKAGE_ARCH or sstate signatures (0) ===

Complete log: http://logs.nslu2-linux.org/buildlogs/oe/world/dunfell/log.signatures.20200316_070928.log

No issues detected


QA issues by type:
count: 0 issue: already-stripped


count: 0 issue: libdir


count: 0 issue: textrel


count: 0 issue: build-deps


count: 0 issue: file-rdeps


count: 0 issue: version-going-backwards


count: 0 issue: host-user-contaminated


count: 0 issue: installed-vs-shipped


count: 0 issue: unknown-configure-option


count: 0 issue: symlink-to-sysroot


count: 0 issue: invalid-pkgconfig


count: 0 issue: pkgname


count: 0 issue: ldflags


count: 0 issue: compile-host-path


count: 0 issue: qa_pseudo



This git log matches with the metadata as seen by qemuarm build.
In some cases qemux86 and qemux86-64 builds are built with slightly
different metadata, you can see the exact version near the top of each
log.world.qemu* files linked from the report
~/oe/world/yoe ~/oe/world/yoe

== Tested changes (not included in master yet) - bitbake ==
latest upstream commit:
e67dfa4a tinfoil: Update to match recent knotty console changes
not included in master yet:

== Tested changes (not included in master yet) - openembedded-core ==
latest upstream commit:
61d80b07bc build-appliance-image: Update to master head revision
not included in master yet:
c66847865c runit: Add runit and related recipes
0295e9228f qemux86: Add identical qemux86copy variant for tests
68910da942 qemuppc64: Add a QEMU machine definition for ppc64
9ce9e399db linux-yocto: Add powerpc64le support
02a4e9e755 report-error: Allow to upload reports automatically
930e0a3419 report-error.bbclass: replace angle brackets with &lt; and &gt;
bcc40312e9 oeqa: Extend parselogs to rpi4
90ecbe3a82 bison: Update to 3.5.3
3dbef4b1c5 bison: Reset load average settings if specified in environment

== Tested changes (not included in master yet) - meta-openembedded ==
latest upstream commit:
802f9127b flashrom: Fix build with clang
not included in master yet:
66a52463f drone: Add CI support
e3e18be30 pipewire: upgrade 0.2.7 -> 0.3.1
201e8b7d3 pipewire: Link with libatomic on mips/i*86
86d26c74f mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop]

== Tested changes (not included in master yet) - meta-qt5 ==
latest upstream commit:
89de99e python-{pyqt5,pyqtchart}: fold .inc file into .bb
not included in master yet:
af02c6d qt5-creator: Inherit mime-xdg
ea67b19 gstreamer1.0-plugins-good: Turn on qt5 packageconfig
50e95c6 qtmultimedia: Enable gstreamer support

== Tested changes (not included in master yet) - meta-browser ==
latest upstream commit:
830ef43 chromium: update to 80.0.3987.132
not included in master yet:
b4a58f8 chromium: Fix build on 32bit arches with 64bit time_t
bf5256c chromium: Fix build with clang10/gcc10
~/oe/world/yoe

From wangmy at cn.fujitsu.com  Tue Mar 17 07:19:55 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 17 Mar 2020 00:19:55 -0700
Subject: [oe]  [meta-networking][PATCH] arptables: upgrade 0.0.4 -> 0.0.5
Message-ID: <1584429596-2007-1-git-send-email-wangmy@cn.fujitsu.com>

arptables-init-busybox.patch
arptables-remove-bashism.patch
removed since they are not available in 0.0.5

refresh 0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...-for-package-specific-compiler-flags.patch | 42 +++-------
 .../arptables/arptables-init-busybox.patch    | 77 -------------------
 .../arptables/arptables-remove-bashism.patch  | 37 ---------
 .../arptables/arptables_git.bb                |  6 +-
 4 files changed, 14 insertions(+), 148 deletions(-)
 delete mode 100644 meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
 delete mode 100644 meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch

diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
index e8be45e6b..eb58389c3 100644
--- a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
+++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
@@ -8,24 +8,17 @@ which OE uses to pass tweaks
 
 Signed-off-by: Khem Raj <raj.khem at gmail.com>
 ---
- Makefile            | 15 +++++++--------
- extensions/Makefile |  5 ++++-
- 2 files changed, 11 insertions(+), 9 deletions(-)
+ Makefile            | 10 ++++------
+ extensions/Makefile |  4 ++++
+ 2 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 7bead0d..336db6b 100644
+index 62ebdf2..cd06813 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib
- BINDIR:=$(PREFIX)/sbin
- MANDIR:=$(PREFIX)/man
- man8dir=$(MANDIR)/man8
--INITDIR:=/etc/rc.d/init.d
-+INITDIR:=/etc/init.d
- SYSCONFIGDIR:=/etc/sysconfig
- DESTDIR:=
+@@ -12,9 +12,7 @@ DESTDIR:=
  
- MANS = arptables.8 arptables-save.8 arptables-restore.8
+ MANS = arptables-legacy.8 arptables-save.8 arptables-restore.8
  
 -COPT_FLAGS:=-O2
 -CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
@@ -34,8 +27,8 @@ index 7bead0d..336db6b 100644
  ifndef ARPT_LIBDIR
  ARPT_LIBDIR:=$(LIBDIR)/arptables
  endif
-@@ -25,13 +23,13 @@ include extensions/Makefile
- all: arptables libarptc/libarptc.a
+@@ -24,13 +22,13 @@ include extensions/Makefile
+ all: arptables-legacy libarptc/libarptc.a
  
  arptables.o: arptables.c
 -	$(CC) $(CFLAGS) -c -o $@ $<
@@ -51,29 +44,18 @@ index 7bead0d..336db6b 100644
  
  libarptc/libarptc.a: libarptc/libarptc.o
  	$(AR) rcs $@ $<
-@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv
- 	install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore
- 	cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_
- 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi
--	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi
-+	install -d $(DESTDIR)$(INITDIR)
-+	install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables
- 	rm -f arptables-save_ arptables-restore_ arptables.sysv_
- 
- .PHONY: install-man
 diff --git a/extensions/Makefile b/extensions/Makefile
-index 0189cc9..b046425 100644
+index 0189cc9..e8af782 100644
 --- a/extensions/Makefile
 +++ b/extensions/Makefile
-@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK
- EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o)
+@@ -5,3 +5,7 @@ EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o)
  
  extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
--	$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $<
+ 	$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $<
 +	$(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
 +
 +extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
 +	$(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
 -- 
-2.12.1
+2.17.1
 
diff --git a/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
deleted file mode 100644
index 24956c4ca..000000000
--- a/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: arptables-v0.0.3-4/arptables.sysv
-===================================================================
---- arptables-v0.0.3-4.orig/arptables.sysv	2010-03-22 16:28:03.000000000 +0300
-+++ arptables-v0.0.3-4/arptables.sysv	2010-03-22 16:27:51.000000000 +0300
-@@ -12,10 +12,10 @@
- # config: __SYSCONFIG__/arptables
- 
- source /etc/init.d/functions
--source /etc/sysconfig/network
-+# source /etc/sysconfig/network
- 
- # Check that networking is up.
--[ ${NETWORKING} = "no" ] && exit 0
-+# [ ${NETWORKING} = "no" ] && exit 0
- 
- [ -x __EXEC_PATH__/arptables ] || exit 1
- [ -x __EXEC_PATH__/arptables-save ] || exit 1
-@@ -28,32 +28,30 @@
- desc="Arp filtering"
- 
- start() {
--	echo -n $"Starting $desc ($prog): "
-+	echo -n "Starting $desc ($prog): "
- 	__EXEC_PATH__/arptables-restore < __SYSCONFIG__/arptables || RETVAL=1
- 
- 	if [ $RETVAL -eq 0 ]; then
--		success "$prog startup"
--		rm -f /var/lock/subsys/$prog
-+		echo "$prog ok"
-+		touch /var/lock/subsys/$prog
- 	else
--		failure "$prog startup"
-+		echo "$prog failed"
- 	fi
- 
--	echo
- 	return $RETVAL
- }
- 
- stop() {
--	echo -n $"Stopping $desc ($prog): "
-+	echo -n "Stopping $desc ($prog): "
- 	__EXEC_PATH__/arptables-restore < /dev/null || RETVAL=1
- 
- 	if [ $RETVAL -eq 0 ]; then
--		success "$prog shutdown"
--		rm -f %{_localstatedir}/lock/subsys/$prog
-+		echo "$prog stopped"
-+		rm -f /var/lock/subsys/$prog
- 	else
--		failure "$prog shutdown"
-+		echo "$prog failed to stop"
- 	fi
- 
--	echo
- 	return $RETVAL
- }
- 
-@@ -63,15 +61,14 @@
- }
- 
- save() {
--	echo -n $"Saving $desc ($prog): "
-+	echo -n "Saving $desc ($prog): "
- 	__EXEC_PATH__/arptables-save > __SYSCONFIG__/arptables || RETVAL=1
- 
- 	if [ $RETVAL -eq 0 ]; then
--		success "$prog saved"
-+		echo "$prog saved"
- 	else
--		failure "$prog saved"
-+		echo "$prog is not saved"
- 	fi
--	echo
- }
- 
- case "$1" in
diff --git a/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
deleted file mode 100644
index f332658bc..000000000
--- a/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cd312bc0e3686404428878d23b8888cba09a20e1 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang at windriver.com>
-Date: Thu, 18 Sep 2014 19:46:58 -0700
-Subject: [PATCH] arptables.sysv: remove bashism
-
-Use "." to replace of "source", and change /bin/bash to /bin/sh, the
-echo $"foo" works well in busybox.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
----
- arptables.sysv |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arptables.sysv b/arptables.sysv
-index 7a90bd2..7710376 100644
---- a/arptables.sysv
-+++ b/arptables.sysv
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # init script for arptables
- #
-@@ -11,7 +11,7 @@
- #
- # config: __SYSCONFIG__/arptables
- 
--source /etc/init.d/functions
-+. /etc/init.d/functions
- # source /etc/sysconfig/network
- 
- # Check that networking is up.
--- 
-1.7.9.5
-
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
index cec1d1f77..c02a19944 100644
--- a/meta-networking/recipes-support/arptables/arptables_git.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -2,15 +2,13 @@ SUMMARY = "Administration tool for arp packet filtering"
 SECTION = "net"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f"
-PV = "0.0.4+git${SRCPV}"
+SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
+PV = "0.0.5+git${SRCPV}"
 
 SRC_URI = " \
     git://git.netfilter.org/arptables \
     file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \
-    file://arptables-init-busybox.patch \
     file://arptables-arpt-get-target-fix.patch \
-    file://arptables-remove-bashism.patch \
     file://arptables.service \
 "
 SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar 17 07:19:56 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 17 Mar 2020 00:19:56 -0700
Subject: [oe]  [meta-networking] [PATCH] libtdb: upgrade 1.4.2 -> 1.4.3
In-Reply-To: <1584429596-2007-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584429596-2007-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584429596-2007-2-git-send-email-wangmy@cn.fujitsu.com>

0001-waf-add-support-of-cross_compile.patch
removed since it's not available for 1.4.3

refresh tdb-Add-configure-options-for-packages.patch

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...001-waf-add-support-of-cross_compile.patch | 63 -------------------
 ...b-Add-configure-options-for-packages.patch |  2 +-
 .../{libtdb_1.4.2.bb => libtdb_1.4.3.bb}      |  5 +-
 3 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch
 rename meta-networking/recipes-support/libtdb/{libtdb_1.4.2.bb => libtdb_1.4.3.bb} (90%)

diff --git a/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch
deleted file mode 100644
index e20c9a2c2..000000000
--- a/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li at windriver.com>
-Date: Fri, 25 Jan 2019 15:00:59 +0800
-Subject: [PATCH] waf: add support of cross_compile
-
-After upgrade libtdb from 1.3.16 to 1.3.17, waf build system
-which used by libtdb upgrade from 1.5.19 to 2.0.8
-
-on 1.5.19, for cross_compile, subprocess.Popen is set to be
-samba_cross.cross_Popen, which will not execute testprog on
-host, but only read result from cross-answers.txt which is
-passed by option --cross-answer
-
-part of old code:
-    args = Utils.to_list(kw.get('exec_args', []))
-    proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE)
-
-but on 2.0.8, exec_args is not used and cause do_configure
-failed with Exec format error
-
-fixed by append cross anser related args to cmd
-
-Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211]
-
-Signed-off-by: Changqing Li <changqing.li at windriver.com>
----
- third_party/waf/waflib/Tools/c_config.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py
-index 7608215..767cf33 100644
---- a/third_party/waf/waflib/Tools/c_config.py
-+++ b/third_party/waf/waflib/Tools/c_config.py
-@@ -660,20 +660,21 @@ class test_exec(Task.Task):
- 	"""
- 	color = 'PINK'
- 	def run(self):
-+		args = self.generator.bld.kw.get('exec_args', [])
- 		if getattr(self.generator, 'rpath', None):
- 			if getattr(self.generator, 'define_ret', False):
--				self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()])
--			else:
--				self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()])
-+				self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args)
-+			else: 
-+				self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args)
- 		else:
- 			env = self.env.env or {}
- 			env.update(dict(os.environ))
- 			for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'):
- 				env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '')
- 			if getattr(self.generator, 'define_ret', False):
--				self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env)
-+				self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env)
- 			else:
--				self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env)
-+				self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env)
- 
- @feature('test_exec')
- @after_method('apply_link')
--- 
-2.7.4
-
diff --git a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch
index 481fd68a4..c35cab7c2 100644
--- a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch
+++ b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch
@@ -78,7 +78,7 @@ index 1d01e1e..2336dc3 100644
 +    conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h')
 +    conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h')
      conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
--    conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
+-    conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
 -    conf.CHECK_HEADERS('shadow.h sys/acl.h')
 -    conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
 +    conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb
similarity index 90%
rename from meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb
rename to meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb
index 4973e80ca..c131014ff 100644
--- a/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb
+++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c
 
 SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
            file://tdb-Add-configure-options-for-packages.patch \
-           file://0001-waf-add-support-of-cross_compile.patch \
 "
 
-SRC_URI[md5sum] = "b2c05ad68334368d3258a63db709f254"
-SRC_URI[sha256sum] = "9040b2cce4028e392f063f91bbe76b8b28fecc2b7c0c6071c67b5eb3168e004a"
+SRC_URI[md5sum] = "e638e8890f743624a754304b3f994f4d"
+SRC_URI[sha256sum] = "c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b"
 
 PACKAGECONFIG ??= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
-- 
2.17.1




From wangmy at cn.fujitsu.com  Tue Mar 17 01:53:19 2020
From: wangmy at cn.fujitsu.com (Wang, Mingyu)
Date: Tue, 17 Mar 2020 01:53:19 +0000
Subject: [oe] [meta-oe][zeus][PATCH] libssh2: CVE-2019-17498.patch
In-Reply-To: <1f663de1-6dc9-c9fb-c14b-082de2934777@gmail.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
	<1f663de1-6dc9-c9fb-c14b-082de2934777@gmail.com>
Message-ID: <2954451373f4476ba391f6e570ff347b@G08CNEXMBPEKD05.g08.fujitsu.local>

> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17498
>is this fix in master?

Yes. It's already fix in master.

-----Original Message-----
From: openembedded-devel-bounces at lists.openembedded.org [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of akuster808
Sent: Friday, March 13, 2020 11:37 PM
To: openembedded-devel at lists.openembedded.org
Subject: Re: [oe] [meta-oe][zeus][PATCH] libssh2: CVE-2019-17498.patch



On 3/13/20 4:10 AM, Wang Mingyu wrote:
> Security Advisory
>
> References:
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17498
is this fix in master?
>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  .../libssh2/libssh2/CVE-2019-17498.patch      | 131 ++++++++++++++++++
>  .../recipes-support/libssh2/libssh2_1.8.2.bb  |   1 +
>  2 files changed, 132 insertions(+)
>  create mode 100644 
> meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
>
> diff --git 
> a/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch 
> b/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
> new file mode 100644
> index 000000000..f60764c92
> --- /dev/null
> +++ b/meta-oe/recipes-support/libssh2/libssh2/CVE-2019-17498.patch
> @@ -0,0 +1,131 @@
> +From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 
> +2001
> +From: Will Cosgrove <will at panic.com>
> +Date: Fri, 30 Aug 2019 09:57:38 -0700
> +Subject: [PATCH] packet.c: improve message parsing (#402)
> +
> +* packet.c: improve parsing of packets
> +
> +file: packet.c
> +
> +notes:
> +Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST.
> +
> +Upstream-Status: Accepted
> +CVE: CVE-2019-17498
> +
> +Reference to upstream patch:
> +https://github.com/libssh2/libssh2/commit/dedcbd106f8e52d5586b0205bc7
> +677e4c9868f9c
> +
> +---
> + src/packet.c | 68 
> +++++++++++++++++++++++------------------------------
> + 1 file changed, 29 insertions(+), 39 deletions(-)
> +
> +diff --git a/src/packet.c b/src/packet.c index 38ab6294..2e01bfc5 
> +100644
> +--- a/src/packet.c
> ++++ b/src/packet.c
> +@@ -416,8 +416,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> +                     size_t datalen, int macstate)  {
> +     int rc = 0;
> +-    char *message = NULL;
> +-    char *language = NULL;
> ++    unsigned char *message = NULL;
> ++    unsigned char *language = NULL;
> +     size_t message_len = 0;
> +     size_t language_len = 0;
> +     LIBSSH2_CHANNEL *channelp = NULL; @@ -469,33 +469,23 @@ 
> +_libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> + 
> +         case SSH_MSG_DISCONNECT:
> +             if(datalen >= 5) {
> +-                size_t reason = _libssh2_ntohu32(data + 1);
> ++                uint32_t reason = 0;
> ++                struct string_buf buf;
> ++                buf.data = (unsigned char *)data;
> ++                buf.dataptr = buf.data;
> ++                buf.len = datalen;
> ++                buf.dataptr++; /* advance past type */
> + 
> +-                if(datalen >= 9) {
> +-                    message_len = _libssh2_ntohu32(data + 5);
> ++                _libssh2_get_u32(&buf, &reason);
> ++                _libssh2_get_string(&buf, &message, &message_len);
> ++                _libssh2_get_string(&buf, &language, &language_len);
> + 
> +-                    if(message_len < datalen-13) {
> +-                        /* 9 = packet_type(1) + reason(4) + message_len(4) */
> +-                        message = (char *) data + 9;
> +-
> +-                        language_len =
> +-                            _libssh2_ntohu32(data + 9 + message_len);
> +-                        language = (char *) data + 9 + message_len + 4;
> +-
> +-                        if(language_len > (datalen-13-message_len)) {
> +-                            /* bad input, clear info */
> +-                            language = message = NULL;
> +-                            language_len = message_len = 0;
> +-                        }
> +-                    }
> +-                    else
> +-                        /* bad size, clear it */
> +-                        message_len = 0;
> +-                }
> +                 if(session->ssh_msg_disconnect) {
> +-                    LIBSSH2_DISCONNECT(session, reason, message,
> +-                                       message_len, language, language_len);
> ++                    LIBSSH2_DISCONNECT(session, reason, (const char *)message,
> ++                                       message_len, (const char *)language,
> ++                                       language_len);
> +                 }
> ++
> +                 _libssh2_debug(session, LIBSSH2_TRACE_TRANS,
> +                                "Disconnect(%d): %s(%s)", reason,
> +                                message, language); @@ -534,23 
> ++526,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> +                 int always_display = data[1];
> + 
> +                 if(datalen >= 6) {
> +-                    message_len = _libssh2_ntohu32(data + 2);
> +-
> +-                    if(message_len <= (datalen - 10)) {
> +-                        /* 6 = packet_type(1) + display(1) + message_len(4) */
> +-                        message = (char *) data + 6;
> +-                        language_len = _libssh2_ntohu32(data + 6 +
> +-                                                        message_len);
> +-
> +-                        if(language_len <= (datalen - 10 - message_len))
> +-                            language = (char *) data + 10 + message_len;
> +-                    }
> ++                    struct string_buf buf;
> ++                    buf.data = (unsigned char *)data;
> ++                    buf.dataptr = buf.data;
> ++                    buf.len = datalen;
> ++                    buf.dataptr += 2; /* advance past type & always 
> ++ display */
> ++
> ++                    _libssh2_get_string(&buf, &message, &message_len);
> ++                    _libssh2_get_string(&buf, &language, 
> ++ &language_len);
> +                 }
> + 
> +                 if(session->ssh_msg_debug) {
> +-                    LIBSSH2_DEBUG(session, always_display, message,
> +-                                  message_len, language, language_len);
> ++                    LIBSSH2_DEBUG(session, always_display,
> ++                                  (const char *)message,
> ++                                  message_len, (const char *)language,
> ++                                  language_len);
> +                 }
> +             }
> ++
> +             /*
> +              * _libssh2_debug will actually truncate this for us so
> +              * that it's not an inordinate about of data @@ -576,7 
> ++566,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> +                 uint32_t len = 0;
> +                 unsigned char want_reply = 0;
> +                 len = _libssh2_ntohu32(data + 1);
> +-                if(datalen >= (6 + len)) {
> ++                if((len <= (UINT_MAX - 6)) && (datalen >= (6 + 
> ++ len))) {
> +                     want_reply = data[5 + len];
> +                     _libssh2_debug(session,
> +                                    LIBSSH2_TRACE_CONN,
> diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb 
> b/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
> index fe853cde4..a17ae5b7c 100644
> --- a/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
> +++ b/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb
> @@ -17,6 +17,7 @@ inherit autotools pkgconfig  EXTRA_OECONF += "\
>                   --with-libz \
>                   --with-libz-prefix=${STAGING_LIBDIR} \
> +                 file://CVE-2019-17498.patch \
>                  "
>  
>  # only one of openssl and gcrypt could be set

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel





From wangmy at cn.fujitsu.com  Tue Mar 17 01:55:25 2020
From: wangmy at cn.fujitsu.com (Wang, Mingyu)
Date: Tue, 17 Mar 2020 01:55:25 +0000
Subject: [oe] [meta-oe][zeus][PATCH] opensc:
	CVE-2019-19479	CVE-2019-19480
In-Reply-To: <230ee0cf-428b-7c16-50c9-ec699e390d5f@gmail.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
	<1584097824-54462-2-git-send-email-wangmy@cn.fujitsu.com>
	<230ee0cf-428b-7c16-50c9-ec699e390d5f@gmail.com>
Message-ID: <91429f635f3e4274b165b26d4b959af8@G08CNEXMBPEKD05.g08.fujitsu.local>

>> References
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19479
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19480
>Is this fix in master?

Yes. It's fix in master.

-----Original Message-----
From: openembedded-devel-bounces at lists.openembedded.org [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of akuster808
Sent: Friday, March 13, 2020 11:38 PM
To: openembedded-devel at lists.openembedded.org
Subject: Re: [oe] [meta-oe][zeus][PATCH] opensc: CVE-2019-19479 CVE-2019-19480



On 3/13/20 4:10 AM, Wang Mingyu wrote:
> Security Advisory
>
> References
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19479
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19480

Is this fix in master?

>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  .../opensc/opensc/CVE-2019-19479.patch        | 30 ++++++++++++++++
>  .../opensc/opensc/CVE-2019-19480.patch        | 34 +++++++++++++++++++
>  .../recipes-support/opensc/opensc_0.19.0.bb   |  2 ++
>  3 files changed, 66 insertions(+)
>  create mode 100644 
> meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
>  create mode 100644 
> meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
>
> diff --git 
> a/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch 
> b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
> new file mode 100644
> index 000000000..73222ee1a
> --- /dev/null
> +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19479.patch
> @@ -0,0 +1,30 @@
> +From c3f23b836e5a1766c36617fe1da30d22f7b63de2 Mon Sep 17 00:00:00 
> +2001
> +From: Frank Morgner <frankmorgner at gmail.com>
> +Date: Sun, 3 Nov 2019 04:45:28 +0100
> +Subject: [PATCH] fixed  UNKNOWN READ
> +
> +Upstream-Status: Accepted <or Backport>
> +CVE: CVE-2019-19479
> +   
> +Reported by OSS-Fuzz
> +https://oss-fuzz.com/testcase-detail/5681169970757632
> +
> +Reference to upstream patch:
> +https://github.com/OpenSC/OpenSC/commit/c3f23b836e5a1766c36617fe1da30
> +d22f7b63de2
Missing signed-off-by
> +---
> + src/libopensc/card-setcos.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/libopensc/card-setcos.c 
> +b/src/libopensc/card-setcos.c index 4cf328ad6a..1b4e8f3e23 100644
> +--- a/src/libopensc/card-setcos.c
> ++++ b/src/libopensc/card-setcos.c
> +@@ -868,7 +868,7 @@ static void parse_sec_attr_44(sc_file_t *file, const u8 *buf, size_t len)
> + 			}
> + 
> + 			/* Encryption key present ? */
> +-			iPinCount = iACLen - 1;		
> ++			iPinCount = iACLen > 0 ? iACLen - 1 : 0;
> + 
> + 			if (buf[iOffset] & 0x20) {
> + 				int iSC;
> diff --git 
> a/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch 
> b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
> new file mode 100644
> index 000000000..12c1f0b4a
> --- /dev/null
> +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2019-19480.patch
> @@ -0,0 +1,34 @@
> +From 6ce6152284c47ba9b1d4fe8ff9d2e6a3f5ee02c7 Mon Sep 17 00:00:00 
> +2001
> +From: Jakub Jelen <jjelen at redhat.com>
> +Date: Wed, 23 Oct 2019 09:22:44 +0200
> +Subject: [PATCH] pkcs15-prkey: Simplify cleaning memory after failure
> +
> +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18478
> +
> +Upstream-Status: Accepted
> +CVE: CVE-2019-19480
> +
> +Reference to upstream patch:
> +https://github.com/OpenSC/OpenSC/commit/6ce6152284c47ba9b1d4fe8ff9d2e
> +6a3f5ee02c7
> +---
> + src/libopensc/pkcs15-prkey.c | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/src/libopensc/pkcs15-prkey.c 
> +b/src/libopensc/pkcs15-prkey.c index d3eee983..4b249582 100644
> +--- a/src/libopensc/pkcs15-prkey.c
> ++++ b/src/libopensc/pkcs15-prkey.c
> +@@ -258,6 +258,10 @@ int sc_pkcs15_decode_prkdf_entry(struct sc_pkcs15_card *p15card,
> + 	memset(gostr3410_params, 0, sizeof(gostr3410_params));
> + 
> + 	r = sc_asn1_decode_choice(ctx, asn1_prkey, *buf, *buflen, buf, 
> + buflen);
> ++	if (r < 0) {
> ++	        /* This might have allocated something. If so, clear it now */
> ++	        free(info.subject.value);
> ++        }
> + 	if (r == SC_ERROR_ASN1_END_OF_CONTENTS)
> + 		return r;
> + 	LOG_TEST_RET(ctx, r, "PrKey DF ASN.1 decoding failed");
> +--
> +2.17.1
> +
> diff --git a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb 
> b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
> index bc1722e39..d26825a06 100644
> --- a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
> +++ b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
> @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
>  SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47"
>  SRC_URI = "git://github.com/OpenSC/OpenSC \
>             file://0001-Remove-redundant-logging.patch \
> +           file://CVE-2019-19479.patch \
> +           file://CVE-2019-19480.patch \
>            "
>  DEPENDS = "openct pcsc-lite virtual/libiconv openssl"
>  

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel





From zangrc.fnst at cn.fujitsu.com  Tue Mar 17 02:35:50 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Tue, 17 Mar 2020 10:35:50 +0800
Subject: [oe]  [meta-oe] [PATCH] redis: upgrade 5.0.7 -> 5.0.8
Message-ID: <20200317023550.2885-1-zangrc.fnst@cn.fujitsu.com>

-Refresh the following patch:
	0001-src-Do-not-reset-FINAL_LIBS.patch

-0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch
	Removed since this is included in 5.0.8

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../0001-src-Do-not-reset-FINAL_LIBS.patch    |  4 +--
 ...rn-definition-of-SDS_NOINIT-in-sds.h.patch | 27 -------------------
 .../redis/{redis_5.0.7.bb => redis_5.0.8.bb}  |  5 ++--
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch
 rename meta-oe/recipes-extended/redis/{redis_5.0.7.bb => redis_5.0.8.bb} (90%)

diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
index 04af15dd8..b5c4133e3 100644
--- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
@@ -18,7 +18,7 @@ diff --git a/src/Makefile b/src/Makefile
 index 7f7c625..c71dd3b 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -66,7 +66,7 @@ endif
+@@ -75,7 +75,7 @@ endif
  
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
@@ -26,7 +26,7 @@ index 7f7c625..c71dd3b 100644
 +FINAL_LIBS+=-lm
  DEBUG=-g -ggdb
  
- ifeq ($(uname_S),SunOS)
+ # Linux ARM needs -latomic at linking time
 -- 
 2.23.0
 
diff --git a/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch b/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch
deleted file mode 100644
index 4675687c3..000000000
--- a/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7f7f710c8821b7254baeaf945ca3ca263b9845e2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Sat, 21 Dec 2019 11:17:50 -0800
-Subject: [PATCH] Mark extern definition of SDS_NOINIT in sds.h
-
-This helps avoiding multiple definition of this variable, its also
-defined globally in sds.c
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- src/sds.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sds.h b/src/sds.h
-index 1bdb60d..adcc12c 100644
---- a/src/sds.h
-+++ b/src/sds.h
-@@ -34,7 +34,7 @@
- #define __SDS_H
- 
- #define SDS_MAX_PREALLOC (1024*1024)
--const char *SDS_NOINIT;
-+extern const char *SDS_NOINIT;
- 
- #include <sys/types.h>
- #include <stdarg.h>
diff --git a/meta-oe/recipes-extended/redis/redis_5.0.7.bb b/meta-oe/recipes-extended/redis/redis_5.0.8.bb
similarity index 90%
rename from meta-oe/recipes-extended/redis/redis_5.0.7.bb
rename to meta-oe/recipes-extended/redis/redis_5.0.8.bb
index b91575552..2aec1b46a 100644
--- a/meta-oe/recipes-extended/redis/redis_5.0.7.bb
+++ b/meta-oe/recipes-extended/redis/redis_5.0.8.bb
@@ -14,12 +14,11 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://lua-update-Makefile-to-use-environment-build-setting.patch \
            file://oe-use-libc-malloc.patch \
            file://0001-src-Do-not-reset-FINAL_LIBS.patch \
-           file://0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch \
            file://GNU_SOURCE.patch \
            "
 
-SRC_URI[md5sum] = "612ec43075a888bc8b8a7dd8ccb2e0f7"
-SRC_URI[sha256sum] = "61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b"
+SRC_URI[md5sum] = "1885f1c67281d566a1fd126e19cfb25d"
+SRC_URI[sha256sum] = "f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Tue Mar 17 02:36:42 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Tue, 17 Mar 2020 10:36:42 +0800
Subject: [oe]  [meta-oe] [PATCH] glade: upgrade 3.22.1 -> 3.22.2
Message-ID: <20200317023642.20042-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../glade/{glade_3.22.1.bb => glade_3.22.2.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-devtools/glade/{glade_3.22.1.bb => glade_3.22.2.bb} (87%)

diff --git a/meta-oe/recipes-devtools/glade/glade_3.22.1.bb b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb
similarity index 87%
rename from meta-oe/recipes-devtools/glade/glade_3.22.1.bb
rename to meta-oe/recipes-devtools/glade/glade_3.22.2.bb
index 01decabea..3d539b232 100644
--- a/meta-oe/recipes-devtools/glade/glade_3.22.1.bb
+++ b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb
@@ -16,8 +16,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.22/glade-${PV}.tar.xz \
            file://remove-yelp-help-rules-var.patch \
           "
-SRC_URI[md5sum] = "226802cf3b06861240524805aa6fe6ff"
-SRC_URI[sha256sum] = "dff89a2ef2eaf000ff2a46979978d03cb9202cb04668e01d0ea5c5bb5547e39a"
+SRC_URI[md5sum] = "c074fa378c8f1ad80d20133c4ae6f42d"
+SRC_URI[sha256sum] = "edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3f26a21"
 
 EXTRA_OECONF += "--disable-man-pages"
 
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Tue Mar 17 02:40:49 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Tue, 17 Mar 2020 10:40:49 +0800
Subject: [oe]  [meta-oe] [PATCH] libgphoto2: upgrade 2.5.23 -> 2.5.24
Message-ID: <20200317024049.31496-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../gphoto2/{libgphoto2_2.5.23.bb => libgphoto2_2.5.24.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/gphoto2/{libgphoto2_2.5.23.bb => libgphoto2_2.5.24.bb} (91%)

diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb
similarity index 91%
rename from meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb
rename to meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb
index a012c499c..9d9b0c78c 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb
@@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2
            file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
 "
 
-SRC_URI[libgphoto2.md5sum] = "bf052ce815e607dc781c5b0f3c5ca5c0"
-SRC_URI[libgphoto2.sha256sum] = "d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d"
+SRC_URI[libgphoto2.md5sum] = "063632d839b71698e99da0ccd19bc9f6"
+SRC_URI[libgphoto2.sha256sum] = "fd3c578769f0fa389c1e68120f224bd98477aa3d82d16b82746c1266c0d4fb31"
 
 inherit autotools pkgconfig gettext lib_package
 
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Tue Mar 17 02:41:31 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Tue, 17 Mar 2020 10:41:31 +0800
Subject: [oe] [PATCH]  [meta-oe] [PATCH] sdparm: upgrade 1.10 -> 1.11
Message-ID: <20200317024131.31570-1-zangrc.fnst@cn.fujitsu.com>

-Refresh the following patch:
	files/make-sysroot-work.patch

-License-Update: Copyright year updated to 2019 and removed the
following description?

 * 3. The name of the author may not be used to endorse or promote products
 *    derived from this software without specific prior written permission.

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../recipes-support/sdparm/files/make-sysroot-work.patch    | 4 ++--
 .../sdparm/{sdparm_1.10.bb => sdparm_1.11.bb}               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-support/sdparm/{sdparm_1.10.bb => sdparm_1.11.bb} (78%)

diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
index 3fd85d9e2..f58091ad7 100644
--- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -17,13 +17,13 @@ diff --git a/src/Makefile.am b/src/Makefile.am
 index 61dd9f8..42c911f 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -41,7 +41,7 @@ sglib_SOURCES =		../lib/sg_lib.c \
+@@ -53,7 +53,7 @@ sglib_SOURCES =		../lib/sg_lib.c \
  			../lib/sg_pt_common.c
  
  if HAVE_SGUTILS
 -INCLUDES = -I/scsi
 +INCLUDES = -I=@includedir@/scsi
- sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
+ sdparm_LDADD = @GETOPT_O_FILES@ @SGUTILS_LIBS@
  sdparm_DEPENDENCIES = @GETOPT_O_FILES@
  else
 -- 
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-oe/recipes-support/sdparm/sdparm_1.11.bb
similarity index 78%
rename from meta-oe/recipes-support/sdparm/sdparm_1.10.bb
rename to meta-oe/recipes-support/sdparm/sdparm_1.11.bb
index c09b495be..7fc87db2b 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.11.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html"
 SECTION = "console/utils"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
-                    file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed"
+                    file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64"
 DEPENDS="sg3-utils"
 SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
            file://make-sysroot-work.patch \
@@ -17,8 +17,8 @@ UPSTREAM_CHECK_REGEX = "sdparm-(?P<pver>\d+(\.\d+)+)\.tgz"
 PACKAGES =+ "${PN}-scripts"
 RDEPENDS_${PN}-scripts += "bash ${PN}"
 
-SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
-SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
+SRC_URI[md5sum] = "cd998d1c12a4ec11652d0af580f06b4d"
+SRC_URI[sha256sum] = "432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0"
 
 inherit autotools
 
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Tue Mar 17 02:43:31 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Tue, 17 Mar 2020 10:43:31 +0800
Subject: [oe]  [meta-oe] [PATCH] gsoap: upgrade 2.8.95 -> 2.8.99
Message-ID: <20200317024331.31653-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../gsoap/{gsoap_2.8.95.bb => gsoap_2.8.99.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/gsoap/{gsoap_2.8.95.bb => gsoap_2.8.99.bb} (89%)

diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.99.bb
similarity index 89%
rename from meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb
rename to meta-oe/recipes-support/gsoap/gsoap_2.8.99.bb
index 22a049892..a5535ee91 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.99.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \
            "
-SRC_URI[md5sum] = "88031646018d60857f21246962d10011"
-SRC_URI[sha256sum] = "fe07aa152cd946ef8ebd3f87653f14c1d38efe7c6e6fce8c6f773c4814f79baf"
+SRC_URI[md5sum] = "9bba04cf88211762ee4cf35e03c65662"
+SRC_URI[sha256sum] = "c1c99a64eecf96cfd781a611171b58a39326f5811eb98c619aa7c54ec7bcc84b"
 
 inherit autotools
 
-- 
2.20.1




From bluelightning at bluelightning.org  Tue Mar 17 02:38:56 2020
From: bluelightning at bluelightning.org (Paul Eggleton)
Date: Tue, 17 Mar 2020 15:38:56 +1300
Subject: [oe] OpenEmbedded TSC Meeting Minutes 2020-03-17
Message-ID: <22665987.Wx5bFTl31r@linc>

OpenEmbedded Technical Steering Committee (TSC) Meeting Minutes 2020-03-17
==========================================================================

Meeting was held in #oe-tsc on Freenode; channel access public.

Present:
- Richard Purdie (RP)
- Joshua Watt (JPEW)
- Bruce Ashfield (zeddii)
- Paul Eggleton (bluelightning)
Apologies:
- Martin Jansa (JaMa)

Summary:
* Need to think about ways to encourage contributions
  - Make contributions more visible? (see also last meeting's discussion)
    - Include contributor names in release notes
  - Response emails to patches / when patch merged?
  - Ideas / discussion around any barriers to contributing and removing them very welcome


Full meeting long
-----------------

[11:01] <bluelightning> I presume we are meeting now?
[11:02] <JPEW> That's the plan
[11:03] <JPEW> JaMa doesn't appear to be online, and RP is currently away
[11:03] <JPEW> I forgot to send out a reminder today
[11:04] <bluelightning> I have just pinged RP - I could also text him
[11:10] <RP> Hi, I'm here now, sorry I'm late
[11:10] <bluelightning> no worries
[11:10] <bluelightning> do we have zeddii?
[11:11] <JPEW> Not sure. He was on earlier today
[11:15] <RP> Is there an agenda?
[11:15] <RP> I must admit I got M3 built and kind of went and "collapsed" ;-)
[11:16] <JPEW> I'm not aware of anything
[11:16] <RP> I did have one item the YP TSC asked me to raise
[11:16] <RP> Sorry for not officially adding it to the wiki etc
[11:16] <zeddii> here. sorry, I was supposed to be on vacation this week, so I removed the meeting from my calendar.
[11:17] <RP> Basically, it was to ask the OC TSC to consider the resourcing situation we have and to consider what we could do about it.
[11:17] <JPEW> zeddii: No problem, we just started
[11:17] <RP> There are various bodies that are thinking about it (YP TSC, YP board, OE board) but the OE TSC probably also needs to give it some thought
[11:19] <JPEW> RP: Ya, make sense.
[11:20] <JPEW> Are there any identified reasons why people don't contribute?
[11:22] <RP> JPEW: In general the pattern seems to be employers expecting someone else to do the core work
[11:22] <RP> Some things don't have clear return on investment too
[11:22] <zeddii> agreed. and agreed.
[11:22] <JPEW> which things?
[11:23] <bluelightning> anything that is mostly refactoring I would imagine
[11:23] <RP> JPEW: build failure triage (SWAT), bug triage
[11:23] <RP> things where its day to day monitoring without direct line of sight to a problem they themselves see
[11:23] <zeddii> and even things like why a reference kernel, when they don?t use it directly.
[11:23] <RP> zeddii: right
[11:24] <RP> also, new feature development like hashequiv
[11:24] <RP> or as bluelightning says, refactoring or new architectural work
[11:25] <zeddii> yup.
[11:28] <zeddii> I assume that I either got disconnected, or we are all deep in thought.
[11:28] <JPEW> zeddii: The latter :)
[11:29] <RP> I've spent a lot of time thinking about it and I'm not sure what we can do
[11:29] <zeddii> the problem is that  only OSVs really care about ?credibility? in the community. if you know what I mean.
[11:29] <JPEW> Aside from employeer expectations, any other reasons why people don't participate?
[11:29] <RP> We have made some changes like newcomer bugs. I also need to send out some kind of summary of the challenges to the wider community. I'm still working on that
[11:30] <RP> JPEW: there is probably a knowledge barrier too
[11:30] <zeddii> I could volunteer some of my time to help someone that actually picked up a new comer bug, but I think that?s probably just a drop in the ocean.
[11:30] <RP> JPEW: even some of our regular contributors think of bitbake as a blackbox, you're one of the few who doesn't
[11:30] <JPEW> zeddii: Not necessarily if you can help someone get interested, it pays dividends :)
[11:31] <RP> zeddii: lots of small things do grow over time, I am trying to encourage people. Not all will work out but its great to see when people do grow
[11:32] <zeddii> that?s what I was wondering, are none of them being picked up, since newcomers don?t know where to start. maybe pairing them up with someone to office advice can help. but maybe that  has already been tried (and yes, I know that pulls more time from people that don?t have it, etc).
[11:32] <zeddii> I?m throwing my hat into the ring for that. but that implies someone is looking for that kind of help.
[11:32] <JPEW> zeddii: That's a good idea. I'd be willing to advise someone fixing a bug also (newcomer or otherwise)
[11:32] <RP> zeddii: we're seeing poor take up despite what I thought was a good spectrum of bugs there
[11:33] <JPEW> Perhaps more of a visibility problem?
[11:33] <RP> I would note that the we lack YP advocacy people atm too :(
[11:33] <RP> visibility is definitely part of it
[11:34] <JPEW> It's hard being on the inside looking out and trying to figure out how visible you are sometimes
[11:34] <bluelightning> the newcomer doc on the YP wiki is pretty good I think, but that assumes people find that
[11:35] <bluelightning> I did just get to it by googling "yocto project contribute"
[11:36] <JPEW> Hmm, is it pretty easy to identify new contributers on the ML?
[11:37] <RP> JPEW: for a person or for a machine?
[11:38] <JPEW> person (email address)
[11:38] <zeddii> I?m thinking more of companies that use OE, not end users. since getting contributions from each category is quite a different thing.
[11:40] <JPEW> zeddii: Sure, but having people in the company that are involved anyway helps
[11:40] <JPEW> sometimes :eyeroll:
[11:40] <RP> JPEW: I mean its easy for a computer to look at an email and see if they've had a patch merged before
[11:42] <JPEW> RP: Right. Would it be bad form to send them a message "welcome to the community" message? I've not been doing OSS very long, so I don't know all the edicate
[11:42] <JPEW> Thanks for your patch! Here's some other ways you can get involved...
[11:42] <RP> JPEW: if they were new to OE but an experienced OSS contributor it may seem patronising :/
[11:42] <bluelightning> I think it might be nice - you could include "if you don't get a reply in x days here's what to do"
[11:43] <bluelightning> I wouldn't find it patronising if I was joining a new project, others may differ possibly
[11:43] <bluelightning> I know I've struggled when joining other projects, people sort of expect you to know what to do / where to look and that's not always easy even if you're experienced with OSS, every project is different
[11:44] <zeddii> yah. is it a get started issue, credit issue, or lack of mapping to ROI issue .. hard to say, since we don?t even have that info :(
[11:45] <JPEW> zeddii: Hard to operate effectively without data
[11:45] <RP> I don't have an objection to it
[11:45] <JPEW> When do the other TSC's meet
[11:46] <RP> By the time they sent a contribution they're already part way there though, we may need to find new contributors as well
[11:46] <RP> JPEW: you mean the YP TSC?
[11:46] <JPEW> Ya
[11:47] <RP> zeddii: the "data" I have says all the above
[11:47] <zeddii> I jokingly say that with all of the users of OE, and a fairly narrow set of contributors, I assume that means that they have no issues. which I can?t imagine is the case.
[11:47] <RP> JPEW: YP TSC meets after the engineering sync tomorrow
[11:47] <RP> zeddii: most of my data is reading the mailing lists and social media posts from users, new and experienced
[11:49] <JPEW> OK. Maybe we can draft up a skeleton e-mail and all look it over (maybe the YP TSC too)
[11:49] <zeddii> non-corporate contributions are hard to capture, since they are likely elsewhere for many high level applications.
[11:50] <RP> JPEW: another thing may be a "your patch has merged" email from patchwork
[11:50] <JPEW> RP: Ya that would be good too
[11:50] <zeddii> I mean, it would be nice if we went to openembedded.org and saw some logo?s, but I suppose that collides with YP very quickly. and you get a logo if you have a patch in the release ;)
[11:51] <RP> I also have no objection to that but it needs someone else to own and drive it
[11:51] <zeddii> that @gmail.com company could get a big logo!
[11:51] <bluelightning> patch merged reports was something that was supposed to be added to patchwork a long time ago, unfortunately due to various reasons it never got done :/
[11:51] <RP> bluelightning: one idea that did get talked about but probably ironically, not with you was a list of contributors to the release
[11:52] <bluelightning> hmm, yes, I think maybe it did get mentioned somewhere
[11:52] <zeddii> I thought it was a good idea, since then large and small could see their name in ?print? along with a release.
[11:52] <RP> (ironically as bluelightning ends up writing the release notes)
[11:52] <zeddii> but again, time. I can help with that when the time comes.
[11:53] <bluelightning> at least as far as commits go there are various git stats analysis tools that might be helpful (and don't involve us writing additional code)
[11:53] <RP> zeddii: the time for that one is now, release is in weeks!
[11:53] <bluelightning> although yes it would be good to have the info actually in the notes... that should be pretty easy for me to do
[11:53] <zeddii> I mean, I get an email from the kernel once and a while trying to figure out who I work for, since @gmail.com ?. so there?s some mappings that can be done on that front as well.
[11:54] <RP> bluelightning: you can integrate if someone helps too! :)
[11:54] <zeddii> bluelightning: if there?s something you think I can do for that, I can help.
[11:54] <bluelightning> zeddii: thanks - I'll keep that in mind
[11:55] <zeddii> I?ll go look at the other release notes to see if I can think of anything else that might be interesting to add.
[11:55] <zeddii> i.e. if a release mentioned some steps forward in a vertical that interested some companies, they might be interested to help more in the future, etc. hard to say if its even possible to do that, but its an idea.
[11:58] <JPEW> There might be more we could do at conferences and such also... although thats not useful in the short term
[11:59] <RP> some kind of metrics/lists focused on "first contributions from" might be interesting
[12:03] <JPEW> Any other topics?
[12:03] <RP> Not from me
[12:03] <JPEW> I'll put this one on the list for next month so we can see if there are any more ideas in the meantime
[12:04] <JPEW> And I'll try to draft some example e-mails
[12:04] <RP> If people do have ideas, please do feel free to share. I think the project has some challenges ahead (as does the world at large atm :( )
[12:06] <JPEW> OK, supper time for me.
[12:06] <JPEW> Bye all
[12:07] <bluelightning> I'll send out the minutes
[12:08] <JPEW> Thanks. Don't forget to link on the wiki: https://www.openembedded.org/wiki/TSC
[12:08] <bluelightning> ah yes thanks for the reminder, I think I missed that the last couple of times
[12:09] <RP> Thanks all!




From wangmy at cn.fujitsu.com  Tue Mar 17 06:13:50 2020
From: wangmy at cn.fujitsu.com (Wang, Mingyu)
Date: Tue, 17 Mar 2020 06:13:50 +0000
Subject: [oe] [meta-oe][zeus][PATCH] php: CVE-2019-11045.patch
 CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch
In-Reply-To: <5787a0ee-36c6-16d3-e440-4b063a7e3522@gmail.com>
References: <1584097824-54462-1-git-send-email-wangmy@cn.fujitsu.com>
	<1584097824-54462-3-git-send-email-wangmy@cn.fujitsu.com>
	<5787a0ee-36c6-16d3-e440-4b063a7e3522@gmail.com>
Message-ID: <7dc7e3aa6752477db4c7725a1985053f@G08CNEXMBPEKD05.g08.fujitsu.local>

>> References:
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050
> are these fixes in master?
These problems also need to be fixed in master. I will submit a patch later.

-----Original Message-----
From: openembedded-devel-bounces at lists.openembedded.org [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of akuster808
Sent: Friday, March 13, 2020 11:39 PM
To: openembedded-devel at lists.openembedded.org
Subject: Re: [oe] [meta-oe][zeus][PATCH] php: CVE-2019-11045.patch CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch



On 3/13/20 4:10 AM, Wang Mingyu wrote:
> Security Advisory
>
> References:
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050

are these fixes in master?
>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  .../php/php/CVE-2019-11045.patch              | 78 +++++++++++++++++++
>  .../php/php/CVE-2019-11046.patch              | 59 ++++++++++++++
>  .../php/php/CVE-2019-11047.patch              | 57 ++++++++++++++
>  .../php/php/CVE-2019-11050.patch              | 53 +++++++++++++
>  meta-oe/recipes-devtools/php/php_7.3.9.bb     |  4 +
>  5 files changed, 251 insertions(+)
>  create mode 100644 
> meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
>  create mode 100644 
> meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
>  create mode 100644 
> meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
>  create mode 100644 
> meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
>
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch 
> b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
> new file mode 100644
> index 000000000..3b3c187a4
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
> @@ -0,0 +1,78 @@
> +From a5a15965da23c8e97657278fc8dfbf1dfb20c016 Mon Sep 17 00:00:00 
> +2001
> +From: "Christoph M. Becker" <cmbecker69 at gmx.de>
> +Date: Mon, 25 Nov 2019 16:56:34 +0100
> +Subject: [PATCH] Fix #78863: DirectoryIterator class silently 
> +truncates after  a null byte
> +
> +Since the constructor of DirectoryIterator and friends is supposed to 
> +accepts paths (i.e. strings without NUL bytes), we must not accept 
> +arbitrary strings.
> +
> +Upstream-Status: Accepted
Accepted mean you sent the fix upstream and they took it.
is this a "Backport"

Missing "Signed-off-by: "

> +CVE: CVE-2019-11045
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=a5a15965da23c8e97657278f
> +c8dfbf1dfb20c016
> +http://git.php.net/?p=php-src.git;a=commit;h=d74907b8575e6edb83b728c2
> +a94df434c23e1f79
> +---
> + ext/spl/spl_directory.c     |  4 ++--
> + ext/spl/tests/bug78863.phpt | 31 +++++++++++++++++++++++++++++++
> + 2 files changed, 33 insertions(+), 2 deletions(-)  create mode 
> +100644 ext/spl/tests/bug78863.phpt
> +
> +diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 
> +91ea2e0265..56e809b1c7 100644
> +--- a/ext/spl/spl_directory.c
> ++++ b/ext/spl/spl_directory.c
> +@@ -708,10 +708,10 @@ void 
> +spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, 
> +zend_long cto
> + 
> + 	if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_FLAGS)) {
> + 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO;
> +-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &path, &len, &flags);
> ++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &path, 
> ++&len, &flags);
> + 	} else {
> + 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
> +-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &len);
> ++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &len);
> + 	}
> + 	if (SPL_HAS_FLAG(ctor_flags, SPL_FILE_DIR_SKIPDOTS)) {
> + 		flags |= SPL_FILE_DIR_SKIPDOTS;
> +diff --git a/ext/spl/tests/bug78863.phpt 
> +b/ext/spl/tests/bug78863.phpt new file mode 100644 index 
> +0000000000..dc88d98dee
> +--- /dev/null
> ++++ b/ext/spl/tests/bug78863.phpt
> +@@ -0,0 +1,31 @@
> ++--TEST--
> ++Bug #78863 (DirectoryIterator class silently truncates after a null 
> ++byte)
> ++--FILE--
> ++<?php
> ++$dir = __DIR__ . '/bug78863';
> ++mkdir($dir);
> ++touch("$dir/bad");
> ++mkdir("$dir/sub");
> ++touch("$dir/sub/good");
> ++
> ++$it = new DirectoryIterator(__DIR__ . "/bug78863\0/sub"); foreach 
> ++($it as $fileinfo) {
> ++    if (!$fileinfo->isDot()) {
> ++        var_dump($fileinfo->getFilename());
> ++    }
> ++}
> ++?>
> ++--EXPECTF--
> ++Fatal error: Uncaught UnexpectedValueException: 
> ++DirectoryIterator::__construct() expects parameter 1 to be a valid path, string given in %s:%d Stack trace:
> ++#0 %s(%d): DirectoryIterator->__construct('%s')
> ++#1 {main}
> ++  thrown in %s on line %d
> ++--CLEAN--
> ++<?php
> ++$dir = __DIR__ . '/bug78863';
> ++unlink("$dir/sub/good");
> ++rmdir("$dir/sub");
> ++unlink("$dir/bad");
> ++rmdir($dir);
> ++?>
> +--
> +2.11.0
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch 
> b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
> new file mode 100644
> index 000000000..711b8525a
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
> @@ -0,0 +1,59 @@
> +From 2d07f00b73d8f94099850e0f5983e1cc5817c196 Mon Sep 17 00:00:00 
> +2001
> +From: "Christoph M. Becker" <cmbecker69 at gmx.de>
> +Date: Sat, 30 Nov 2019 12:26:37 +0100
> +Subject: [PATCH] Fix #78878: Buffer underflow in bc_shift_addsub
> +
> +We must not rely on `isdigit()` to detect digits, since we only 
> +support decimal ASCII digits in the following processing.
> +
> +(cherry picked from commit eb23c6008753b1cdc5359dead3a096dce46c9018)
> +
> +Upstream-Status: Accepted
> +CVE: CVE-2019-11046
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=eb23c6008753b1cdc5359dea
> +d3a096dce46c9018
> +http://git.php.net/?p=php-src.git;a=commit;h=2d07f00b73d8f94099850e0f
> +5983e1cc5817c196
> +---
> + ext/bcmath/libbcmath/src/str2num.c |  4 ++--
> + ext/bcmath/tests/bug78878.phpt     | 13 +++++++++++++
> + 2 files changed, 15 insertions(+), 2 deletions(-)  create mode 
> +100644 ext/bcmath/tests/bug78878.phpt
> +
> +diff --git a/ext/bcmath/libbcmath/src/str2num.c 
> +b/ext/bcmath/libbcmath/src/str2num.c
> +index f38d341570..03aec15930 100644
> +--- a/ext/bcmath/libbcmath/src/str2num.c
> ++++ b/ext/bcmath/libbcmath/src/str2num.c
> +@@ -57,9 +57,9 @@ bc_str2num (bc_num *num, char *str, int scale)
> +   zero_int = FALSE;
> +   if ( (*ptr == '+') || (*ptr == '-'))  ptr++;  /* Sign */
> +   while (*ptr == '0') ptr++;			/* Skip leading zeros. */
> +-  while (isdigit((int)*ptr)) ptr++, digits++;	/* digits */
> ++  while (*ptr >= '0' && *ptr <= '9') ptr++, digits++;	/* digits */
> +   if (*ptr == '.') ptr++;			/* decimal point */
> +-  while (isdigit((int)*ptr)) ptr++, strscale++;	/* digits */
> ++  while (*ptr >= '0' && *ptr <= '9') ptr++, strscale++;	/* digits */
> +   if ((*ptr != '\0') || (digits+strscale == 0))
> +     {
> +       *num = bc_copy_num (BCG(_zero_)); diff --git 
> +a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt new 
> +file mode 100644 index 0000000000..2c9d72b946
> +--- /dev/null
> ++++ b/ext/bcmath/tests/bug78878.phpt
> +@@ -0,0 +1,13 @@
> ++--TEST--
> ++Bug #78878 (Buffer underflow in bc_shift_addsub)
> ++--SKIPIF--
> ++<?php
> ++if (!extension_loaded('bcmath')) die('skip bcmath extension not 
> ++available'); ?>
> ++--FILE--
> ++<?php
> ++print @bcmul("\xB26483605105519922841849335928742092", bcpowmod(2, 
> ++65535, -4e-4)); ?>
> ++--EXPECT--
> ++bc math warning: non-zero scale in modulus
> ++0
> +--
> +2.11.0
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch 
> b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
> new file mode 100644
> index 000000000..e2922bf8f
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
> @@ -0,0 +1,57 @@
> +From d348cfb96f2543565691010ade5e0346338be5a7 Mon Sep 17 00:00:00 
> +2001
> +From: Stanislav Malyshev <stas at php.net>
> +Date: Mon, 16 Dec 2019 00:10:39 -0800
> +Subject: [PATCH] Fixed bug #78910
> +
> +Upstream-Status: Accepted
> +CVE-2019-11047
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=d348cfb96f2543565691010a
> +de5e0346338be5a7 
> +http://git.php.net/?p=php-src.git;a=commit;h=57325460d2bdee01a13d8e6c
> +f03345c90543ff4f
> +---
> + ext/exif/exif.c              |  3 ++-
> + ext/exif/tests/bug78910.phpt | 17 +++++++++++++++++
> + 2 files changed, 19 insertions(+), 1 deletion(-)  create mode 100644 
> +ext/exif/tests/bug78910.phpt
> +
> +diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 
> +2804807e..a5780113 100644
> +--- a/ext/exif/exif.c
> ++++ b/ext/exif/exif.c
> +@@ -3138,7 +3138,8 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
> + 		/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s)", maker_note->make?maker_note->make:"");*/
> + 		if (maker_note->make && (!ImageInfo->make || strcmp(maker_note->make, ImageInfo->make)))
> + 			continue;
> +-		if (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
> ++		if (maker_note->id_string && value_len >= maker_note->id_string_len
> ++				&& strncmp(maker_note->id_string, value_ptr, 
> ++maker_note->id_string_len))
> + 			continue;
> + 		break;
> + 	}
> +diff --git a/ext/exif/tests/bug78910.phpt 
> +b/ext/exif/tests/bug78910.phpt new file mode 100644 index 
> +00000000..f5b1c32c
> +--- /dev/null
> ++++ b/ext/exif/tests/bug78910.phpt
> +@@ -0,0 +1,17 @@
> ++--TEST--
> ++Bug #78910: Heap-buffer-overflow READ in exif (OSS-Fuzz #19044)
> ++--FILE--
> ++<?php
> ++
> ++var_dump(exif_read_data('data:image/jpg;base64,TU0AKgAAAAwgICAgAAIBD
> ++wAEAAAAAgAAACKSfCAgAAAAAEZVSklGSUxN'));
> ++
> ++?>
> ++--EXPECTF--
> ++Notice: exif_read_data(): Read from TIFF: tag(0x927C, MakerNote  ): 
> ++Illegal format code 0x2020, switching to BYTE in %s on line %d
> ++
> ++Warning: exif_read_data(): Process tag(x927C=MakerNote  ): Illegal 
> ++format code 0x2020, suppose BYTE in %s on line %d
> ++
> ++Warning: exif_read_data(): IFD data too short: 0x0000 offset 0x000C 
> ++in %s on line %d
> ++
> ++Warning: exif_read_data(): Invalid TIFF file in %s on line %d
> ++bool(false)
> +--
> +2.17.1
> +
> diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch 
> b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
> new file mode 100644
> index 000000000..700b99bd9
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
> @@ -0,0 +1,53 @@
> +From c14eb8de974fc8a4d74f3515424c293bc7a40fba Mon Sep 17 00:00:00 
> +2001
> +From: Stanislav Malyshev <stas at php.net>
> +Date: Mon, 16 Dec 2019 01:14:38 -0800
> +Subject: [PATCH] Fix bug #78793
> +
> +Upstream-Status: Accepted
> +CVE-2019-11050
> +   
> +Reference to upstream patch:
> +http://git.php.net/?p=php-src.git;a=commit;h=c14eb8de974fc8a4d74f3515
> +424c293bc7a40fba
> +http://git.php.net/?p=php-src.git;a=commit;h=1b3b4a0d367b6f0b67e9f73d
> +82f53db6c6b722b2
> +---
> + ext/exif/exif.c              |  5 +++--
> + ext/exif/tests/bug78793.phpt | 12 ++++++++++++
> + 2 files changed, 15 insertions(+), 2 deletions(-)  create mode 
> +100644 ext/exif/tests/bug78793.phpt
> +
> +diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 
> +c0be05922f..7fe055f381 100644
> +--- a/ext/exif/exif.c
> ++++ b/ext/exif/exif.c
> +@@ -3240,8 +3240,9 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
> + 	}
> + 
> + 	for (de=0;de<NumDirEntries;de++) {
> +-		if (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,
> +-								  offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {
> ++		size_t offset = 2 + 12 * de;
> ++		if (!exif_process_IFD_TAG(ImageInfo, dir_start + offset,
> ++								  offset_base, data_len - offset, displacement, 
> ++section_index, 0, maker_note->tag_table)) {
> + 			return FALSE;
> + 		}
> + 	}
> +diff --git a/ext/exif/tests/bug78793.phpt 
> +b/ext/exif/tests/bug78793.phpt new file mode 100644 index 
> +0000000000..033f255ace
> +--- /dev/null
> ++++ b/ext/exif/tests/bug78793.phpt
> +@@ -0,0 +1,12 @@
> ++--TEST--
> ++Bug #78793: Use-after-free in exif parsing under memory sanitizer
> ++--FILE--
> ++<?php
> ++$f = "ext/exif/tests/bug77950.tiff"; for ($i = 0; $i < 10; $i++) {
> ++    @exif_read_data($f);
> ++}
> ++?>
> ++===DONE===
> ++--EXPECT--
> ++===DONE===
> +--
> +2.11.0
> diff --git a/meta-oe/recipes-devtools/php/php_7.3.9.bb 
> b/meta-oe/recipes-devtools/php/php_7.3.9.bb
> index e886cb1a2..670c3321c 100644
> --- a/meta-oe/recipes-devtools/php/php_7.3.9.bb
> +++ b/meta-oe/recipes-devtools/php/php_7.3.9.bb
> @@ -9,6 +9,10 @@ SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
>              file://debian-php-fixheader.patch \
>              file://CVE-2019-6978.patch \
>              file://CVE-2019-11043.patch \
> +            file://CVE-2019-11045.patch \
> +            file://CVE-2019-11046.patch \
> +            file://CVE-2019-11047.patch \
> +            file://CVE-2019-11050.patch \
>             "
>  SRC_URI_append_class-target = " \
>                                  file://pear-makefile.patch \

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel





From wangmy at cn.fujitsu.com  Tue Mar 17 12:11:58 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Tue, 17 Mar 2020 05:11:58 -0700
Subject: [oe] [meta-networking][PATCH] spice-protocol: upgrade 0.14.0 ->
	0.14.1
Message-ID: <1584447118-6255-1-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 meta-networking/recipes-support/spice/spice-protocol_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-support/spice/spice-protocol_git.bb b/meta-networking/recipes-support/spice/spice-protocol_git.bb
index 966ca41c9..1d56bea17 100644
--- a/meta-networking/recipes-support/spice/spice-protocol_git.bb
+++ b/meta-networking/recipes-support/spice/spice-protocol_git.bb
@@ -13,9 +13,9 @@ architectures."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b37311cb5604f3e5cc2fb0fd23527e95"
 
-PV = "0.14.0+git${SRCPV}"
+PV = "0.14.1+git${SRCPV}"
 
-SRCREV = "f72ece993aeaf23f77e2845562b20e5563e52ba0"
+SRCREV = "e0ec178a72aa33e307ee5ac02b63bf336da921a5"
 
 SRC_URI = " \
     git://anongit.freedesktop.org/spice/spice-protocol \
-- 
2.17.1




From wenlin.kang at windriver.com  Tue Mar 17 14:41:19 2020
From: wenlin.kang at windriver.com (Wenlin Kang)
Date: Tue, 17 Mar 2020 07:41:19 -0700
Subject: [oe] [meta-oe][zeus][PATCH] ipmitool: fix CVE-2020-5208
Message-ID: <20200317144119.97477-1-wenlin.kang@windriver.com>

Fix CVE-2020-5208

Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
---
 ...-Fix-buffer-overflow-vulnerabilities.patch | 133 ++++++++++++++++
 ...uffer-overflow-in-ipmi_spd_print_fru.patch |  53 +++++++
 ...er-overflow-in-ipmi_get_session_info.patch |  53 +++++++
 .../0004-channel-Fix-buffer-overflow.patch    |  69 +++++++++
 ...er-overflows-in-get_lan_param_select.patch |  94 ++++++++++++
 ...u-sdr-Fix-id_string-buffer-overflows.patch | 142 ++++++++++++++++++
 .../ipmitool/ipmitool_1.8.18.bb               |   6 +
 7 files changed, 550 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0002-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0003-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0004-channel-Fix-buffer-overflow.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0005-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0006-fru-sdr-Fix-id_string-buffer-overflows.patch

diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch
new file mode 100644
index 000000000..aeb0da80e
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch
@@ -0,0 +1,133 @@
+From 2542bade29c192370ca897eab67c40f27b8912f8 Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Wed, 12 Feb 2020 12:32:00 +0800
+Subject: [PATCH 1/6] fru: Fix buffer overflow vulnerabilities
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `read_fru_area_section` function only performs size validation of
+requested read size, and falsely assumes that the IPMI message will not
+respond with more than the requested amount of data; it uses the
+unvalidated response size to copy into `frubuf`. If the response is
+larger than the request, this can result in overflowing the buffer.
+
+The same issue affects the `read_fru_area` function.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2]
+CVE: CVE-2020-5208
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/ipmi_fru.c | 33 +++++++++++++++++++++++++++++++--
+ 1 file changed, 31 insertions(+), 2 deletions(-)
+
+diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
+index cf00eff..af99aa9 100644
+--- a/lib/ipmi_fru.c
++++ b/lib/ipmi_fru.c
+@@ -615,7 +615,10 @@ int
+ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 			uint32_t offset, uint32_t length, uint8_t *frubuf)
+ {
+-	uint32_t off = offset, tmp, finish;
++	uint32_t off = offset;
++	uint32_t tmp;
++	uint32_t finish;
++	uint32_t size_left_in_buffer;
+ 	struct ipmi_rs * rsp;
+ 	struct ipmi_rq req;
+ 	uint8_t msg_data[4];
+@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 
+ 	finish = offset + length;
+ 	if (finish > fru->size) {
++		memset(frubuf + fru->size, 0, length - fru->size);
+ 		finish = fru->size;
+ 		lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
+ 			"Adjusting to %d",
+ 			offset + length, finish - offset);
++		length = finish - offset;
+ 	}
+ 
+ 	memset(&req, 0, sizeof(req));
+@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 		}
+ 	}
+ 
++	size_left_in_buffer = length;
+ 	do {
+ 		tmp = fru->access ? off >> 1 : off;
+ 		msg_data[0] = id;
+@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 		}
+ 
+ 		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
++		if(rsp->data_len < 1
++		   || tmp > rsp->data_len - 1
++		   || tmp > size_left_in_buffer)
++		{
++			printf(" Not enough buffer size");
++			return -1;
++		}
++
+ 		memcpy(frubuf, rsp->data + 1, tmp);
+ 		off += tmp;
+ 		frubuf += tmp;
++		size_left_in_buffer -= tmp;
+ 		/* sometimes the size returned in the Info command
+ 		* is too large.  return 0 so higher level function
+ 		* still attempts to parse what was returned */
+@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 			uint32_t offset, uint32_t length, uint8_t *frubuf)
+ {
+ 	static uint32_t fru_data_rqst_size = 20;
+-	uint32_t off = offset, tmp, finish;
++	uint32_t off = offset;
++	uint32_t tmp, finish;
++	uint32_t size_left_in_buffer;
+ 	struct ipmi_rs * rsp;
+ 	struct ipmi_rq req;
+ 	uint8_t msg_data[4];
+@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 
+ 	finish = offset + length;
+ 	if (finish > fru->size) {
++		memset(frubuf + fru->size, 0, length - fru->size);
+ 		finish = fru->size;
+ 		lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
+ 			"Adjusting to %d",
+ 			offset + length, finish - offset);
++		length = finish - offset;
+ 	}
+ 
+ 	memset(&req, 0, sizeof(req));
+@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 	if (fru->access && fru_data_rqst_size > 16)
+ #endif
+ 		fru_data_rqst_size = 16;
++
++	size_left_in_buffer = length;
+ 	do {
+ 		tmp = fru->access ? off >> 1 : off;
+ 		msg_data[0] = id;
+@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 		}
+ 
+ 		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
++		if(rsp->data_len < 1
++		   || tmp > rsp->data_len - 1
++		   || tmp > size_left_in_buffer)
++		{
++			printf(" Not enough buffer size");
++			return -1;
++		}
+ 		memcpy((frubuf + off)-offset, rsp->data + 1, tmp);
+ 		off += tmp;
++		size_left_in_buffer -= tmp;
+ 
+ 		/* sometimes the size returned in the Info command
+ 		* is too large.  return 0 so higher level function
+-- 
+2.23.0
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
new file mode 100644
index 000000000..50a5635a0
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
@@ -0,0 +1,53 @@
+From 16b10ba5d3a368cd0ed90e9789553c306f1136a6 Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 16:44:18 +0000
+Subject: [PATCH 2/6] fru: Fix buffer overflow in ipmi_spd_print_fru
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `ipmi_spd_print_fru` function has a similar issue as the one fixed
+by the previous commit in `read_fru_area_section`. An initial request is
+made to get the `fru.size`, which is used as the size for the allocation
+of `spd_data`. Inside a loop, further requests are performed to get the
+copy sizes which are not checked before being used as the size for a
+copy into the buffer.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/840fb1cbb4fb365cb9797300e3374d4faefcdb10]
+CVE: CVE-2020-5208
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/dimm_spd.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
+index 41e30db..68f3b4f 100644
+--- a/lib/dimm_spd.c
++++ b/lib/dimm_spd.c
+@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+ 	struct ipmi_rq req;
+ 	struct fru_info fru;
+ 	uint8_t *spd_data, msg_data[4];
+-	int len, offset;
++	uint32_t len, offset;
+ 
+ 	msg_data[0] = id;
+ 
+@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+ 		}
+ 
+ 		len = rsp->data[0];
++		if(rsp->data_len < 1
++		   || len > rsp->data_len - 1
++		   || len > fru.size - offset)
++		{
++			printf(" Not enough buffer size");
++			return -1;
++		}
+ 		memcpy(&spd_data[offset], rsp->data + 1, len);
+ 		offset += len;
+ 	} while (offset < fru.size);
+-- 
+2.23.0
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
new file mode 100644
index 000000000..6b5022533
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
@@ -0,0 +1,53 @@
+From 89621b1ce67065fb9044b73c215862fc8aef523f Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 16:51:49 +0000
+Subject: [PATCH 3/6] session: Fix buffer overflow in ipmi_get_session_info
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `ipmi_get_session_info` function does not properly check the
+response `data_len`, which is used as a copy size, allowing stack buffer
+overflow.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/41d7026946fafbd4d1ec0bcaca3ea30a6e8eed22]
+CVE: CVE-2020-5208
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/ipmi_session.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c
+index 141f0f4..b9af1fd 100644
+--- a/lib/ipmi_session.c
++++ b/lib/ipmi_session.c
+@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+ 		}
+ 		else
+ 		{
+-			memcpy(&session_info,  rsp->data, rsp->data_len);
+-			print_session_info(&session_info, rsp->data_len);
++			memcpy(&session_info,  rsp->data,
++			       __min(rsp->data_len, sizeof(session_info)));
++			print_session_info(&session_info,
++			                   __min(rsp->data_len, sizeof(session_info)));
+ 		}
+ 		break;
+ 		
+@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+ 				break;
+ 			}
+ 
+-			memcpy(&session_info,  rsp->data, rsp->data_len);
+-			print_session_info(&session_info, rsp->data_len);
++			memcpy(&session_info,  rsp->data,
++			       __min(rsp->data_len, sizeof(session_info)));
++			print_session_info(&session_info,
++			                   __min(rsp->data_len, sizeof(session_info)));
+ 			
+ 		} while (i <= session_info.session_slot_count);
+ 		break;
+-- 
+2.23.0
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-channel-Fix-buffer-overflow.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-channel-Fix-buffer-overflow.patch
new file mode 100644
index 000000000..480090b92
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-channel-Fix-buffer-overflow.patch
@@ -0,0 +1,69 @@
+From 2a84669ea0d685b4a2ccb664fa3236ec5f19a80a Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 16:56:38 +0000
+Subject: [PATCH 4/6] channel: Fix buffer overflow
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `ipmi_get_channel_cipher_suites` function does not properly check
+the final response?s `data_len`, which can lead to stack buffer overflow
+on the final copy.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/9452be87181a6e83cfcc768b3ed8321763db50e4]
+CVE: CVE-2020-5208
+
+[Make some changes to apply it]
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ include/ipmitool/ipmi_channel.h |  2 ++
+ lib/ipmi_channel.c              | 10 ++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h
+index b138c26..d7cce5e 100644
+--- a/include/ipmitool/ipmi_channel.h
++++ b/include/ipmitool/ipmi_channel.h
+@@ -77,6 +77,8 @@ struct channel_access_t {
+ 	uint8_t user_level_auth;
+ };
+ 
++#define MAX_CIPHER_SUITE_DATA_LEN 0x10
++
+ /*
+  * The Get Authentication Capabilities response structure
+  * From table 22-15 of the IPMI v2.0 spec
+diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
+index fab2e54..76ecdcd 100644
+--- a/lib/ipmi_channel.c
++++ b/lib/ipmi_channel.c
+@@ -378,7 +378,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+ 		lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+ 		return -1;
+ 	}
+-	if (rsp->ccode > 0) {
++	if (rsp->ccode
++	    || rsp->data_len < 1
++	    || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN)
++	{
+ 		lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+ 			val2str(rsp->ccode, completion_code_vals));
+ 		return -1;
+@@ -413,7 +416,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+ 			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+ 			return -1;
+ 		}
+-		if (rsp->ccode > 0) {
++		if (rsp->ccode
++		    || rsp->data_len < 1
++		    || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN)
++		{
+ 			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+ 					val2str(rsp->ccode, completion_code_vals));
+ 			return -1;
+-- 
+2.23.0
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
new file mode 100644
index 000000000..1b1dec1c1
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
@@ -0,0 +1,94 @@
+From f45e6d84b75dcd649e18c9256c136cda354de6fd Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 17:06:39 +0000
+Subject: [PATCH 5/6] lanp: Fix buffer overflows in get_lan_param_select
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `get_lan_param_select` function is missing a validation check on the
+response?s `data_len`, which it then returns to caller functions, where
+stack buffer overflow can occur.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/d45572d71e70840e0d4c50bf48218492b79c1a10]
+CVE: CVE-2020-5208
+
+[Make some changes to apply it]
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/ipmi_lanp.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
+index 65d881b..022c7f1 100644
+--- a/lib/ipmi_lanp.c
++++ b/lib/ipmi_lanp.c
+@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 		/* set new ipaddr */
+ 		memcpy(data+3, temp, 4);
+ 		printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
+@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 		/* set new macaddr */
+ 		memcpy(data+7, temp, 6);
+ 		printf("Setting LAN Alert %d MAC Address to "
+@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "def", 3) == 0 ||
+ 		    strncasecmp(argv[1], "default", 7) == 0) {
+@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "on", 2) == 0 ||
+ 		    strncasecmp(argv[1], "yes", 3) == 0) {
+@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "pet", 3) == 0) {
+ 			printf("Setting LAN Alert %d destination to PET Trap\n", alert);
+@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (str2uchar(argv[1], &data[2]) != 0) {
+ 			lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
+@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (str2uchar(argv[1], &data[3]) != 0) {
+ 			lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
+-- 
+2.23.0
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0006-fru-sdr-Fix-id_string-buffer-overflows.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0006-fru-sdr-Fix-id_string-buffer-overflows.patch
new file mode 100644
index 000000000..38ca41b68
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0006-fru-sdr-Fix-id_string-buffer-overflows.patch
@@ -0,0 +1,142 @@
+From 401b7dda5ad1beada4791d54a7e75880f2a4fc24 Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 17:13:45 +0000
+Subject: [PATCH 6/6] fru, sdr: Fix id_string buffer overflows
+
+Final part of the fixes for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+9 variants of stack buffer overflow when parsing `id_string` field of
+SDR records returned from `CMD_GET_SDR` command.
+
+SDR record structs have an `id_code` field, and an `id_string` `char`
+array.
+
+The length of `id_string` is calculated as `(id_code & 0x1f) + 1`,
+which can be larger than expected 16 characters (if `id_code = 0xff`,
+then length will be `(0xff & 0x1f) + 1 = 32`).
+
+In numerous places, this can cause stack buffer overflow when copying
+into fixed buffer of size `17` bytes from this calculated length.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/7ccea283dd62a05a320c1921e3d8d71a87772637]
+CVE: CVE-2020-5208
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/ipmi_fru.c |  2 +-
+ lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++----------------
+ 2 files changed, 25 insertions(+), 17 deletions(-)
+
+diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
+index af99aa9..98bc984 100644
+--- a/lib/ipmi_fru.c
++++ b/lib/ipmi_fru.c
+@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
+ 		return 0;
+ 
+ 	memset(desc, 0, sizeof(desc));
+-	memcpy(desc, fru->id_string, fru->id_code & 0x01f);
++	memcpy(desc, fru->id_string, __min(fru->id_code & 0x01f, sizeof(desc)));
+ 	desc[fru->id_code & 0x01f] = 0;
+ 	printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id);
+ 
+diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
+index 2a9cbe3..62aac08 100644
+--- a/lib/ipmi_sdr.c
++++ b/lib/ipmi_sdr.c
+@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
+ 		return -1;
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (sensor->id_code & 0x1f) + 1, sensor->id_string);
+ 
+ 	if (verbose) {
+ 		printf("Sensor ID              : %s (0x%x)\n",
+@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
+ 		return -1;
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (mc->id_code & 0x1f) + 1, mc->id_string);
+ 
+ 	if (verbose == 0) {
+ 		if (csv_output)
+@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
+ 	char desc[17];
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (dev->id_code & 0x1f) + 1, dev->id_string);
+ 
+ 	if (!verbose) {
+ 		if (csv_output)
+@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
+ 	char desc[17];
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (fru->id_code & 0x1f) + 1, fru->id_string);
+ 
+ 	if (!verbose) {
+ 		if (csv_output)
+@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id,
+ 
+    int rc =0;
+    char desc[17];
++   const char *id_string;
++   uint8_t id_code;
+    memset(desc, ' ', sizeof (desc));
+ 
+    switch ( type) {
+       case SDR_RECORD_TYPE_FULL_SENSOR:
+       record.full = (struct sdr_record_full_sensor *) raw;
+-      snprintf(desc, (record.full->id_code & 0x1f) +1, "%s",
+-               (const char *)record.full->id_string);
++      id_code = record.full->id_code;
++      id_string = record.full->id_string;
+       break;
++
+       case SDR_RECORD_TYPE_COMPACT_SENSOR:
+       record.compact = (struct sdr_record_compact_sensor *) raw	;
+-      snprintf(desc, (record.compact->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.compact->id_string);
++      id_code = record.compact->id_code;
++      id_string = record.compact->id_string;
+       break;
++
+       case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+       record.eventonly  = (struct sdr_record_eventonly_sensor *) raw ;
+-      snprintf(desc, (record.eventonly->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.eventonly->id_string);
+-      break;            
++      id_code = record.eventonly->id_code;
++      id_string = record.eventonly->id_string;
++      break;
++
+       case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+       record.mcloc  = (struct sdr_record_mc_locator *) raw ;
+-      snprintf(desc, (record.mcloc->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.mcloc->id_string);		
++      id_code = record.mcloc->id_code;
++      id_string = record.mcloc->id_string;
+       break;
++
+       default:
+       rc = -1;
+-      break;
+-   }   
++   }
++   if (!rc) {
++       snprintf(desc, sizeof(desc), "%.*s", (id_code & 0x1f) + 1, id_string);
++   }
+ 
+-      lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
++   lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
+    return rc;
+ }
+ 
+-- 
+2.23.0
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
index b7f1aa914..16dbcb291 100644
--- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
@@ -24,6 +24,12 @@ DEPENDS = "openssl readline ncurses"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2 \
            file://0001-Migrate-to-openssl-1.1.patch \
+           file://0001-fru-Fix-buffer-overflow-vulnerabilities.patch \
+           file://0002-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch \
+           file://0003-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch \
+           file://0004-channel-Fix-buffer-overflow.patch \
+           file://0005-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch \
+           file://0006-fru-sdr-Fix-id_string-buffer-overflows.patch \
            "
 SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3"
 SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01"
-- 
2.23.0


From akuster808 at gmail.com  Tue Mar 17 14:48:47 2020
From: akuster808 at gmail.com (akuster808)
Date: Tue, 17 Mar 2020 07:48:47 -0700
Subject: [oe] zeus pull request
Message-ID: <c68254db-aa96-df47-7b86-179bab336393@gmail.com>

The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:

? fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)

are available in the Git repository at:

? https://git.openembedded.org/meta-openembedded zeus-next

for you to fetch changes up to 9e60d30669a2ad0598e9abf0cd15ee06b523986b:

? sanlock: Replace cp -a with cp -R --no-dereference (2020-03-15
13:30:34 -0700)

----------------------------------------------------------------
Adrian Bunk (1):
????? wireshark: Upgrade 3.0.6 -> 3.0.8

Carlos Rafael Giani (1):
????? opencv: Enable pkg-config .pc file generation

Khem Raj (2):
????? ade: Fix install paths in multilib builds
????? sanlock: Replace cp -a with cp -R --no-dereference

Martin Jansa (1):
????? s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath,
wmiconfig: use git fetcher instead of svn fetcher

Mike Krupicka (1):
????? mosquitto: Use mosquitto.init for daemon init

Paul Barker (1):
????? lmsensors: Fix sensord dependencies

Peter Kjellerstedt (2):
????? lvm2, libdevmapper: Do not patch configure
????? libldb: Do not require the "pam" distro feature to be enabled

Ross Burton (4):
????? opencv: don't download during configure
????? opencv: also download face alignment data in do_fetch()
????? opencv: PACKAGECONFIG for G-API, use system ADE
????? opencv: abort configure if we need to download

?.../mosquitto/files/mosquitto.init???????????????? |? 2 +-
?.../recipes-support/libldb/libldb_1.5.6.bb???????? |? 3 +-
?.../{wireshark_3.0.6.bb => wireshark_3.0.8.bb}???? |? 4 +-
?meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb? |? 3 +-
?...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51
++++++++++++++++++++++
?meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb? |? 4 +-
?...configure-Fix-setting-of-CLDFLAGS-default.patch | 34 +--------------
?...NUInstallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++
?meta-oe/recipes-support/opencv/ade_0.1.1f.bb?????? |? 1 +
?.../recipes-support/opencv/opencv/download.patch?? | 32 ++++++++++++++
?meta-oe/recipes-support/opencv/opencv_4.1.0.bb???? | 32 ++++++++++++--
?.../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb}?? |? 7 ++-
?.../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb}?? |? 6 +--
?...x-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++--
?.../usbpath/{usbpath_svn.bb => usbpath_git.bb}???? | 10 ++---
?.../{wmiconfig_svn.bb => wmiconfig_git.bb}???????? | 13 +++---
?16 files changed, 183 insertions(+), 69 deletions(-)
?rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb =>
wireshark_3.0.8.bb} (95%)
?create mode 100644
meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
?create mode 100644
meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
?create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
?rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb
=> s3c24xx-gpio_git.bb} (73%)
?rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb
=> s3c64xx-gpio_git.bb} (74%)
?rename
meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb
=> sjf2410-linux-native_git.bb} (72%)
?rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb =>
usbpath_git.bb} (68%)
?rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb =>
wmiconfig_git.bb} (58%)


From pbarker at konsulko.com  Tue Mar 17 15:04:05 2020
From: pbarker at konsulko.com (Paul Barker)
Date: Tue, 17 Mar 2020 15:04:05 +0000
Subject: [oe] zeus pull request
In-Reply-To: <c68254db-aa96-df47-7b86-179bab336393@gmail.com>
References: <c68254db-aa96-df47-7b86-179bab336393@gmail.com>
Message-ID: <20200317150405.578ddb5f@ub1910>

On Tue, 17 Mar 2020 07:48:47 -0700
akuster808 <akuster808 at gmail.com> wrote:

> The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
> 
> ? fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
> 
> are available in the Git repository at:
> 
> ? https://git.openembedded.org/meta-openembedded zeus-next
> 
> for you to fetch changes up to 9e60d30669a2ad0598e9abf0cd15ee06b523986b:
> 
> ? sanlock: Replace cp -a with cp -R --no-dereference (2020-03-15
> 13:30:34 -0700)
> 
> ----------------------------------------------------------------
> Adrian Bunk (1):
> ????? wireshark: Upgrade 3.0.6 -> 3.0.8
> 
> Carlos Rafael Giani (1):
> ????? opencv: Enable pkg-config .pc file generation
> 
> Khem Raj (2):
> ????? ade: Fix install paths in multilib builds
> ????? sanlock: Replace cp -a with cp -R --no-dereference
> 
> Martin Jansa (1):
> ????? s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath,
> wmiconfig: use git fetcher instead of svn fetcher
> 
> Mike Krupicka (1):
> ????? mosquitto: Use mosquitto.init for daemon init
> 
> Paul Barker (1):
> ????? lmsensors: Fix sensord dependencies
> 
> Peter Kjellerstedt (2):
> ????? lvm2, libdevmapper: Do not patch configure
> ????? libldb: Do not require the "pam" distro feature to be enabled
> 
> Ross Burton (4):
> ????? opencv: don't download during configure
> ????? opencv: also download face alignment data in do_fetch()
> ????? opencv: PACKAGECONFIG for G-API, use system ADE
> ????? opencv: abort configure if we need to download
> 
> ?.../mosquitto/files/mosquitto.init???????????????? |? 2 +-
> ?.../recipes-support/libldb/libldb_1.5.6.bb???????? |? 3 +-
> ?.../{wireshark_3.0.6.bb => wireshark_3.0.8.bb}???? |? 4 +-
> ?meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb? |? 3 +-
> ?...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51
> ++++++++++++++++++++++
> ?meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb? |? 4 +-
> ?...configure-Fix-setting-of-CLDFLAGS-default.patch | 34 +--------------
> ?...NUInstallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++
> ?meta-oe/recipes-support/opencv/ade_0.1.1f.bb?????? |? 1 +
> ?.../recipes-support/opencv/opencv/download.patch?? | 32 ++++++++++++++
> ?meta-oe/recipes-support/opencv/opencv_4.1.0.bb???? | 32 ++++++++++++--
> ?.../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb}?? |? 7 ++-
> ?.../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb}?? |? 6 +--
> ?...x-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++--
> ?.../usbpath/{usbpath_svn.bb => usbpath_git.bb}???? | 10 ++---
> ?.../{wmiconfig_svn.bb => wmiconfig_git.bb}???????? | 13 +++---
> ?16 files changed, 183 insertions(+), 69 deletions(-)
> ?rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb =>
> wireshark_3.0.8.bb} (95%)
> ?create mode 100644
> meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
> ?create mode 100644
> meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
> ?create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
> ?rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb
> => s3c24xx-gpio_git.bb} (73%)
> ?rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb
> => s3c64xx-gpio_git.bb} (74%)
> ?rename
> meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb
> => sjf2410-linux-native_git.bb} (72%)
> ?rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb =>
> usbpath_git.bb} (68%)
> ?rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb =>
> wmiconfig_git.bb} (58%)
> 

Could we also consider backport of:

kernel-yocto.bbclass: Support config fragments with externalsrc (44f04c03)
perf: Fix externalsrc support (eab605ba)
kernelsrc.bbclass: Fix externalsrc support (2c17d35c)

Thanks,

-- 
Paul Barker
Konsulko Group

From akuster808 at gmail.com  Tue Mar 17 15:12:54 2020
From: akuster808 at gmail.com (akuster808)
Date: Tue, 17 Mar 2020 08:12:54 -0700
Subject: [oe] zeus pull request
In-Reply-To: <20200317150405.578ddb5f@ub1910>
References: <c68254db-aa96-df47-7b86-179bab336393@gmail.com>
	<20200317150405.578ddb5f@ub1910>
Message-ID: <8b1a37c0-ec84-6989-459a-d55c739c055c@gmail.com>



On 3/17/20 8:04 AM, Paul Barker wrote:
> On Tue, 17 Mar 2020 07:48:47 -0700
> akuster808 <akuster808 at gmail.com> wrote:
>
>> The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
>>
>> ? fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
>>
>> are available in the Git repository at:
>>
>> ? https://git.openembedded.org/meta-openembedded zeus-next
>>
>> for you to fetch changes up to 9e60d30669a2ad0598e9abf0cd15ee06b523986b:
>>
>> ? sanlock: Replace cp -a with cp -R --no-dereference (2020-03-15
>> 13:30:34 -0700)
>>
>> ----------------------------------------------------------------
>> Adrian Bunk (1):
>> ????? wireshark: Upgrade 3.0.6 -> 3.0.8
>>
>> Carlos Rafael Giani (1):
>> ????? opencv: Enable pkg-config .pc file generation
>>
>> Khem Raj (2):
>> ????? ade: Fix install paths in multilib builds
>> ????? sanlock: Replace cp -a with cp -R --no-dereference
>>
>> Martin Jansa (1):
>> ????? s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath,
>> wmiconfig: use git fetcher instead of svn fetcher
>>
>> Mike Krupicka (1):
>> ????? mosquitto: Use mosquitto.init for daemon init
>>
>> Paul Barker (1):
>> ????? lmsensors: Fix sensord dependencies
>>
>> Peter Kjellerstedt (2):
>> ????? lvm2, libdevmapper: Do not patch configure
>> ????? libldb: Do not require the "pam" distro feature to be enabled
>>
>> Ross Burton (4):
>> ????? opencv: don't download during configure
>> ????? opencv: also download face alignment data in do_fetch()
>> ????? opencv: PACKAGECONFIG for G-API, use system ADE
>> ????? opencv: abort configure if we need to download
>>
>> ?.../mosquitto/files/mosquitto.init???????????????? |? 2 +-
>> ?.../recipes-support/libldb/libldb_1.5.6.bb???????? |? 3 +-
>> ?.../{wireshark_3.0.6.bb => wireshark_3.0.8.bb}???? |? 4 +-
>> ?meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb? |? 3 +-
>> ?...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51
>> ++++++++++++++++++++++
>> ?meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb? |? 4 +-
>> ?...configure-Fix-setting-of-CLDFLAGS-default.patch | 34 +--------------
>> ?...NUInstallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++
>> ?meta-oe/recipes-support/opencv/ade_0.1.1f.bb?????? |? 1 +
>> ?.../recipes-support/opencv/opencv/download.patch?? | 32 ++++++++++++++
>> ?meta-oe/recipes-support/opencv/opencv_4.1.0.bb???? | 32 ++++++++++++--
>> ?.../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb}?? |? 7 ++-
>> ?.../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb}?? |? 6 +--
>> ?...x-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++--
>> ?.../usbpath/{usbpath_svn.bb => usbpath_git.bb}???? | 10 ++---
>> ?.../{wmiconfig_svn.bb => wmiconfig_git.bb}???????? | 13 +++---
>> ?16 files changed, 183 insertions(+), 69 deletions(-)
>> ?rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb =>
>> wireshark_3.0.8.bb} (95%)
>> ?create mode 100644
>> meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
>> ?create mode 100644
>> meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
>> ?create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
>> ?rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb
>> => s3c24xx-gpio_git.bb} (73%)
>> ?rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb
>> => s3c64xx-gpio_git.bb} (74%)
>> ?rename
>> meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb
>> => sjf2410-linux-native_git.bb} (72%)
>> ?rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb =>
>> usbpath_git.bb} (68%)
>> ?rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb =>
>> wmiconfig_git.bb} (58%)
>>
> Could we also consider backport of:
hmm, that might be a bit hard.?
>
> kernel-yocto.bbclass: Support config fragments with externalsrc (44f04c03)
> perf: Fix externalsrc support (eab605ba)
> kernelsrc.bbclass: Fix externalsrc support (2c17d35c)

aren't this in core ??

- armin
> Thanks,
>


From pbarker at konsulko.com  Tue Mar 17 15:19:17 2020
From: pbarker at konsulko.com (Paul Barker)
Date: Tue, 17 Mar 2020 15:19:17 +0000
Subject: [oe] zeus pull request
In-Reply-To: <8b1a37c0-ec84-6989-459a-d55c739c055c@gmail.com>
References: <c68254db-aa96-df47-7b86-179bab336393@gmail.com>
	<20200317150405.578ddb5f@ub1910>
	<8b1a37c0-ec84-6989-459a-d55c739c055c@gmail.com>
Message-ID: <20200317151917.4a3f3f55@ub1910>

On Tue, 17 Mar 2020 08:12:54 -0700
akuster808 <akuster808 at gmail.com> wrote:

> On 3/17/20 8:04 AM, Paul Barker wrote:
> > On Tue, 17 Mar 2020 07:48:47 -0700
> > akuster808 <akuster808 at gmail.com> wrote:
> >  
> >> The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
> >>
> >> ? fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
> >>
> >> are available in the Git repository at:
> >>
> >> ? https://git.openembedded.org/meta-openembedded zeus-next
> >>
> >> for you to fetch changes up to 9e60d30669a2ad0598e9abf0cd15ee06b523986b:
> >>
> >> ? sanlock: Replace cp -a with cp -R --no-dereference (2020-03-15
> >> 13:30:34 -0700)
> >>
> >> ----------------------------------------------------------------
> >> Adrian Bunk (1):
> >> ????? wireshark: Upgrade 3.0.6 -> 3.0.8
> >>
> >> Carlos Rafael Giani (1):
> >> ????? opencv: Enable pkg-config .pc file generation
> >>
> >> Khem Raj (2):
> >> ????? ade: Fix install paths in multilib builds
> >> ????? sanlock: Replace cp -a with cp -R --no-dereference
> >>
> >> Martin Jansa (1):
> >> ????? s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath,
> >> wmiconfig: use git fetcher instead of svn fetcher
> >>
> >> Mike Krupicka (1):
> >> ????? mosquitto: Use mosquitto.init for daemon init
> >>
> >> Paul Barker (1):
> >> ????? lmsensors: Fix sensord dependencies
> >>
> >> Peter Kjellerstedt (2):
> >> ????? lvm2, libdevmapper: Do not patch configure
> >> ????? libldb: Do not require the "pam" distro feature to be enabled
> >>
> >> Ross Burton (4):
> >> ????? opencv: don't download during configure
> >> ????? opencv: also download face alignment data in do_fetch()
> >> ????? opencv: PACKAGECONFIG for G-API, use system ADE
> >> ????? opencv: abort configure if we need to download
> >>
> >> ?.../mosquitto/files/mosquitto.init???????????????? |? 2 +-
> >> ?.../recipes-support/libldb/libldb_1.5.6.bb???????? |? 3 +-
> >> ?.../{wireshark_3.0.6.bb => wireshark_3.0.8.bb}???? |? 4 +-
> >> ?meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb? |? 3 +-
> >> ?...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51
> >> ++++++++++++++++++++++
> >> ?meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb? |? 4 +-
> >> ?...configure-Fix-setting-of-CLDFLAGS-default.patch | 34 +--------------
> >> ?...NUInstallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++
> >> ?meta-oe/recipes-support/opencv/ade_0.1.1f.bb?????? |? 1 +
> >> ?.../recipes-support/opencv/opencv/download.patch?? | 32 ++++++++++++++
> >> ?meta-oe/recipes-support/opencv/opencv_4.1.0.bb???? | 32 ++++++++++++--
> >> ?.../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb}?? |? 7 ++-
> >> ?.../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb}?? |? 6 +--
> >> ?...x-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++--
> >> ?.../usbpath/{usbpath_svn.bb => usbpath_git.bb}???? | 10 ++---
> >> ?.../{wmiconfig_svn.bb => wmiconfig_git.bb}???????? | 13 +++---
> >> ?16 files changed, 183 insertions(+), 69 deletions(-)
> >> ?rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb =>
> >> wireshark_3.0.8.bb} (95%)
> >> ?create mode 100644
> >> meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
> >> ?create mode 100644
> >> meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
> >> ?create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
> >> ?rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb  
> >> => s3c24xx-gpio_git.bb} (73%)  
> >> ?rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb  
> >> => s3c64xx-gpio_git.bb} (74%)  
> >> ?rename
> >> meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb  
> >> => sjf2410-linux-native_git.bb} (72%)  
> >> ?rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb =>
> >> usbpath_git.bb} (68%)
> >> ?rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb =>
> >> wmiconfig_git.bb} (58%)
> >>  
> > Could we also consider backport of:  
> hmm, that might be a bit hard.?
> >
> > kernel-yocto.bbclass: Support config fragments with externalsrc (44f04c03)
> > perf: Fix externalsrc support (eab605ba)
> > kernelsrc.bbclass: Fix externalsrc support (2c17d35c)  
> 
> aren't this in core ??

oops. Yes, I was talking about core, should have sent this as a separate
mail to the other list.

-- 
Paul Barker
Konsulko Group

From wenlin.kang at windriver.com  Tue Mar 17 16:44:32 2020
From: wenlin.kang at windriver.com (Wenlin Kang)
Date: Tue, 17 Mar 2020 09:44:32 -0700
Subject: [oe] [meta-oe][PATCH] ipmitool: fixes for CVE-2020-5208
Message-ID: <20200317164432.78643-1-wenlin.kang@windriver.com>

This patch is the other part of the fixes for CVE-2020-5208.

Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
---
 ...uffer-overflow-in-ipmi_spd_print_fru.patch |  53 +++++++
 ...er-overflow-in-ipmi_get_session_info.patch |  53 +++++++
 .../0003-channel-Fix-buffer-overflow.patch    |  69 +++++++++
 ...er-overflows-in-get_lan_param_select.patch |  94 ++++++++++++
 ...u-sdr-Fix-id_string-buffer-overflows.patch | 142 ++++++++++++++++++
 .../ipmitool/ipmitool_1.8.18.bb               |   5 +
 6 files changed, 416 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
 create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch

diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
new file mode 100644
index 000000000..eadfb7ead
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
@@ -0,0 +1,53 @@
+From 24aed93efb30a8f557aedc2f03b6ccec758ccbf4 Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 16:44:18 +0000
+Subject: [PATCH 1/5] fru: Fix buffer overflow in ipmi_spd_print_fru
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `ipmi_spd_print_fru` function has a similar issue as the one fixed
+by the previous commit in `read_fru_area_section`. An initial request is
+made to get the `fru.size`, which is used as the size for the allocation
+of `spd_data`. Inside a loop, further requests are performed to get the
+copy sizes which are not checked before being used as the size for a
+copy into the buffer.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/840fb1cbb4fb365cb9797300e3374d4faefcdb10]
+CVE: CVE-2020-5208
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/dimm_spd.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
+index 91ae117..4c9c21d 100644
+--- a/lib/dimm_spd.c
++++ b/lib/dimm_spd.c
+@@ -1014,7 +1014,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+ 	struct ipmi_rq req;
+ 	struct fru_info fru;
+ 	uint8_t *spd_data, msg_data[4];
+-	int len, offset;
++	uint32_t len, offset;
+ 
+ 	msg_data[0] = id;
+ 
+@@ -1091,6 +1091,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+ 		}
+ 
+ 		len = rsp->data[0];
++		if(rsp->data_len < 1
++		   || len > rsp->data_len - 1
++		   || len > fru.size - offset)
++		{
++			printf(" Not enough buffer size");
++			return -1;
++		}
+ 		memcpy(&spd_data[offset], rsp->data + 1, len);
+ 		offset += len;
+ 	} while (offset < fru.size);
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
new file mode 100644
index 000000000..b8742b1a8
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
@@ -0,0 +1,53 @@
+From 81144cfba131b4ddbfcf9c530274b23bfc7e0ea8 Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 16:51:49 +0000
+Subject: [PATCH 2/5] session: Fix buffer overflow in ipmi_get_session_info
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `ipmi_get_session_info` function does not properly check the
+response `data_len`, which is used as a copy size, allowing stack buffer
+overflow.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/41d7026946fafbd4d1ec0bcaca3ea30a6e8eed22]
+CVE: CVE-2020-5208
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/ipmi_session.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c
+index 4855bc4..71bef4c 100644
+--- a/lib/ipmi_session.c
++++ b/lib/ipmi_session.c
+@@ -319,8 +319,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+ 		}
+ 		else
+ 		{
+-			memcpy(&session_info,  rsp->data, rsp->data_len);
+-			print_session_info(&session_info, rsp->data_len);
++			memcpy(&session_info,  rsp->data,
++			       __min(rsp->data_len, sizeof(session_info)));
++			print_session_info(&session_info,
++			                   __min(rsp->data_len, sizeof(session_info)));
+ 		}
+ 		break;
+ 		
+@@ -351,8 +353,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+ 				break;
+ 			}
+ 
+-			memcpy(&session_info,  rsp->data, rsp->data_len);
+-			print_session_info(&session_info, rsp->data_len);
++			memcpy(&session_info,  rsp->data,
++			       __min(rsp->data_len, sizeof(session_info)));
++			print_session_info(&session_info,
++			                   __min(rsp->data_len, sizeof(session_info)));
+ 			
+ 		} while (i <= session_info.session_slot_count);
+ 		break;
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch
new file mode 100644
index 000000000..deebd356a
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch
@@ -0,0 +1,69 @@
+From 5057761e30e3a7682edab60f98f631616392ddc6 Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 16:56:38 +0000
+Subject: [PATCH 3/3] channel: Fix buffer overflow
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `ipmi_get_channel_cipher_suites` function does not properly check
+the final response?s `data_len`, which can lead to stack buffer overflow
+on the final copy.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/9452be87181a6e83cfcc768b3ed8321763db50e4]
+CVE: CVE-2020-5208
+
+[Make some changes to apply it]
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ include/ipmitool/ipmi_channel.h |  2 ++
+ lib/ipmi_channel.c              | 10 ++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h
+index b138c26..d7cce5e 100644
+--- a/include/ipmitool/ipmi_channel.h
++++ b/include/ipmitool/ipmi_channel.h
+@@ -77,6 +77,8 @@ struct channel_access_t {
+ 	uint8_t user_level_auth;
+ };
+ 
++#define MAX_CIPHER_SUITE_DATA_LEN 0x10
++
+ /*
+  * The Get Authentication Capabilities response structure
+  * From table 22-15 of the IPMI v2.0 spec
+diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
+index fab2e54..76ecdcd 100644
+--- a/lib/ipmi_channel.c
++++ b/lib/ipmi_channel.c
+@@ -378,7 +378,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+ 		lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+ 		return -1;
+ 	}
+-	if (rsp->ccode > 0) {
++	if (rsp->ccode
++	    || rsp->data_len < 1
++	    || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN)
++	{
+ 		lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+ 			val2str(rsp->ccode, completion_code_vals));
+ 		return -1;
+@@ -413,7 +416,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+ 			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+ 			return -1;
+ 		}
+-		if (rsp->ccode > 0) {
++		if (rsp->ccode
++		    || rsp->data_len < 1
++		    || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN)
++		{
+ 			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+ 					val2str(rsp->ccode, completion_code_vals));
+ 			return -1;
+-- 
+2.18.1
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
new file mode 100644
index 000000000..b5ce9e92e
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
@@ -0,0 +1,94 @@
+From e6aa6076f65e71544bd6450d20d943d7baaccb9f Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 17:06:39 +0000
+Subject: [PATCH 4/5] lanp: Fix buffer overflows in get_lan_param_select
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Partial fix for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+The `get_lan_param_select` function is missing a validation check on the
+response?s `data_len`, which it then returns to caller functions, where
+stack buffer overflow can occur.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/d45572d71e70840e0d4c50bf48218492b79c1a10]
+CVE: CVE-2020-5208
+
+[Make some changes to apply it]
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/ipmi_lanp.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
+index 060e753..dee21ee 100644
+--- a/lib/ipmi_lanp.c
++++ b/lib/ipmi_lanp.c
+@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 		/* set new ipaddr */
+ 		memcpy(data+3, temp, 4);
+ 		printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
+@@ -1932,7 +1932,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 		/* set new macaddr */
+ 		memcpy(data+7, temp, 6);
+ 		printf("Setting LAN Alert %d MAC Address to "
+@@ -1947,7 +1947,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "def", 3) == 0 ||
+ 		    strncasecmp(argv[1], "default", 7) == 0) {
+@@ -1973,7 +1973,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "on", 2) == 0 ||
+ 		    strncasecmp(argv[1], "yes", 3) == 0) {
+@@ -1998,7 +1998,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "pet", 3) == 0) {
+ 			printf("Setting LAN Alert %d destination to PET Trap\n", alert);
+@@ -2026,7 +2026,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (str2uchar(argv[1], &data[2]) != 0) {
+ 			lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
+@@ -2042,7 +2042,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (str2uchar(argv[1], &data[3]) != 0) {
+ 			lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch
new file mode 100644
index 000000000..cf8b9254c
--- /dev/null
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch
@@ -0,0 +1,142 @@
+From 26e64ca78ae844c5ceedde89531e2924d7d4594c Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl at microsoft.com>
+Date: Thu, 28 Nov 2019 17:13:45 +0000
+Subject: [PATCH 5/5] fru, sdr: Fix id_string buffer overflows
+
+Final part of the fixes for CVE-2020-5208, see
+https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+9 variants of stack buffer overflow when parsing `id_string` field of
+SDR records returned from `CMD_GET_SDR` command.
+
+SDR record structs have an `id_code` field, and an `id_string` `char`
+array.
+
+The length of `id_string` is calculated as `(id_code & 0x1f) + 1`,
+which can be larger than expected 16 characters (if `id_code = 0xff`,
+then length will be `(0xff & 0x1f) + 1 = 32`).
+
+In numerous places, this can cause stack buffer overflow when copying
+into fixed buffer of size `17` bytes from this calculated length.
+
+Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/7ccea283dd62a05a320c1921e3d8d71a87772637]
+CVE: CVE-2020-5208
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+---
+ lib/ipmi_fru.c |  2 +-
+ lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++----------------
+ 2 files changed, 25 insertions(+), 17 deletions(-)
+
+diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
+index b71ea23..1decea2 100644
+--- a/lib/ipmi_fru.c
++++ b/lib/ipmi_fru.c
+@@ -3038,7 +3038,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
+ 		return 0;
+ 
+ 	memset(desc, 0, sizeof(desc));
+-	memcpy(desc, fru->id_string, fru->id_code & 0x01f);
++	memcpy(desc, fru->id_string, __min(fru->id_code & 0x01f, sizeof(desc)));
+ 	desc[fru->id_code & 0x01f] = 0;
+ 	printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id);
+ 
+diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
+index fa7b082..175a86f 100644
+--- a/lib/ipmi_sdr.c
++++ b/lib/ipmi_sdr.c
+@@ -2113,7 +2113,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
+ 		return -1;
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (sensor->id_code & 0x1f) + 1, sensor->id_string);
+ 
+ 	if (verbose) {
+ 		printf("Sensor ID              : %s (0x%x)\n",
+@@ -2164,7 +2164,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
+ 		return -1;
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (mc->id_code & 0x1f) + 1, mc->id_string);
+ 
+ 	if (verbose == 0) {
+ 		if (csv_output)
+@@ -2257,7 +2257,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
+ 	char desc[17];
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (dev->id_code & 0x1f) + 1, dev->id_string);
+ 
+ 	if (!verbose) {
+ 		if (csv_output)
+@@ -2314,7 +2314,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
+ 	char desc[17];
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (fru->id_code & 0x1f) + 1, fru->id_string);
+ 
+ 	if (!verbose) {
+ 		if (csv_output)
+@@ -2518,35 +2518,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf,uint16_t id,
+ 
+    int rc =0;
+    char desc[17];
++   const char *id_string;
++   uint8_t id_code;
+    memset(desc, ' ', sizeof (desc));
+ 
+    switch ( type) {
+       case SDR_RECORD_TYPE_FULL_SENSOR:
+       record.full = (struct sdr_record_full_sensor *) raw;
+-      snprintf(desc, (record.full->id_code & 0x1f) +1, "%s",
+-               (const char *)record.full->id_string);
++      id_code = record.full->id_code;
++      id_string = record.full->id_string;
+       break;
++
+       case SDR_RECORD_TYPE_COMPACT_SENSOR:
+       record.compact = (struct sdr_record_compact_sensor *) raw	;
+-      snprintf(desc, (record.compact->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.compact->id_string);
++      id_code = record.compact->id_code;
++      id_string = record.compact->id_string;
+       break;
++
+       case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+       record.eventonly  = (struct sdr_record_eventonly_sensor *) raw ;
+-      snprintf(desc, (record.eventonly->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.eventonly->id_string);
+-      break;            
++      id_code = record.eventonly->id_code;
++      id_string = record.eventonly->id_string;
++      break;
++
+       case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+       record.mcloc  = (struct sdr_record_mc_locator *) raw ;
+-      snprintf(desc, (record.mcloc->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.mcloc->id_string);		
++      id_code = record.mcloc->id_code;
++      id_string = record.mcloc->id_string;
+       break;
++
+       default:
+       rc = -1;
+-      break;
+-   }   
++   }
++   if (!rc) {
++       snprintf(desc, sizeof(desc), "%.*s", (id_code & 0x1f) + 1, id_string);
++   }
+ 
+-      lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
++   lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
+    return rc;
+ }
+ 
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
index 500d5bd0b..3de9a92a7 100644
--- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
@@ -25,6 +25,11 @@ DEPENDS = "openssl readline ncurses"
 SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2 \
            file://0001-Migrate-to-openssl-1.1.patch \
            file://0001-fru-Fix-buffer-overflow-vulnerabilities.patch \
+           file://0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch \
+           file://0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch \
+           file://0003-channel-Fix-buffer-overflow.patch \
+           file://0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch \
+           file://0005-fru-sdr-Fix-id_string-buffer-overflows.patch \
            "
 SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3"
 SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01"
-- 
2.23.0


From rpjday at crashcourse.ca  Tue Mar 17 17:22:13 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Tue, 17 Mar 2020 13:22:13 -0400 (EDT)
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
Message-ID: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>


  just noticed that ./meta-oe/recipes-extended/indent/indent_2.2.12.bb
on master branch contains the line:

  FILES_${PN}-doc += "/usr/doc/indent/indent.html"

should that not properly read:

  FILES_${PN}-doc += "${prefix}/doc/indent/indent.html"

or am i misreading something?

rday

From sakib.sajal at windriver.com  Tue Mar 17 20:05:33 2020
From: sakib.sajal at windriver.com (Sakib Sajal)
Date: Tue, 17 Mar 2020 13:05:33 -0700
Subject: [oe] [meta-oe][PATCH] openjpeg: Fix CVE-2020-8112
Message-ID: <20200317200533.56238-1-sakib.sajal@windriver.com>

Backport from upstream to fix heap-based buffer overflow.

Upstream-Status: Backport
CVE: CVE-2020-8112

Signed-off-by: Sakib Sajal <sakib.sajal at windriver.com>
---
 .../openjpeg/openjpeg/CVE-2020-8112.patch     | 46 +++++++++++++++++++
 .../openjpeg/openjpeg_2.3.1.bb                |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch

diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch
new file mode 100644
index 000000000..cb250530e
--- /dev/null
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch
@@ -0,0 +1,46 @@
+From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at spatialys.com>
+Date: Thu, 30 Jan 2020 00:59:57 +0100
+Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
+
+That could lead to later assertion failures.
+
+Fixes #1231 / CVE-2020-8112
+---
+ src/lib/openjp2/tcd.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
+index deecc4df..aa419030 100644
+--- a/src/lib/openjp2/tcd.c
++++ b/src/lib/openjp2/tcd.c
+@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
+             /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+             l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
+             l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
+-            l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
+-            l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
++            {
++                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
++                                  (OPJ_INT32)l_pdx)) << l_pdx;
++                if (tmp > (OPJ_UINT32)INT_MAX) {
++                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
++                    return OPJ_FALSE;
++                }
++                l_br_prc_x_end = (OPJ_INT32)tmp;
++            }
++            {
++                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
++                                  (OPJ_INT32)l_pdy)) << l_pdy;
++                if (tmp > (OPJ_UINT32)INT_MAX) {
++                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
++                    return OPJ_FALSE;
++                }
++                l_br_prc_y_end = (OPJ_INT32)tmp;
++            }
+             /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
+ 
+             l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
index 4045148dd..42011efa9 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
@@ -9,6 +9,7 @@ SRC_URI = " \
     git://github.com/uclouvain/openjpeg.git \
     file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
     file://CVE-2020-6851.patch \
+    file://CVE-2020-8112.patch \
 "
 SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788"
 S = "${WORKDIR}/git"
-- 
2.17.1


From ross at burtonini.com  Tue Mar 17 21:32:10 2020
From: ross at burtonini.com (Ross Burton)
Date: Tue, 17 Mar 2020 21:32:10 +0000
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
In-Reply-To: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
References: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
Message-ID: <06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>

On 17/03/2020 17:22, Robert P. J. Day wrote:
>    just noticed that ./meta-oe/recipes-extended/indent/indent_2.2.12.bb
> on master branch contains the line:
> 
>    FILES_${PN}-doc += "/usr/doc/indent/indent.html"
> 
> should that not properly read:
> 
>    FILES_${PN}-doc += "${prefix}/doc/indent/indent.html"
> 
> or am i misreading something?

Recipes should never use /usr directly unless they're relocating 
something from e.g. ${D}/usr/lib to ${D}${libdir}.

The recipe should be telling the Makefiles to install into ${docdir} 
(typically, /usr/share/doc).

Ross

From rpjday at crashcourse.ca  Tue Mar 17 22:41:20 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Tue, 17 Mar 2020 18:41:20 -0400 (EDT)
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
In-Reply-To: <06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
References: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
	<06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
Message-ID: <alpine.LFD.2.21.2003171833550.3944@localhost.localdomain>

On Tue, 17 Mar 2020, Ross Burton wrote:

> On 17/03/2020 17:22, Robert P. J. Day wrote:
> >    just noticed that ./meta-oe/recipes-extended/indent/indent_2.2.12.bb
> > on master branch contains the line:
> >
> >    FILES_${PN}-doc += "/usr/doc/indent/indent.html"
> >
> > should that not properly read:
> >
> >    FILES_${PN}-doc += "${prefix}/doc/indent/indent.html"
> >
> > or am i misreading something?
>
> Recipes should never use /usr directly unless they're relocating
> something from e.g. ${D}/usr/lib to ${D}${libdir}.
>
> The recipe should be telling the Makefiles to install into ${docdir}
> (typically, /usr/share/doc).

  ah, of course ... i can submit a patch for that shortly.

rday

From rpjday at crashcourse.ca  Tue Mar 17 23:02:42 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Tue, 17 Mar 2020 19:02:42 -0400 (EDT)
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
In-Reply-To: <06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
References: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
	<06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
Message-ID: <alpine.LFD.2.21.2003171856500.23572@localhost.localdomain>

On Tue, 17 Mar 2020, Ross Burton wrote:

> On 17/03/2020 17:22, Robert P. J. Day wrote:
> >    just noticed that ./meta-oe/recipes-extended/indent/indent_2.2.12.bb
> > on master branch contains the line:
> >
> >    FILES_${PN}-doc += "/usr/doc/indent/indent.html"
> >
> > should that not properly read:
> >
> >    FILES_${PN}-doc += "${prefix}/doc/indent/indent.html"
> >
> > or am i misreading something?
>
> Recipes should never use /usr directly unless they're relocating something
> from e.g. ${D}/usr/lib to ${D}${libdir}.
>
> The recipe should be telling the Makefiles to install into ${docdir}
> (typically, /usr/share/doc).

  just to be clear, this depends on where the indent software actually
installs the documentation, yes? i'll have to check when i get home as
to were that stuff is actually placed. for all i know, it *could* be
under /usr/doc.

rday

From ross at burtonini.com  Tue Mar 17 23:17:12 2020
From: ross at burtonini.com (Ross Burton)
Date: Tue, 17 Mar 2020 23:17:12 +0000
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
In-Reply-To: <alpine.LFD.2.21.2003171856500.23572@localhost.localdomain>
References: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
	<06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
	<alpine.LFD.2.21.2003171856500.23572@localhost.localdomain>
Message-ID: <CAAnfSTu1O59FwuShBXQWTaOW7J4m1Hx5Wa_wCw6yRV-E6XNw8Q@mail.gmail.com>

>   just to be clear, this depends on where the indent software actually
> installs the documentation, yes? i'll have to check when i get home as
> to were that stuff is actually placed. for all i know, it *could* be
> under /usr/doc.

Yes.

That FILES suggests that the makefile is installing to /usr/doc/ and
needs to be told somehow to use $docdir.

Ross

From schnitzeltony at gmail.com  Tue Mar 17 23:34:27 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Wed, 18 Mar 2020 00:34:27 +0100
Subject: [oe] [PATCH][v2 1/2] pipewire: upgrade 0.2.7 -> 0.3.1
Message-ID: <20200317233429.11356-1-schnitzeltony@gmail.com>

* as long as we have not upgradeed mutter to 3.36 we have to keep pipewire
  0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
* license was changed to MIT
* additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES
  or if not available by pipewire's defaults
* vulkan was disabled for now

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
V1 -> V2: Add vulkan PACKAGECONFIG
 .../pipewire/pipewire-0.2_git.bb              | 65 +++++++++++++++++++
 .../pipewire/pipewire_git.bb                  | 30 +++++----
 2 files changed, 84 insertions(+), 11 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb

diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
new file mode 100644
index 000000000..bcb3015f8
--- /dev/null
+++ b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
@@ -0,0 +1,65 @@
+SUMMARY = "Multimedia processing server for Linux"
+AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
+HOMEPAGE = "https://pipewire.org"
+SECTION = "multimedia"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
+    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+DEPENDS = "alsa-lib dbus udev"
+SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
+PV = "0.2.7"
+
+SRC_URI = "git://github.com/PipeWire/pipewire"
+
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig systemd manpages
+
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+    gstreamer \
+"
+
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
+PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
+
+PACKAGES =+ "\
+    ${PN}-spa-plugins \
+    ${PN}-alsa \
+    ${PN}-config \
+    gstreamer1.0-${PN} \
+    lib${PN} \
+    lib${PN}-modules \
+"
+
+RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
+
+FILES_${PN} = "\
+    ${sysconfdir}/pipewire/pipewire.conf \
+    ${bindir}/pipewire* \
+    ${systemd_user_unitdir}/* \
+"
+FILES_lib${PN} = "\
+    ${libdir}/libpipewire-*.so.* \
+"
+FILES_lib${PN}-modules = "\
+    ${libdir}/pipewire-*/* \
+"
+FILES_${PN}-spa-plugins = "\
+    ${bindir}/spa-* \
+    ${libdir}/spa/* \
+"
+FILES_${PN}-alsa = "\
+    ${libdir}/alsa-lib/* \
+    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
+"
+FILES_gstreamer1.0-${PN} = "\
+    ${libdir}/gstreamer-1.0/* \
+"
+
+CONFFILES_${PN} = "\
+    ${sysconfdir}/pipewire/pipewire.conf \
+"
diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
index bcb3015f8..64ef8e3c9 100644
--- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
+++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
@@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux"
 AUTHOR = "Wim Taymans <wtaymans at redhat.com>"
 HOMEPAGE = "https://pipewire.org"
 SECTION = "multimedia"
-LICENSE = "LGPL-2.1"
+LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
-    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \
+    file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \
 "
 DEPENDS = "alsa-lib dbus udev"
-SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
-PV = "0.2.7"
+SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac"
+PV = "0.3.1"
 
 SRC_URI = "git://github.com/PipeWire/pipewire"
 
@@ -18,13 +18,18 @@ S = "${WORKDIR}/git"
 inherit meson pkgconfig systemd manpages
 
 PACKAGECONFIG ??= "\
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
-    gstreamer \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \
+    jack gstreamer \
 "
 
-PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
-PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc"
+PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack"
+PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
+PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio"
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
+PACKAGECONFIG[vulkan] = "-Dvulkan=true,-Dvulkan=false,vulkan-loader"
 
 PACKAGES =+ "\
     ${PN}-spa-plugins \
@@ -33,28 +38,31 @@ PACKAGES =+ "\
     gstreamer1.0-${PN} \
     lib${PN} \
     lib${PN}-modules \
+    lib${PN}-jack \
 "
 
 RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
 
 FILES_${PN} = "\
     ${sysconfdir}/pipewire/pipewire.conf \
+    ${bindir}/pw-* \
     ${bindir}/pipewire* \
     ${systemd_user_unitdir}/* \
 "
 FILES_lib${PN} = "\
     ${libdir}/libpipewire-*.so.* \
+    ${libdir}/libjack-*.so.* \
+    ${libdir}/libpulse-*.so.* \
 "
 FILES_lib${PN}-modules = "\
     ${libdir}/pipewire-*/* \
 "
 FILES_${PN}-spa-plugins = "\
     ${bindir}/spa-* \
-    ${libdir}/spa/* \
+    ${libdir}/spa-*/* \
 "
 FILES_${PN}-alsa = "\
     ${libdir}/alsa-lib/* \
-    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
 "
 FILES_gstreamer1.0-${PN} = "\
     ${libdir}/gstreamer-1.0/* \
-- 
2.21.1


From schnitzeltony at gmail.com  Tue Mar 17 23:34:28 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Wed, 18 Mar 2020 00:34:28 +0100
Subject: [oe] [PATCH][v2 2/2] mutter: depend on pipewire-0.2 in
	PACKAGECONFIG[remote-desktop]
In-Reply-To: <20200317233429.11356-1-schnitzeltony@gmail.com>
References: <20200317233429.11356-1-schnitzeltony@gmail.com>
Message-ID: <20200317233429.11356-2-schnitzeltony@gmail.com>

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
index 7979802d2..c90559cae 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb
@@ -52,7 +52,7 @@ PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_bac
 PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl"
 PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false"
 PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom"
-PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire"
+PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire-0.2"
 PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm"
 PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
 PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
-- 
2.21.1


From wangmy at cn.fujitsu.com  Wed Mar 18 07:19:48 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Wed, 18 Mar 2020 00:19:48 -0700
Subject: [oe]  [meta-oe] [PATCH] c-ares: upgrade 1.15.0 -> 1.16.0
Message-ID: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>

add 0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch
to fix error of do_configure

refresh cmake-install-libcares.pc.patch

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...ror-mv-libcares.pc.cmakein-to-libcar.patch | 27 ++++++++++
 .../c-ares/cmake-install-libcares.pc.patch    | 54 +++++--------------
 .../{c-ares_1.15.0.bb => c-ares_1.16.0.bb}    |  5 +-
 3 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch
 rename meta-oe/recipes-support/c-ares/{c-ares_1.15.0.bb => c-ares_1.16.0.bb} (78%)

diff --git a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch
new file mode 100644
index 000000000..8f15f8424
--- /dev/null
+++ b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch
@@ -0,0 +1,27 @@
+From f2f1e134bf5d9d0789942848e03006af8d926cf8 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy at cn.fujitsu.com>
+Date: Tue, 17 Mar 2020 12:53:35 +0800
+Subject: [PATCH] fix configure error : mv libcares.pc.cmakein to
+ libcares.pc.cmake
+
+Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3a5878d..c2e5740 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -563,7 +563,7 @@ IF (CARES_STATIC)
+ ENDIF()
+ 
+ # Write ares_config.h configuration file.  This is used only for the build.
+-CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY)
++CONFIGURE_FILE (libcares.pc.cmake ${PROJECT_BINARY_DIR}/libcares.pc @ONLY)
+ 
+ 
+ 
+-- 
+2.17.1
+
diff --git a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
index 8cadb2bba..0eb7e4bbb 100644
--- a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
+++ b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
@@ -12,39 +12,37 @@ update to 1.14.0, fix patch warning
 
 Signed-off-by: Changqing Li <changqing.li at windriver.com>
 ---
- CMakeLists.txt      | 23 +++++++++++++++++++++++
- libcares.pc.cmakein | 20 ++++++++++++++++++++
- 2 files changed, 43 insertions(+)
- create mode 100644 libcares.pc.cmakein
+ CMakeLists.txt | 28 +++++++++++++++++++++++-----
+ 1 file changed, 23 insertions(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 60a880c..71eaa53 100644
+index fd123e1..3a5878d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -193,22 +193,30 @@ ADD_DEFINITIONS(${SYSFLAGS})
+@@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS})
  
  
  # Tell C-Ares about libraries to depend on
 +# Also pass these libraries to pkg-config file
 +SET(CARES_PRIVATE_LIBS_LIST)
  IF (HAVE_LIBRESOLV)
- 	LIST (APPEND CARES_DEPENDENT_LIBS resolv)
+-	LIST (APPEND CARES_DEPENDENT_LIBS resolv)
 +	LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lresolv")
  ENDIF ()
  IF (HAVE_LIBNSL)
- 	LIST (APPEND CARES_DEPENDENT_LIBS nsl)
+-	LIST (APPEND CARES_DEPENDENT_LIBS nsl)
 +	LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lnsl")
  ENDIF ()
  IF (HAVE_LIBSOCKET)
- 	LIST (APPEND CARES_DEPENDENT_LIBS socket)
+-	LIST (APPEND CARES_DEPENDENT_LIBS socket)
 +	LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lsocket")
  ENDIF ()
  IF (HAVE_LIBRT)
- 	LIST (APPEND CARES_DEPENDENT_LIBS rt)
+-	LIST (APPEND CARES_DEPENDENT_LIBS rt)
 +	LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lrt")
  ENDIF ()
  IF (WIN32)
- 	LIST (APPEND CARES_DEPENDENT_LIBS ws2_32)
+-	LIST (APPEND CARES_DEPENDENT_LIBS ws2_32 Advapi32)
 +	LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lws2_32")
  ENDIF ()
  
@@ -52,7 +50,7 @@ index 60a880c..71eaa53 100644
  
  # When checking for symbols, we need to make sure we set the proper
  # headers, libraries, and definitions for the detection to work properly
-@@ -514,6 +522,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h)
+@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h)
  # Write ares_config.h configuration file.  This is used only for the build.
  CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h)
  
@@ -68,8 +66,8 @@ index 60a880c..71eaa53 100644
  
  # TRANSFORM_MAKEFILE_INC
  #
-@@ -664,6 +681,12 @@ IF (CARES_INSTALL)
- 	INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+@@ -728,6 +740,12 @@ IF (CARES_INSTALL)
+ 	INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
  ENDIF ()
  
 +# pkg-config file
@@ -81,32 +79,6 @@ index 60a880c..71eaa53 100644
  # Legacy chain-building variables (provided for compatibility with old code).
  # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares).
  SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND")
-diff --git a/libcares.pc.cmakein b/libcares.pc.cmakein
-new file mode 100644
-index 0000000..3579256
---- /dev/null
-+++ b/libcares.pc.cmakein
-@@ -0,0 +1,20 @@
-+#***************************************************************************
-+# Project        ___       __ _ _ __ ___  ___ 
-+#               / __|____ / _` | '__/ _ \/ __|
-+#              | (_|_____| (_| | | |  __/\__ \
-+#               \___|     \__,_|_|  \___||___/
-+#
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+
-+Name: c-ares
-+URL: http://daniel.haxx.se/projects/c-ares/
-+Description: asynchronous DNS lookup library
-+Version: @VERSION@
-+Requires: 
-+Requires.private: 
-+Cflags: -I${includedir} @CPPFLAG_CARES_STATICLIB@
-+Libs: -L${libdir} -lcares
-+Libs.private: @CARES_PRIVATE_LIBS@
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb
similarity index 78%
rename from meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb
rename to meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb
index d437529dc..e235b9b95 100644
--- a/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb
+++ b/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb
@@ -5,13 +5,14 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006"
 
-PV = "1.15.0+gitr${SRCPV}"
+PV = "1.16.0+gitr${SRCPV}"
 
 SRC_URI = "\
     git://github.com/c-ares/c-ares.git \
     file://cmake-install-libcares.pc.patch \
+    file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \
 "
-SRCREV = "e982924acee7f7313b4baa4ee5ec000c5e373c30"
+SRCREV = "077a587dccbe2f0d8a1987fbd3525333705c2249"
 
 UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)"
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Wed Mar 18 07:19:49 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Wed, 18 Mar 2020 00:19:49 -0700
Subject: [oe]  [meta-oe] [PATCH] flatbuffers: upgrade 1.11.0 -> 1.12.0
In-Reply-To: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584515992-22564-2-git-send-email-wangmy@cn.fujitsu.com>

0001-Add-detection-of-strtoull_l-function.patch
removed since it is included in 1.12.0

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...Add-detection-of-strtoull_l-function.patch | 38 -------------------
 ...uffers_1.11.0.bb => flatbuffers_1.12.0.bb} |  8 ++--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
 rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} (72%)

diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
deleted file mode 100644
index f3e82101b..000000000
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From bff7ffbc5130cd46caf33b76b4bb0593fcd15066 Mon Sep 17 00:00:00 2001
-From: Vladimir Glavnyy <31897320+vglavnyy at users.noreply.github.com>
-Date: Fri, 10 May 2019 00:15:29 +0700
-Subject: [PATCH] Add detection of strtoull_l function (#5333) (#5337)
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
-[Retrieved from:
-https://github.com/google/flatbuffers/commit/bff7ffbc5130cd46caf33b76b4bb0593fcd15066]
----
- CMakeLists.txt | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0640c37b5..30be238fe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,12 +42,18 @@ if(DEFINED FLATBUFFERS_MAX_PARSING_DEPTH)
-   message(STATUS "FLATBUFFERS_MAX_PARSING_DEPTH: ${FLATBUFFERS_MAX_PARSING_DEPTH}")
- endif()
- 
--# Auto-detect locale-narrow 'strtod_l' function.
-+# Auto-detect locale-narrow 'strtod_l' and  'strtoull_l' functions.
- if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT)
-+  set(FLATBUFFERS_LOCALE_INDEPENDENT 0)
-   if(MSVC)
--    check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT)
-+    check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L)
-+    check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L)
-   else()
--    check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT)
-+    check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L)
-+    check_cxx_symbol_exists(strtoull_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L)
-+  endif()
-+  if(FLATBUFFERS_HAS_STRTOF_L AND FLATBUFFERS_HAS_STRTOULL_L)
-+    set(FLATBUFFERS_LOCALE_INDEPENDENT 1)
-   endif()
- endif()
- add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$<BOOL:${FLATBUFFERS_LOCALE_INDEPENDENT}>)
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
similarity index 72%
rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb
rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
index 529441de1..c31cef63c 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
@@ -8,13 +8,11 @@ PACKAGE_BEFORE_PN = "${PN}-compiler"
 RDEPENDS_${PN}-compiler = "${PN}"
 RDEPENDS_${PN}-dev += "${PN}-compiler"
 
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "9e7e8cbe9f675123dd41b7c62868acad39188cae"
+SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7"
 
-SRC_URI = "git://github.com/google/flatbuffers.git \
-           file://0001-Add-detection-of-strtoull_l-function.patch \
-          "
+SRC_URI = "git://github.com/google/flatbuffers.git"
 
 # Make sure C++11 is used, required for example for GCC 4.9
 CXXFLAGS += "-std=c++11 -fPIC"
-- 
2.17.1




From wangmy at cn.fujitsu.com  Wed Mar 18 07:19:50 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Wed, 18 Mar 2020 00:19:50 -0700
Subject: [oe]  [meta-oe] [PATCH] irssi: upgrade 1.1.2 -> 1.2.2
In-Reply-To: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584515992-22564-3-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../irssi/{irssi_1.1.2.bb => irssi_1.2.2.bb}                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/irssi/{irssi_1.1.2.bb => irssi_1.2.2.bb} (79%)

diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb
similarity index 79%
rename from meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb
rename to meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb
index cd797e093..da5403e5c 100644
--- a/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb
+++ b/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8"
 DEPENDS = "glib-2.0 ncurses openssl"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
-SRC_URI[md5sum] = "271d2fd875cddd34526234d8a766d82c"
-SRC_URI[sha256sum] = "5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf9732"
+SRC_URI[md5sum] = "8547f89e014e23e1bbbb665bcf7e2f70"
+SRC_URI[sha256sum] = "6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Wed Mar 18 07:19:52 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Wed, 18 Mar 2020 00:19:52 -0700
Subject: [oe]  [meta-oe] [PATCH] ser2net: upgrade 4.1.2 -> 4.1.5
In-Reply-To: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584515992-22564-5-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb} (73%)

diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb
similarity index 73%
rename from meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb
rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb
index 66985af0a..0df134eca 100644
--- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb
+++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb
@@ -9,8 +9,8 @@ DEPENDS = "gensio libyaml"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a"
-SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7"
+SRC_URI[md5sum] = "52c5e56d2d54ced0cdeb764a7e8fec92"
+SRC_URI[sha256sum] = "df904d271eb161c265c956f0cb938dd0a375dda4a919a344f73b08bc50b9f308"
 
 inherit autotools pkgconfig
 
-- 
2.17.1




From wangmy at cn.fujitsu.com  Wed Mar 18 07:19:51 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Wed, 18 Mar 2020 00:19:51 -0700
Subject: [oe]  [meta-oe] [PATCH] rocksdb: upgrade 6.5.2 -> 6.6.4
In-Reply-To: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584515992-22564-4-git-send-email-wangmy@cn.fujitsu.com>

0001-Fix-build-breakage-from-lock_guard-error-6161.patch
removed since it is included in 6.6.4

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 ...-breakage-from-lock_guard-error-6161.patch | 36 -------------------
 meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb    |  7 ++--
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch

diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
deleted file mode 100644
index ac87d0c60..000000000
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001
-From: Maysam Yabandeh <myabandeh at fb.com>
-Date: Thu, 12 Dec 2019 13:48:50 -0800
-Subject: [PATCH] Fix build breakage from lock_guard error (#6161)
-
-Summary:
-This change fixes a source issue that caused compile time error which breaks build for many fbcode services in that setup. The size() member function of channel is a const member, so member variables accessed within it are implicitly const as well. This caused error when clang fails to resolve to a constructor that takes std::mutex because the suitable constructor got rejected due to loss of constness for its argument. The fix is to add mutable modifier to the lock_ member of channel.
-Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161
-
-Differential Revision: D18967685
-
-Pulled By: maysamyabandeh
-
-Upstream-Status: Backport
-
-fbshipit-source-id: 698b6a5153c3c92eeacb842c467aa28cc350d432
----
- util/channel.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/channel.h b/util/channel.h
-index 0225482c0..a8a47680a 100644
---- a/util/channel.h
-+++ b/util/channel.h
-@@ -60,7 +60,7 @@ class channel {
- 
-  private:
-   std::condition_variable cv_;
--  std::mutex lock_;
-+  mutable std::mutex lock_;
-   std::queue<T> buffer_;
-   bool eof_;
- };
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
index 713d5bb14..e82b77e14 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
@@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
 
-SRCREV = "4cfbd87afd08a16df28436fb990ef6b154ee6114"
-SRCBRANCH = "6.5.fb"
-PV = "6.5.2"
+SRCREV = "551a110918493a19d11243f53408b97485de1411"
+SRCBRANCH = "6.6.fb"
+PV = "6.6.4"
 
 SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
-           file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
            file://0001-db-write_thread.cc-Initialize-state.patch \
           "
 
-- 
2.17.1




From raj.khem at gmail.com  Wed Mar 18 02:45:40 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 17 Mar 2020 19:45:40 -0700
Subject: [oe] [meta-oe][PATCH] botan: Define --libdir to fix multilib build
	issues
Message-ID: <20200318024540.3962610-1-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-crypto/botan/botan_2.13.0.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-crypto/botan/botan_2.13.0.bb b/meta-oe/recipes-crypto/botan/botan_2.13.0.bb
index 0854bd6728..4143264b44 100644
--- a/meta-oe/recipes-crypto/botan/botan_2.13.0.bb
+++ b/meta-oe/recipes-crypto/botan/botan_2.13.0.bb
@@ -19,14 +19,15 @@ CPU_armv7ve = "armv7"
 
 do_configure() {
 	python3 ${S}/configure.py \
-	--prefix="${D}${prefix}" \
+	--prefix="${D}${exec_prefix}" \
+	--libdir="${D}${libdir}" \
 	--cpu="${CPU}" \
 	--cc-bin="${CXX}" \
 	--cxxflags="${CXXFLAGS}" \
 	--ldflags="${LDFLAGS}" \
 	--with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
 	${@bb.utils.contains("TUNE_FEATURES","neon","","--disable-neon",d)} \
-	--with-sysroot-dir=${STAGING_DIR_TARGET} \
+	--with-sysroot-dir=${STAGING_DIR_HOST} \
 	--with-build-dir="${B}" \
 	--optimize-for-size \
 	--with-stack-protector \
-- 
2.25.1


From raj.khem at gmail.com  Wed Mar 18 03:17:18 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Tue, 17 Mar 2020 20:17:18 -0700
Subject: [oe] [meta-oe] [PATCH] flatbuffers: upgrade 1.11.0 -> 1.12.0
In-Reply-To: <1584515992-22564-2-git-send-email-wangmy@cn.fujitsu.com>
References: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
	<1584515992-22564-2-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <CAMKF1soCXB9xkvmWCiyBA5Qmws1E5AgW3TO3iXLuYvvbAa3nTQ@mail.gmail.com>

On Tue, Mar 17, 2020 at 6:50 PM Wang Mingyu <wangmy at cn.fujitsu.com> wrote:
>
> 0001-Add-detection-of-strtoull_l-function.patch
> removed since it is included in 1.12.0
>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  ...Add-detection-of-strtoull_l-function.patch | 38 -------------------
>  ...uffers_1.11.0.bb => flatbuffers_1.12.0.bb} |  8 ++--
>  2 files changed, 3 insertions(+), 43 deletions(-)
>  delete mode 100644 meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
>  rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} (72%)
>
> diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
> deleted file mode 100644
> index f3e82101b..000000000
> --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From bff7ffbc5130cd46caf33b76b4bb0593fcd15066 Mon Sep 17 00:00:00 2001
> -From: Vladimir Glavnyy <31897320+vglavnyy at users.noreply.github.com>
> -Date: Fri, 10 May 2019 00:15:29 +0700
> -Subject: [PATCH] Add detection of strtoull_l function (#5333) (#5337)
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> -[Retrieved from:
> -https://github.com/google/flatbuffers/commit/bff7ffbc5130cd46caf33b76b4bb0593fcd15066]
> ----
> - CMakeLists.txt | 12 +++++++++---
> - 1 file changed, 9 insertions(+), 3 deletions(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 0640c37b5..30be238fe 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -42,12 +42,18 @@ if(DEFINED FLATBUFFERS_MAX_PARSING_DEPTH)
> -   message(STATUS "FLATBUFFERS_MAX_PARSING_DEPTH: ${FLATBUFFERS_MAX_PARSING_DEPTH}")
> - endif()
> -
> --# Auto-detect locale-narrow 'strtod_l' function.
> -+# Auto-detect locale-narrow 'strtod_l' and  'strtoull_l' functions.
> - if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT)
> -+  set(FLATBUFFERS_LOCALE_INDEPENDENT 0)
> -   if(MSVC)
> --    check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT)
> -+    check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L)
> -+    check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L)
> -   else()
> --    check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT)
> -+    check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L)
> -+    check_cxx_symbol_exists(strtoull_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L)
> -+  endif()
> -+  if(FLATBUFFERS_HAS_STRTOF_L AND FLATBUFFERS_HAS_STRTOULL_L)
> -+    set(FLATBUFFERS_LOCALE_INDEPENDENT 1)
> -   endif()
> - endif()
> - add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$<BOOL:${FLATBUFFERS_LOCALE_INDEPENDENT}>)
> diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
> similarity index 72%
> rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb
> rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
> index 529441de1..c31cef63c 100644
> --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb
> +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
> @@ -8,13 +8,11 @@ PACKAGE_BEFORE_PN = "${PN}-compiler"
>  RDEPENDS_${PN}-compiler = "${PN}"
>  RDEPENDS_${PN}-dev += "${PN}-compiler"
>
> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
>

what changed here ?
Please add a description under
Licence-Update: ....
in commit msg

> -SRCREV = "9e7e8cbe9f675123dd41b7c62868acad39188cae"
> +SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7"
>
> -SRC_URI = "git://github.com/google/flatbuffers.git \
> -           file://0001-Add-detection-of-strtoull_l-function.patch \
> -          "
> +SRC_URI = "git://github.com/google/flatbuffers.git"
>
>  # Make sure C++11 is used, required for example for GCC 4.9
>  CXXFLAGS += "-std=c++11 -fPIC"
> --
> 2.17.1
>
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From kai.kang at windriver.com  Wed Mar 18 03:22:14 2020
From: kai.kang at windriver.com (kai.kang at windriver.com)
Date: Wed, 18 Mar 2020 11:22:14 +0800
Subject: [oe] [meta-oe][PATCH] doxygen-native: fix compile error
Message-ID: <20200318032214.5245-1-kai.kang@windriver.com>

From: Kai Kang <kai.kang at windriver.com>

It fails to compile doxygen-native when /usr/bin/python is a link to
python3 on build host:

| Failed to import the site module
| Traceback (most recent call last):
|   File "/usr/lib64/python3.6/site.py", line 564, in <module>
|     main()
|   File "/usr/lib64/python3.6/site.py", line 550, in main
|     known_paths = addusersitepackages(known_paths)
|   File "/usr/lib64/python3.6/site.py", line 282, in addusersitepackages
|     user_site = getusersitepackages()
|   File "/usr/lib64/python3.6/site.py", line 258, in getusersitepackages
|     user_base = getuserbase() # this will also set USER_BASE
|   File "/usr/lib64/python3.6/site.py", line 248, in getuserbase
|     USER_BASE = get_config_var('userbase')
|   File "/usr/lib64/python3.6/sysconfig.py", line 604, in get_config_var
|     return get_config_vars().get(name)
|   File "/usr/lib64/python3.6/sysconfig.py", line 553, in get_config_vars
|     _init_posix(_CONFIG_VARS)
|   File "/usr/lib64/python3.6/sysconfig.py", line 424, in _init_posix
|     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
| ModuleNotFoundError: No module named '_sysconfigdata'

Replace find_package PythonInterp with Python3 to fix this issue that
it uses python3 from python3-native. And it also replaces the result
variable PYTHON_EXECUTABLE with Python3_EXECUTABLE.

This patch is only needded by doxygen-native.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 .../doxygen-native-only-check-python3.patch   | 433 ++++++++++++++++++
 .../doxygen/doxygen_1.8.17.bb                 |   1 +
 2 files changed, 434 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch

diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
new file mode 100644
index 000000000..a9650c232
--- /dev/null
+++ b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
@@ -0,0 +1,433 @@
+It fails to compile doxygen-native when /usr/bin/python is a link to python3 on
+build host:
+
+| Failed to import the site module
+| Traceback (most recent call last):
+|   File "/usr/lib64/python3.6/site.py", line 564, in <module>
+|     main()
+|   File "/usr/lib64/python3.6/site.py", line 550, in main
+|     known_paths = addusersitepackages(known_paths)
+|   File "/usr/lib64/python3.6/site.py", line 282, in addusersitepackages
+|     user_site = getusersitepackages()
+|   File "/usr/lib64/python3.6/site.py", line 258, in getusersitepackages
+|     user_base = getuserbase() # this will also set USER_BASE
+|   File "/usr/lib64/python3.6/site.py", line 248, in getuserbase
+|     USER_BASE = get_config_var('userbase')
+|   File "/usr/lib64/python3.6/sysconfig.py", line 604, in get_config_var
+|     return get_config_vars().get(name)
+|   File "/usr/lib64/python3.6/sysconfig.py", line 553, in get_config_vars
+|     _init_posix(_CONFIG_VARS)
+|   File "/usr/lib64/python3.6/sysconfig.py", line 424, in _init_posix
+|     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+| ModuleNotFoundError: No module named '_sysconfigdata'
+
+Replace find_package PythonInterp with Python3 to fix this issue that
+it uses python3 from python3-native. And it also replaces the result
+variable PYTHON_EXECUTABLE with Python3_EXECUTABLE.
+
+This patch is only needded by doxygen-native.
+
+Upstream-Status: Inappropriate[oe specific]
+
+Signed-off-by: Kai Kang <kai.kang at windriver.com>
+---
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 969ae58..604400f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,7 @@ else ()
+ endif ()
+ 
+ find_program(DOT NAMES dot)
+-find_package(PythonInterp REQUIRED)
++find_package(Python3 REQUIRED)
+ find_package(FLEX REQUIRED)
+ find_package(BISON REQUIRED)
+ if (BISON_VERSION VERSION_LESS 2.7)
+diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
+index 6aacd8b..fa197e9 100644
+--- a/addon/doxywizard/CMakeLists.txt
++++ b/addon/doxywizard/CMakeLists.txt
+@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA
+ 
+ # generate version.cpp
+ add_custom_command(
+-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
++    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
+     DEPENDS ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_SOURCE_DIR}/src/version.py
+     OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
+ )
+@@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER
+ 
+ # generate configdoc.cpp
+ add_custom_command(
+-COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
++COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
+ OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
+ )
+ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1)
+@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN
+ set(LEX_FILES config_doxyw) 
+ foreach(lex_file ${LEX_FILES})
+     add_custom_command(
+-	    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
++	    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
+         DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l
+ 	OUTPUT  ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
+     )
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 032c16a..332f1b2 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -132,7 +132,7 @@ configure_file(${CMAKE_SOURCE_DIR}/doc/doxyindexer.1      ${PROJECT_BINARY_DIR}/
+ 
+ # doc/language.doc (see tag Doxyfile:INPUT)
+ add_custom_command(
+-        COMMAND ${PYTHON_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR}
++        COMMAND ${Python3_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR}
+         DEPENDS ${PROJECT_BINARY_DIR}/doc/maintainers.txt ${PROJECT_BINARY_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py
+         OUTPUT language.doc
+         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc
+@@ -141,7 +141,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
+ 
+ # doc/config.doc (see tag Doxyfile:INPUT)
+ add_custom_command(
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc
+         DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py
+         OUTPUT config.doc
+         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
+@@ -192,7 +192,7 @@ add_custom_target(docs_chm
+     COMMAND ${CMAKE_COMMAND} -E echo "    for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
+     COMMAND ${CMAKE_COMMAND} -E echo "        if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
+     COMMAND ${CMAKE_COMMAND} -E echo "            print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
+-    COMMAND ${CMAKE_COMMAND} -E chdir  ${PROJECT_BINARY_DIR}/chm ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp
++    COMMAND ${CMAKE_COMMAND} -E chdir  ${PROJECT_BINARY_DIR}/chm ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp
+     COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm "${HTML_HELP_COMPILER}" doxygen_manual.hhp || echo > nul
+     COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm
+         DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 967f3d4..a8d1aad 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -52,196 +52,196 @@ add_custom_target(examples
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen class.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex
+ 	DEPENDS doxygen class.h class.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen define.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex
+ 	DEPENDS doxygen define.h define.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen enum.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex
+ 	DEPENDS doxygen enum.h enum.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen file.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex
+ 	DEPENDS doxygen file.h file.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/file/html/index.html ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen func.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex
+ 	DEPENDS doxygen func.h func.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/func/html/index.html ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen javadoc-banner.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex
+ 	DEPENDS doxygen javadoc-banner.h javadoc-banner.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/html/index.html ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen page.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex
+ 	DEPENDS doxygen page.doc page.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/page/html/index.html ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen relates.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex
+ 	DEPENDS doxygen relates.cpp relates.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/relates/html/index.html ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen author.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex
+ 	DEPENDS doxygen author.cpp author.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/author/html/index.html ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen par.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex
+ 	DEPENDS doxygen par.cpp par.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/par/html/index.html ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen overload.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex
+ 	DEPENDS doxygen overload.cpp overload.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/overload/html/index.html ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen example.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex
+ 	DEPENDS doxygen example.cpp example_test.cpp example.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen include.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex
+ 	DEPENDS doxygen include.cpp include_test.cpp include.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/include/html/index.html ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen qtstyle.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex
+ 	DEPENDS doxygen qtstyle.cpp qtstyle.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/qtstyle/html/index.html ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen jdstyle.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex
+ 	DEPENDS doxygen jdstyle.cpp jdstyle.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/jdstyle/html/index.html ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen structcmd.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex
+ 	DEPENDS doxygen structcmd.h structcmd.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/structcmd/html/index.html ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen autolink.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex
+ 	DEPENDS doxygen autolink.cpp autolink.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/autolink/html/index.html ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tag.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex
+ 	DEPENDS doxygen tag.cpp tag.cfg ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen restypedef.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex
+ 	DEPENDS doxygen restypedef.cpp restypedef.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/restypedef/html/index.html ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen afterdoc.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex
+ 	DEPENDS doxygen afterdoc.h afterdoc.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/afterdoc/html/index.html ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen templ.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex
+ 	DEPENDS doxygen templ.cpp templ.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen group.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex
+ 	DEPENDS doxygen group.cpp group.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/group/html/index.html ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen memgrp.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex
+ 	DEPENDS doxygen memgrp.cpp memgrp.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/memgrp/html/index.html ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen pyexample.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex
+ 	DEPENDS doxygen pyexample.py pyexample.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/pyexample/html/index.html ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tclexample.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex
+ 	DEPENDS doxygen tclexample.tcl tclexample.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tclexample/html/index.html ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen mux.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex
+ 	DEPENDS doxygen mux.vhdl mux.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/mux/html/index.html ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen manual.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex
+ 	DEPENDS doxygen manual.c manual.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/manual/html/index.html ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex
+ )
+ 
+ add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen docstring.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex
+ 	DEPENDS doxygen docstring.py docstring.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/docstring/html/index.html ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex
+ )
+@@ -249,7 +249,7 @@ add_custom_command(
+ if (DOT)
+   add_custom_command(
+ 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
+-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
++        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
+ 	DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py
+ 	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
+   )
+diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
+index 079fcfc..e6d86f6 100644
+--- a/libmscgen/CMakeLists.txt
++++ b/libmscgen/CMakeLists.txt
+@@ -7,7 +7,7 @@ include_directories(
+ set(LEX_FILES mscgen_lexer) 
+ foreach(lex_file ${LEX_FILES})
+     add_custom_command(
+-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
++        COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
+         DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l
+         OUTPUT  ${GENERATED_SRC}/${lex_file}.l.h
+     )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 23460d0..58f679a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -35,7 +35,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
+ 
+ # configvalues.h
+ add_custom_command(
+-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h
++    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h
+     DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
+     OUTPUT ${GENERATED_SRC}/configvalues.h
+ )
+@@ -47,7 +47,7 @@ add_custom_target(
+ 
+ # configvalues.cpp
+ add_custom_command(
+-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maps ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.cpp
++    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maps ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.cpp
+     DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
+     OUTPUT ${GENERATED_SRC}/configvalues.cpp
+ )
+@@ -55,7 +55,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT
+ 
+ # configoptions.cpp
+ add_custom_command(
+-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp
++    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp
+     DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
+     OUTPUT ${GENERATED_SRC}/configoptions.cpp
+ )
+@@ -86,7 +86,7 @@ file(GLOB RESOURCES ${CMAKE_SOURCE_DIR}/templates/*/*)
+ # resources.cpp
+ add_custom_command(
+     COMMENT  "Generating ${GENERATED_SRC}/resources.cpp"
+-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
++    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
+     DEPENDS ${RESOURCES}
+     OUTPUT ${GENERATED_SRC}/resources.cpp
+ )
+@@ -94,7 +94,7 @@ set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED
+ 
+ # layout_default.xml
+ add_custom_command(
+-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h
++    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h
+     DEPENDS ${CMAKE_SOURCE_DIR}/src/layout_default.xml
+     OUTPUT  ${GENERATED_SRC}/layout_default.xml.h
+ )
+@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES})
+     set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files")
+     set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files")
+     add_custom_command(
+-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
++        COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
+         DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l
+         OUTPUT  ${GENERATED_SRC}/${lex_file}.l.h
+     )
+diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
+index 40cb40b..a301acd 100644
+--- a/testing/CMakeLists.txt
++++ b/testing/CMakeLists.txt
+@@ -1,9 +1,9 @@
+ add_custom_target(tests
+          COMMENT "Running doxygen tests..."
+-	 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
++	 COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+          DEPENDS doxygen
+ )
+ add_test(NAME suite
+-	COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
++	COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+ )
+ 
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb
index 7a4eee32c..45de71826 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb
@@ -9,6 +9,7 @@ DEPENDS = "flex-native bison-native"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
            file://0001-build-don-t-look-for-Iconv.patch \
 "
+SRC_URI_append_class-native = " file://doxygen-native-only-check-python3.patch"
 SRC_URI[md5sum] = "7997a15c73a8bd6d003eaba5c2ee2b47"
 SRC_URI[sha256sum] = "2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599"
 
-- 
2.17.1


From zangrc.fnst at cn.fujitsu.com  Wed Mar 18 05:19:39 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Wed, 18 Mar 2020 13:19:39 +0800
Subject: [oe]  [meta-oe] [PATCH] vboxguestdrivers: upgrade 6.1.2 -> 6.1.4
Message-ID: <20200318051939.4133-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../{vboxguestdrivers_6.1.2.bb => vboxguestdrivers_6.1.4.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.2.bb => vboxguestdrivers_6.1.4.bb} (95%)

diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.4.bb
similarity index 95%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.4.bb
index 62c2b509f..1227e42ea 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.4.bb
@@ -14,8 +14,8 @@ VBOX_NAME = "VirtualBox-${PV}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
 "
-SRC_URI[md5sum] = "f4f42fd09857556b04b803fb99cc6905"
-SRC_URI[sha256sum] = "4326576e8428ea3626194fc82646347576e94c61f11d412a669fc8a10c2a1e67"
+SRC_URI[md5sum] = "b3ffc51c1f082743f22bfcb71b75a396"
+SRC_URI[sha256sum] = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"
 
 S = "${WORKDIR}/vbox_module"
 
-- 
2.20.1




From raj.khem at gmail.com  Wed Mar 18 07:48:37 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 18 Mar 2020 00:48:37 -0700
Subject: [oe] [meta-oe] [PATCH] rocksdb: upgrade 6.5.2 -> 6.6.4
In-Reply-To: <1584515992-22564-4-git-send-email-wangmy@cn.fujitsu.com>
References: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
	<1584515992-22564-4-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <CAMKF1sqtJsVpgiV4XUdAnhEvC5ZFS6JcyvKvTJ2KFyTYHEry4Q@mail.gmail.com>

fails on mips https://errors.yoctoproject.org/Errors/Details/397160/

On Tue, Mar 17, 2020 at 6:50 PM Wang Mingyu <wangmy at cn.fujitsu.com> wrote:
>
> 0001-Fix-build-breakage-from-lock_guard-error-6161.patch
> removed since it is included in 6.6.4
>
> Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> ---
>  ...-breakage-from-lock_guard-error-6161.patch | 36 -------------------
>  meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb    |  7 ++--
>  2 files changed, 3 insertions(+), 40 deletions(-)
>  delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
>
> diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
> deleted file mode 100644
> index ac87d0c60..000000000
> --- a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001
> -From: Maysam Yabandeh <myabandeh at fb.com>
> -Date: Thu, 12 Dec 2019 13:48:50 -0800
> -Subject: [PATCH] Fix build breakage from lock_guard error (#6161)
> -
> -Summary:
> -This change fixes a source issue that caused compile time error which breaks build for many fbcode services in that setup. The size() member function of channel is a const member, so member variables accessed within it are implicitly const as well. This caused error when clang fails to resolve to a constructor that takes std::mutex because the suitable constructor got rejected due to loss of constness for its argument. The fix is to add mutable modifier to the lock_ member of channel.
> -Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161
> -
> -Differential Revision: D18967685
> -
> -Pulled By: maysamyabandeh
> -
> -Upstream-Status: Backport
> -
> -fbshipit-source-id: 698b6a5153c3c92eeacb842c467aa28cc350d432
> ----
> - util/channel.h | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/util/channel.h b/util/channel.h
> -index 0225482c0..a8a47680a 100644
> ---- a/util/channel.h
> -+++ b/util/channel.h
> -@@ -60,7 +60,7 @@ class channel {
> -
> -  private:
> -   std::condition_variable cv_;
> --  std::mutex lock_;
> -+  mutable std::mutex lock_;
> -   std::queue<T> buffer_;
> -   bool eof_;
> - };
> ---
> -2.24.1
> -
> diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
> index 713d5bb14..e82b77e14 100644
> --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
> +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
> @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
>                      file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>                      file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
>
> -SRCREV = "4cfbd87afd08a16df28436fb990ef6b154ee6114"
> -SRCBRANCH = "6.5.fb"
> -PV = "6.5.2"
> +SRCREV = "551a110918493a19d11243f53408b97485de1411"
> +SRCBRANCH = "6.6.fb"
> +PV = "6.6.4"
>
>  SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
> -           file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
>             file://0001-db-write_thread.cc-Initialize-state.patch \
>            "
>
> --
> 2.17.1
>
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From raj.khem at gmail.com  Wed Mar 18 07:50:32 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 18 Mar 2020 00:50:32 -0700
Subject: [oe] [meta-oe] [PATCH] rocksdb: upgrade 6.5.2 -> 6.6.4
In-Reply-To: <CAMKF1sqtJsVpgiV4XUdAnhEvC5ZFS6JcyvKvTJ2KFyTYHEry4Q@mail.gmail.com>
References: <1584515992-22564-1-git-send-email-wangmy@cn.fujitsu.com>
	<1584515992-22564-4-git-send-email-wangmy@cn.fujitsu.com>
	<CAMKF1sqtJsVpgiV4XUdAnhEvC5ZFS6JcyvKvTJ2KFyTYHEry4Q@mail.gmail.com>
Message-ID: <CAMKF1srcXQr2YcDzKdtQtn93gJiL-2m4Aj+MGsnwdbyCtqNTXQ@mail.gmail.com>

also x86/clang
https://errors.yoctoproject.org/Errors/Details/397161/

On Wed, Mar 18, 2020 at 12:48 AM Khem Raj <raj.khem at gmail.com> wrote:
>
> fails on mips https://errors.yoctoproject.org/Errors/Details/397160/
>
> On Tue, Mar 17, 2020 at 6:50 PM Wang Mingyu <wangmy at cn.fujitsu.com> wrote:
> >
> > 0001-Fix-build-breakage-from-lock_guard-error-6161.patch
> > removed since it is included in 6.6.4
> >
> > Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
> > ---
> >  ...-breakage-from-lock_guard-error-6161.patch | 36 -------------------
> >  meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb    |  7 ++--
> >  2 files changed, 3 insertions(+), 40 deletions(-)
> >  delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
> >
> > diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
> > deleted file mode 100644
> > index ac87d0c60..000000000
> > --- a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
> > +++ /dev/null
> > @@ -1,36 +0,0 @@
> > -From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001
> > -From: Maysam Yabandeh <myabandeh at fb.com>
> > -Date: Thu, 12 Dec 2019 13:48:50 -0800
> > -Subject: [PATCH] Fix build breakage from lock_guard error (#6161)
> > -
> > -Summary:
> > -This change fixes a source issue that caused compile time error which breaks build for many fbcode services in that setup. The size() member function of channel is a const member, so member variables accessed within it are implicitly const as well. This caused error when clang fails to resolve to a constructor that takes std::mutex because the suitable constructor got rejected due to loss of constness for its argument. The fix is to add mutable modifier to the lock_ member of channel.
> > -Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161
> > -
> > -Differential Revision: D18967685
> > -
> > -Pulled By: maysamyabandeh
> > -
> > -Upstream-Status: Backport
> > -
> > -fbshipit-source-id: 698b6a5153c3c92eeacb842c467aa28cc350d432
> > ----
> > - util/channel.h | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/util/channel.h b/util/channel.h
> > -index 0225482c0..a8a47680a 100644
> > ---- a/util/channel.h
> > -+++ b/util/channel.h
> > -@@ -60,7 +60,7 @@ class channel {
> > -
> > -  private:
> > -   std::condition_variable cv_;
> > --  std::mutex lock_;
> > -+  mutable std::mutex lock_;
> > -   std::queue<T> buffer_;
> > -   bool eof_;
> > - };
> > ---
> > -2.24.1
> > -
> > diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
> > index 713d5bb14..e82b77e14 100644
> > --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
> > +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
> > @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
> >                      file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> >                      file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
> >
> > -SRCREV = "4cfbd87afd08a16df28436fb990ef6b154ee6114"
> > -SRCBRANCH = "6.5.fb"
> > -PV = "6.5.2"
> > +SRCREV = "551a110918493a19d11243f53408b97485de1411"
> > +SRCBRANCH = "6.6.fb"
> > +PV = "6.6.4"
> >
> >  SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
> > -           file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
> >             file://0001-db-write_thread.cc-Initialize-state.patch \
> >            "
> >
> > --
> > 2.17.1
> >
> >
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From mingli.yu at windriver.com  Wed Mar 18 09:28:57 2020
From: mingli.yu at windriver.com (mingli.yu at windriver.com)
Date: Wed, 18 Mar 2020 17:28:57 +0800
Subject: [oe] [meta-networking][PATCH] corosync: update corosync.conf to 3.x
Message-ID: <20200318092857.192541-1-mingli.yu@windriver.com>

From: Mingli Yu <mingli.yu at windriver.com>

Update corosync.conf to make it valid after corosync
upgrades to 3.x.

Reference: https://sources.debian.org/data/main/c/corosync/3.0.3-2/debian/patches/Make-the-example-config-valid.patch

Signed-off-by: Mingli Yu <mingli.yu at windriver.com>
---
 .../corosync/corosync/corosync.conf           | 85 ++++++++++---------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/meta-networking/recipes-extended/corosync/corosync/corosync.conf
index 6aef9de95..744a30ff5 100644
--- a/meta-networking/recipes-extended/corosync/corosync/corosync.conf
+++ b/meta-networking/recipes-extended/corosync/corosync/corosync.conf
@@ -1,58 +1,61 @@
-# Starting point for cluster with pacemaker/openais
-compatibility: none
-
-corosync {
-	 user:  root
-	 group: root
-}
-
-aisexec {
-	with Pacemaker
-	user:  root
-	group: root
-}
-
-service {
-	name: pacemaker
-	ver: 1
-}
-
+# Please read the corosync.conf.5 manual page
 totem {
 	version: 2
-	secauth: off
-	threads: 0
-	interface {
-		ringnumber: 0
-		# Cluster network address
-		bindnetaddr: 192.168.10.0
-		# Should be fine in most cases, don't forget to allow
-		# packets for this address/port in netfilter if there
-		# is restrictive policy set for cluster network
-		mcastaddr: 226.94.1.1
-		mcastport: 5405
-	}
+
+	# Set name of the cluster
+	cluster_name: testCluster
+
+	# crypto_cipher and crypto_hash: Used for mutual node authentication.
+	# If you choose to enable this, then do remember to create a shared
+	# secret with "corosync-keygen".
+	# enabling crypto_cipher, requires also enabling of crypto_hash.
+	# crypto works only with knet transport
+	crypto_cipher: none
+	crypto_hash: none
 }
 
 logging {
+	# Log the source file and line where messages are being
+	# generated. When in doubt, leave off. Potentially useful for
+	# debugging.
 	fileline: off
-	to_stderr: no
+	# Log to standard error. When in doubt, set to yes. Useful when
+	# running in the foreground (when invoking "corosync -f")
+	to_stderr: yes
+	# Log to a log file. When set to "no", the "logfile" option
+	# must not be set.
 	to_logfile: yes
-	to_syslog: yes
 	logfile: /var/log/cluster/corosync.log
+	# Log to the system log daemon. When in doubt, set to yes.
+	to_syslog: yes
+	# Log debug messages (very verbose). When in doubt, leave off.
 	debug: off
-	timestamp: on
+	# Log messages with time stamps. When in doubt, set to hires (or on)
+	#timestamp: hires
 	logger_subsys {
-		subsys: AMF
+		subsys: QUORUM
 		debug: off
 	}
 }
 
-amf {
-	mode: disabled
-}
-
 quorum {
-	# Quorum for the Pacemaker Cluster Resource Manager
+	# Enable and configure quorum subsystem (default: off)
+	# see also corosync.conf.5 and votequorum.5
 	provider: corosync_votequorum
-	expected_votes: 1
+}
+
+nodelist {
+	# Change/uncomment/add node sections to match cluster configuration
+
+	node {
+		# Hostname of the node
+		name: node1
+		# Cluster membership node identifier
+		nodeid: 1
+		# Address of first link
+		ring0_addr: 127.0.0.1
+		# When knet transport is used it's possible to define up to 8 links
+		#ring1_addr: 192.168.1.1
+	}
+	# ...
 }
-- 
2.24.1


From rpjday at crashcourse.ca  Wed Mar 18 11:00:16 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Wed, 18 Mar 2020 07:00:16 -0400 (EDT)
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
In-Reply-To: <CAAnfSTu1O59FwuShBXQWTaOW7J4m1Hx5Wa_wCw6yRV-E6XNw8Q@mail.gmail.com>
References: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
	<06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
	<alpine.LFD.2.21.2003171856500.23572@localhost.localdomain>
	<CAAnfSTu1O59FwuShBXQWTaOW7J4m1Hx5Wa_wCw6yRV-E6XNw8Q@mail.gmail.com>
Message-ID: <alpine.LFD.2.21.2003180649270.1808135@localhost.localdomain>

On Tue, 17 Mar 2020, Ross Burton wrote:

> >   just to be clear, this depends on where the indent software
> > actually installs the documentation, yes? i'll have to check when
> > i get home as to were that stuff is actually placed. for all i
> > know, it *could* be under /usr/doc.
>
> Yes.
>
> That FILES suggests that the makefile is installing to /usr/doc/ and
> needs to be told somehow to use $docdir.

  never scared to look silly, but i just did a sample build (randomly
chose qemuarm64 MACHINE), added:

  IMAGE_FEATURES += "doc-pkgs"
  RM_WORK_EXCLUDE = "indent"

to local.conf, then ran:

  $ bitbake indent

to look at everything that was generated as part of the "indent" build
and how it was packaged, to understand what that:

  FILES_${PN}-doc += "/usr/doc/indent/indent.html"

line is doing in indent_2.2.12.bb, and maybe i'm misreading what was
produced, but the only documentation content produced and bundled
into the indent-doc rpm package was:

  $ rpm -qpl indent-doc-2.2.12-r0.aarch64.rpm
  /usr
  /usr/share
  /usr/share/man
  /usr/share/man/man1
  /usr/share/man/man1/indent.1
  $

so i'm confused as to that line's purpose ... thoughts?

rday

p.s. it's not like i'm obsessed with the indent package ... i'm more
interested in knowing whether i'm examining this the right way in case
it ever happens again.

From ross at burtonini.com  Wed Mar 18 12:11:34 2020
From: ross at burtonini.com (Ross Burton)
Date: Wed, 18 Mar 2020 12:11:34 +0000
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
In-Reply-To: <alpine.LFD.2.21.2003180649270.1808135@localhost.localdomain>
References: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
	<06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
	<alpine.LFD.2.21.2003171856500.23572@localhost.localdomain>
	<CAAnfSTu1O59FwuShBXQWTaOW7J4m1Hx5Wa_wCw6yRV-E6XNw8Q@mail.gmail.com>
	<alpine.LFD.2.21.2003180649270.1808135@localhost.localdomain>
Message-ID: <eade9e2d-8d47-f394-1aa4-344c054891ab@burtonini.com>

On 18/03/2020 11:00, Robert P. J. Day wrote:
>    never scared to look silly, but i just did a sample build (randomly
> chose qemuarm64 MACHINE), added:
> 
>    IMAGE_FEATURES += "doc-pkgs"
>    RM_WORK_EXCLUDE = "indent"
> 
> to local.conf, then ran:
> 
>    $ bitbake indent
> 
> to look at everything that was generated as part of the "indent" build
> and how it was packaged, to understand what that:

Much easier way:

$ oe-pkgdata-util list-pkg-files -p indent

>    FILES_${PN}-doc += "/usr/doc/indent/indent.html"
> 
> line is doing in indent_2.2.12.bb, and maybe i'm misreading what was
> produced, but the only documentation content produced and bundled
> into the indent-doc rpm package was:
> 
>    $ rpm -qpl indent-doc-2.2.12-r0.aarch64.rpm
>    /usr
>    /usr/share
>    /usr/share/man
>    /usr/share/man/man1
>    /usr/share/man/man1/indent.1
>    $
> 
> so i'm confused as to that line's purpose ... thoughts?

Historical, maybe.  If that line doesn't serve any purpose, delete it.

Ross

From rpjday at crashcourse.ca  Wed Mar 18 12:13:20 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Wed, 18 Mar 2020 08:13:20 -0400 (EDT)
Subject: [oe] should indent recipe use "${prefix}" instead of "/usr"?
In-Reply-To: <eade9e2d-8d47-f394-1aa4-344c054891ab@burtonini.com>
References: <alpine.LFD.2.21.2003171319540.14640@localhost.localdomain>
	<06ab2bbe-0bba-6b5c-1fd8-53ad3db16936@burtonini.com>
	<alpine.LFD.2.21.2003171856500.23572@localhost.localdomain>
	<CAAnfSTu1O59FwuShBXQWTaOW7J4m1Hx5Wa_wCw6yRV-E6XNw8Q@mail.gmail.com>
	<alpine.LFD.2.21.2003180649270.1808135@localhost.localdomain>
	<eade9e2d-8d47-f394-1aa4-344c054891ab@burtonini.com>
Message-ID: <alpine.LFD.2.21.2003180812480.1809848@localhost.localdomain>

On Wed, 18 Mar 2020, Ross Burton wrote:

> On 18/03/2020 11:00, Robert P. J. Day wrote:
> >    never scared to look silly, but i just did a sample build (randomly
> > chose qemuarm64 MACHINE), added:
> >
> >    IMAGE_FEATURES += "doc-pkgs"
> >    RM_WORK_EXCLUDE = "indent"
> >
> > to local.conf, then ran:
> >
> >    $ bitbake indent
> >
> > to look at everything that was generated as part of the "indent" build
> > and how it was packaged, to understand what that:
>
> Much easier way:
>
> $ oe-pkgdata-util list-pkg-files -p indent
>
> >    FILES_${PN}-doc += "/usr/doc/indent/indent.html"
> >
> > line is doing in indent_2.2.12.bb, and maybe i'm misreading what was
> > produced, but the only documentation content produced and bundled
> > into the indent-doc rpm package was:
> >
> >    $ rpm -qpl indent-doc-2.2.12-r0.aarch64.rpm
> >    /usr
> >    /usr/share
> >    /usr/share/man
> >    /usr/share/man/man1
> >    /usr/share/man/man1/indent.1
> >    $
> >
> > so i'm confused as to that line's purpose ... thoughts?
>
> Historical, maybe.  If that line doesn't serve any purpose, delete
> it.

  will do ... just nervous when something *looks* too obvious. thanks
for the guidance.

rday

From rpjday at crashcourse.ca  Wed Mar 18 12:16:58 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Wed, 18 Mar 2020 08:16:58 -0400 (EDT)
Subject: [oe] [PATCH] indent: delete meaningless line referring to "/usr/doc"
Message-ID: <alpine.LFD.2.21.2003180815070.1810045@localhost.localdomain>

Remove what appears to be historical line referencing HTML docs under
/usr/doc -- building indent generates no such file.

Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>

---

diff --git a/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb
index 0f4f4c220..90ba8a2e6 100644
--- a/meta-oe/recipes-extended/indent/indent_2.2.12.bb
+++ b/meta-oe/recipes-extended/indent/indent_2.2.12.bb
@@ -24,6 +24,4 @@ inherit autotools gettext texinfo

 CFLAGS_append_class-native = " -Wno-error=unused-value"

-FILES_${PN}-doc += "/usr/doc/indent/indent.html"
-
 BBCLASSEXTEND = "native"

-- 

========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                         http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================

From bunk at stusta.de  Wed Mar 18 18:51:59 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Wed, 18 Mar 2020 20:51:59 +0200
Subject: [oe] [meta-oe][PATCH] libqmi: Upgrade 1.24.6 -> 1.24.8
Message-ID: <20200318185200.28166-1-bunk@stusta.de>

Bugfix release on the 1.24 stable branch.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
---
 .../libqmi/{libqmi_1.24.6.bb => libqmi_1.24.8.bb}              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.6.bb => libqmi_1.24.8.bb} (85%)

diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb
similarity index 85%
rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb
rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb
index a86215aa3..124b0f1b0 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb
@@ -14,8 +14,7 @@ inherit autotools pkgconfig bash-completion
 SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
            "
 
-SRC_URI[md5sum] = "5d50233394a33e43dee3e70e197323e5"
-SRC_URI[sha256sum] = "1325257bc16de7b2b443fa689826c993474bdbd6e78c7a1e60e527269b44d8c9"
+SRC_URI[sha256sum] = "c793db2c91d7928160341b357b26315d9c879ecb36699cb7a6b36054cba60893"
 
 PACKAGECONFIG ??= "udev mbim"
 PACKAGECONFIG[udev] = ",--without-udev,libgudev"
-- 
2.17.1


From bunk at stusta.de  Wed Mar 18 18:52:00 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Wed, 18 Mar 2020 20:52:00 +0200
Subject: [oe] [meta-oe][PATCH] modemmanager: Upgrade 1.12.6 -> 1.12.8
Message-ID: <20200318185200.28166-2-bunk@stusta.de>

Bugfix release on the 1.12 stable branch.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
---
 .../{modemmanager_1.12.6.bb => modemmanager_1.12.8.bb}         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.12.6.bb => modemmanager_1.12.8.bb} (93%)

diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb
similarity index 93%
rename from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb
rename to meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb
index ef6ba6bb4..47a86b919 100644
--- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb
@@ -14,8 +14,7 @@ DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native"
 SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \
            "
 
-SRC_URI[md5sum] = "796bf7bfc156c4229cef1a9cb8c79f37"
-SRC_URI[sha256sum] = "2eb3353ee5518005c51d429308695c69d8c38cf2fd9102b04f785c03a0cc624c"
+SRC_URI[sha256sum] = "68b53d0615ba0d3e2bbf386ed029dfe644a6a30a79ab8d85523527bb4e713aff"
 
 S = "${WORKDIR}/ModemManager-${PV}"
 
-- 
2.17.1


From bunk at stusta.de  Wed Mar 18 19:18:25 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Wed, 18 Mar 2020 21:18:25 +0200
Subject: [oe] [meta-networking][PATCH] networkmanager: Upgrade 1.22.8 ->
	1.22.10
Message-ID: <20200318191825.18696-1-bunk@stusta.de>

Upgrade on the 1.22 stable branch.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
---
 .../{networkmanager_1.22.8.bb => networkmanager_1.22.10.bb}    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.22.8.bb => networkmanager_1.22.10.bb} (97%)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb
similarity index 97%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb
index 297f05618..33a2b7c0c 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb
@@ -33,8 +33,7 @@ SRC_URI_append_libc-musl = " \
     file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \
     file://musl/0004-Fix-build-with-musl-systemd-specific.patch \
 "
-SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284"
-SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f"
+SRC_URI[sha256sum] = "2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
-- 
2.17.1


From sakib.sajal at windriver.com  Wed Mar 18 19:54:36 2020
From: sakib.sajal at windriver.com (Sakib Sajal)
Date: Wed, 18 Mar 2020 12:54:36 -0700
Subject: [oe] [meta-oe][PATCH] gd: Fix CVE-2018-14553
Message-ID: <20200318195436.185832-1-sakib.sajal@windriver.com>

Backport fix from upstream to fix NULL pointer dereference.

Upstream-Status: Backport
CVE: CVE-2018-14553

Signed-off-by: Sakib Sajal <sakib.sajal at windriver.com>
---
 .../gd/gd/CVE-2018-14553.patch                | 110 ++++++++++++++++++
 meta-oe/recipes-support/gd/gd_2.2.5.bb        |   1 +
 2 files changed, 111 insertions(+)
 create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch

diff --git a/meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch b/meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch
new file mode 100644
index 000000000..344f34feb
--- /dev/null
+++ b/meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch
@@ -0,0 +1,110 @@
+From a93eac0e843148dc2d631c3ba80af17e9c8c860f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=C3=A1bio=20Cabral=20Pacheco?= <fcabralpacheco at gmail.com>
+Date: Fri, 20 Dec 2019 12:03:33 -0300
+Subject: [PATCH] Fix potential NULL pointer dereference in gdImageClone()
+
+---
+ src/gd.c                          |  9 +--------
+ tests/gdimageclone/.gitignore     |  1 +
+ tests/gdimageclone/CMakeLists.txt |  1 +
+ tests/gdimageclone/Makemodule.am  |  3 ++-
+ tests/gdimageclone/style.c        | 30 ++++++++++++++++++++++++++++++
+ 5 files changed, 35 insertions(+), 9 deletions(-)
+ create mode 100644 tests/gdimageclone/style.c
+
+diff --git a/src/gd.c b/src/gd.c
+index 592a028..d564d1f 100644
+--- a/src/gd.c
++++ b/src/gd.c
+@@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
+ 		}
+ 	}
+ 
+-	if (src->styleLength > 0) {
+-		dst->styleLength = src->styleLength;
+-		dst->stylePos    = src->stylePos;
+-		for (i = 0; i < src->styleLength; i++) {
+-			dst->style[i] = src->style[i];
+-		}
+-	}
+-
+ 	dst->interlace   = src->interlace;
+ 
+ 	dst->alphaBlendingFlag = src->alphaBlendingFlag;
+@@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
+ 
+ 	if (src->style) {
+ 		gdImageSetStyle(dst, src->style, src->styleLength);
++		dst->stylePos = src->stylePos;
+ 	}
+ 
+ 	for (i = 0; i < gdMaxColors; i++) {
+diff --git a/tests/gdimageclone/.gitignore b/tests/gdimageclone/.gitignore
+index a70782d..f4129cc 100644
+--- a/tests/gdimageclone/.gitignore
++++ b/tests/gdimageclone/.gitignore
+@@ -1 +1,2 @@
+ /bug00300
++/style
+diff --git a/tests/gdimageclone/CMakeLists.txt b/tests/gdimageclone/CMakeLists.txt
+index e6ccc31..662f4e9 100644
+--- a/tests/gdimageclone/CMakeLists.txt
++++ b/tests/gdimageclone/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ LIST(APPEND TESTS_FILES
+ 	bug00300
++	style
+ )
+ 
+ ADD_GD_TESTS()
+diff --git a/tests/gdimageclone/Makemodule.am b/tests/gdimageclone/Makemodule.am
+index 4b1b54c..51abf5c 100644
+--- a/tests/gdimageclone/Makemodule.am
++++ b/tests/gdimageclone/Makemodule.am
+@@ -1,5 +1,6 @@
+ libgd_test_programs += \
+-	gdimageclone/bug00300
++	gdimageclone/bug00300 \
++	gdimageclone/style
+ 
+ EXTRA_DIST += \
+ 	gdimageclone/CMakeLists.txt
+diff --git a/tests/gdimageclone/style.c b/tests/gdimageclone/style.c
+new file mode 100644
+index 0000000..c2b246e
+--- /dev/null
++++ b/tests/gdimageclone/style.c
+@@ -0,0 +1,30 @@
++/**
++ * Cloning an image should exactly reproduce all style related data
++ */
++
++
++#include <string.h>
++#include "gd.h"
++#include "gdtest.h"
++
++
++int main()
++{
++    gdImagePtr im, clone;
++    int style[] = {0, 0, 0};
++
++    im = gdImageCreate(8, 8);
++    gdImageSetStyle(im, style, sizeof(style)/sizeof(style[0]));
++
++    clone = gdImageClone(im);
++    gdTestAssert(clone != NULL);
++
++    gdTestAssert(clone->styleLength == im->styleLength);
++    gdTestAssert(clone->stylePos == im->stylePos);
++    gdTestAssert(!memcmp(clone->style, im->style, sizeof(style)/sizeof(style[0])));
++
++    gdImageDestroy(clone);
++    gdImageDestroy(im);
++
++    return gdNumFailures();
++}
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb
index dda2e67d6..a665de4bf 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
@@ -18,6 +18,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
            file://CVE-2018-1000222.patch \
            file://CVE-2019-6978.patch \
            file://CVE-2017-6363.patch \
+           file://CVE-2018-14553.patch \
           "
 
 SRCREV = "8255231b68889597d04d451a72438ab92a405aba"
-- 
2.17.1


From schnitzeltony at gmail.com  Wed Mar 18 20:44:07 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Wed, 18 Mar 2020 21:44:07 +0100
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28
Message-ID: <20200318204411.12996-1-schnitzeltony@gmail.com>

With upcoming network-manager-applet 1.16 this library gets mandatory: GNOME
splitted out common code from network-manager-applet to libnma.

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../libnma/libnma_1.8.28.bb                    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb

diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
new file mode 100644
index 000000000..de5ad0863
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
@@ -0,0 +1,18 @@
+SUMMARY = "NetworkManager GUI library"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0 networkmanager"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gtk-doc gettext vala
+
+SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
+SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
+
+PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
+PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
-- 
2.21.1


From schnitzeltony at gmail.com  Wed Mar 18 20:44:08 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Wed, 18 Mar 2020 21:44:08 +0100
Subject: [oe] [PATCH 2/5] network-manager-applet: upgrade 1.8.24 -> 1.16.0
In-Reply-To: <20200318204411.12996-1-schnitzeltony@gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
Message-ID: <20200318204411.12996-2-schnitzeltony@gmail.com>

* License changed in [1] - it is still GPLv2

=======================================================
network-manager-applet-1.16.0
Overview of changes since network-manager-applet-1.8.24
=======================================================

* Turned libnma into an external dependency and move to
  "https://gitlab.gnome.org/GNOME/libnma". To build,
  libnma-1.8.28 or newer is required.
* The libnm-gtk, the deprecated libnm-glib compatibility library was
  removed. Everybody should be using libnma by now.
* Improve applet icons for hidpi.
* Fix transparent dialog borders.

[1] https://gitlab.gnome.org/GNOME/network-manager-applet/-/commit/1ab20e8d49d10a7e673efc3c15983f2fac7a41fe

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../network-manager-applet_1.16.0.bb          | 25 ++++++++++++++++
 .../network-manager-applet_1.8.24.bb          | 29 -------------------
 2 files changed, 25 insertions(+), 29 deletions(-)
 create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb
 delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb

diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb
new file mode 100644
index 000000000..0cac52c05
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb
@@ -0,0 +1,25 @@
+SUMMARY = "GTK+ applet for NetworkManager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit features_check gnomebase gsettings gtk-icon-cache gettext
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[archive.md5sum] = "9652c2757e85d6caba657405cf794fbd"
+SRC_URI[archive.sha256sum] = "d6f98a455a271e7e169b5d35d290f4880f503cdf7593251572c9330941b5c3e5"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager"
+PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux"
+
+RDEPENDS_${PN} =+ "networkmanager"
+
+FILES_${PN} += " \
+    ${datadir}/nm-applet/ \
+    ${datadir}/libnma/wifi.ui \
+    ${datadir}/metainfo \
+"
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb
deleted file mode 100644
index 0853407ca..000000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "GTK+ applet for NetworkManager"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-DEPENDS = "gtk+3 libnotify libsecret networkmanager iso-codes nss"
-
-GNOMEBASEBUILDCLASS = "meson"
-inherit features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection gettext
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050"
-SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf"
-
-GTKDOC_MESON_OPTION = "gtk_doc"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr"
-PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager"
-PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info"
-PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux"
-
-RDEPENDS_${PN} =+ "networkmanager"
-
-FILES_${PN} += " \
-    ${datadir}/nm-applet/ \
-    ${datadir}/libnma/wifi.ui \
-    ${datadir}/metainfo \
-"
-- 
2.21.1


From schnitzeltony at gmail.com  Wed Mar 18 20:44:09 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Wed, 18 Mar 2020 21:44:09 +0100
Subject: [oe] [PATCH 3/5] networkmanager-openvpn: upgrade 1.8.10 -> 1.8.12
In-Reply-To: <20200318204411.12996-1-schnitzeltony@gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
Message-ID: <20200318204411.12996-3-schnitzeltony@gmail.com>

>From [1]:
=======================================================
NetworkManager-openvpn-1.8.12
Overview of changes since NetworkManager-openvpn-1.8.10
=======================================================

* The auth helper in external UI mode can now be run without a display
  server. Future nmcli version will utilize this for handling the
  secrets without a graphical desktop.
* libnm-glib compatibility (NetworkManager < 1.0) is disabled by default.
  It can be enabled by passing --with-libnm-glib to configure script.
  Nobody should need it by now. Users that still use this are encouraged
  to let us know before the libnm-glib support is removed for good.
* Add support for the following OpenVPN options: tls-version-min,
  tls-version-max, compress.
* Support inline CRL blobs during import.
* Allow option mssfix to be set to zero.
* Update Catalan, Czech, Danish, Dutch, Friulian, Hungarian,
  Indonesian, Italian, Polish, Serbian, Spanish, Swedish and Ukrainian
  translations.

[1] http://ftp.gnome.org/pub/gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.news

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 ...er-openvpn_1.8.10.bb => networkmanager-openvpn_1.8.12.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager-openvpn_1.8.10.bb => networkmanager-openvpn_1.8.12.bb} (85%)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
similarity index 85%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
index 56db770b9..5e246a85b 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
@@ -10,8 +10,8 @@ inherit gnomebase useradd gettext systemd
 
 SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "4dbbc103761facc7a61a1c00dfd55231"
-SRC_URI[sha256sum] = "af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef"
+SRC_URI[md5sum] = "e8b1210011ece18d0278310fbff45af5"
+SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318"
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
@@ -26,6 +26,7 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system nm-openvpn"
 
 FILES_${PN} += " \
+    ${datadir}/dbus-1 \
     ${libdir}/NetworkManager/*.so \
     ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
 "
-- 
2.21.1


From schnitzeltony at gmail.com  Wed Mar 18 20:44:10 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Wed, 18 Mar 2020 21:44:10 +0100
Subject: [oe] [PATCH 4/5] networkmanager-openvpn: Make PACKAGECONFIG gnome
	work
In-Reply-To: <20200318204411.12996-1-schnitzeltony@gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
Message-ID: <20200318204411.12996-4-schnitzeltony@gmail.com>

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
index 5e246a85b..d455a0f06 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
@@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
+# meta-gnome in layers is required using gnome:
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
+
+do_configure_append() {
+    # network-manager-openvpn.metainfo.xml is created in source folder but
+    # compile expects it in build folder. As long as nobody comes up with a
+    # better solution just support build:
+    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
+        mkdir -p ${B}/appdata
+        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/
+    fi
+}
 
 do_install_append () {
     rm -rf ${D}${libdir}/NetworkManager/*.la
-- 
2.21.1


From schnitzeltony at gmail.com  Wed Mar 18 20:44:11 2020
From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=)
Date: Wed, 18 Mar 2020 21:44:11 +0100
Subject: [oe] [PATCH 5/5] gnome-control-center: replace
	network-manager-applet by libnma in DEPENDS
In-Reply-To: <20200318204411.12996-1-schnitzeltony@gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
Message-ID: <20200318204411.12996-5-schnitzeltony@gmail.com>

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../gnome-control-center/gnome-control-center_3.34.4.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb
index c4ba833a1..253322063 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb
@@ -20,7 +20,7 @@ DEPENDS = " \
     gnome-settings-daemon \
     gnome-desktop3 \
     gnome-online-accounts \
-    network-manager-applet \
+    libnma \
     gnome-bluetooth \
     grilo \
     libgtop \
-- 
2.21.1


From raj.khem at gmail.com  Wed Mar 18 22:24:59 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 18 Mar 2020 15:24:59 -0700
Subject: [oe] [meta-oe][PATCH] libyui-ncurses: Fix multilib build
Message-ID: <20200318222500.3249882-1-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
index dae5c342de..1a376a4697 100644
--- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
@@ -25,8 +25,10 @@ do_configure_prepend () {
     git checkout bootstrap.sh
     sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh
     ./bootstrap.sh
-    mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
-    cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
+    if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then
+        mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
+        cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
+    fi
     cd -
     sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt
     sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake
-- 
2.25.2


From raj.khem at gmail.com  Wed Mar 18 22:25:00 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 18 Mar 2020 15:25:00 -0700
Subject: [oe] [meta-oe][PATCH] rocksdb: Fix build on platforms not having
	all atomic intrinsics
In-Reply-To: <20200318222500.3249882-1-raj.khem@gmail.com>
References: <20200318222500.3249882-1-raj.khem@gmail.com>
Message-ID: <20200318222500.3249882-2-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...1-cmake-Add-check-for-atomic-support.patch | 127 ++++++++++++++++++
 meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb    |   1 +
 2 files changed, 128 insertions(+)
 create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch

diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
new file mode 100644
index 0000000000..82dc2d584b
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
@@ -0,0 +1,127 @@
+From ba0a0e54d9544babbd3963891f4e3200dd5583f5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Wed, 18 Mar 2020 15:10:37 -0700
+Subject: [PATCH] cmake: Add check for atomic support
+
+Detect if libatomic should be linked in or compiler and platform can
+provide the needed atomic instrinsics, this helps build on certain
+platforms like mips or clang/i386
+
+Fixes
+
+| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_exchange_8'
+| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_fetch_or_8'
+| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_compare_exchange_8'
+| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_fetch_sub_8'
+| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_load_8'
+| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_store_8'
+| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_fetch_add_8'
+
+Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/6555]
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ CMakeLists.txt                  |  6 +++
+ cmake/modules/CheckAtomic.cmake | 69 +++++++++++++++++++++++++++++++++
+ 2 files changed, 75 insertions(+)
+ create mode 100644 cmake/modules/CheckAtomic.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eebda35e9..692d71911 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -776,11 +776,17 @@ if(WITH_LIBRADOS)
+   list(APPEND THIRDPARTY_LIBS rados)
+ endif()
+ 
++# check if linking against libatomic is necessary
++include(CheckAtomic)
++
+ if(WIN32)
+   set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
+   set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
+ else()
+   set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT})
++  if(HAVE_CXX_ATOMIC_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++    set(SYSTEM_LIBS ${SYSTEM_LIBS} atomic)
++  endif()
+   set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
+ 
+   add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES})
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+new file mode 100644
+index 000000000..8b7dc8a37
+--- /dev/null
++++ b/cmake/modules/CheckAtomic.cmake
+@@ -0,0 +1,69 @@
++# Checks if atomic operations are supported natively or if linking against
++# libatomic is needed.
++
++# Check inspired by LLVMs cmake/modules/CheckAtomic.cmake
++
++INCLUDE(CheckCXXSourceCompiles)
++INCLUDE(CheckLibraryExists)
++
++function(check_working_cxx_atomics varname)
++  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
++  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
++  CHECK_CXX_SOURCE_COMPILES("
++#include <atomic>
++std::atomic<int> x;
++int main() {
++  return x;
++}
++" ${varname})
++  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
++endfunction(check_working_cxx_atomics)
++
++function(check_working_cxx_atomics64 varname)
++  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
++  set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}")
++  CHECK_CXX_SOURCE_COMPILES("
++#include <atomic>
++#include <cstdint>
++std::atomic<uint64_t> x (0);
++std::atomic<double> y (0);
++int main() {
++  uint64_t i = x.load(std::memory_order_relaxed);
++  return int(y);
++}
++" ${varname})
++  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
++endfunction(check_working_cxx_atomics64)
++
++# Check if atomics work without libatomic
++check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
++
++if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
++  check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
++  if( HAVE_LIBATOMIC )
++    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++    check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
++    if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
++      message(FATAL_ERROR "Host compiler must support std::atomic!")
++    endif()
++  else()
++    message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
++  endif()
++endif()
++
++# Check if 64bit atomics work without libatomic
++check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
++
++if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
++  check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
++  if(HAVE_CXX_LIBATOMICS64)
++    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++    check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
++    if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
++      message(FATAL_ERROR "Host compiler must support std::atomic!")
++    endif()
++  else()
++    message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
++  endif()
++endif()
++
+-- 
+2.25.2
+
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
index e82b77e147..addf9552b5 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
@@ -12,6 +12,7 @@ PV = "6.6.4"
 
 SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
            file://0001-db-write_thread.cc-Initialize-state.patch \
+           file://0001-cmake-Add-check-for-atomic-support.patch \
           "
 
 S = "${WORKDIR}/git"
-- 
2.25.2


From wangmy at cn.fujitsu.com  Thu Mar 19 07:39:16 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Thu, 19 Mar 2020 00:39:16 -0700
Subject: [oe]  [meta-oe][PATCH] hwdata: upgrade 0.332 -> 0.333
In-Reply-To: <1584603557-43263-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584603557-43263-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584603557-43263-2-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb
index 77bb60aed..5f3e3f686 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_git.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb
@@ -5,8 +5,8 @@ SECTION = "System/Base"
 LICENSE = "GPL-2.0+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
 
-PV = "0.332"
-SRCREV = "17cc5d636a559ae1073865846980e4db35f7989a"
+PV = "0.333"
+SRCREV = "2de52be0d00015fa6cde70bb845fa9b86cf6f420"
 SRC_URI = "git://github.com/vcrhonek/${BPN}.git"
 
 S = "${WORKDIR}/git"
-- 
2.17.1




From wangmy at cn.fujitsu.com  Thu Mar 19 07:39:15 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Thu, 19 Mar 2020 00:39:15 -0700
Subject: [oe] [meta-oe][master][PATCH] php: CVE-2019-11045.patch
	CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch
Message-ID: <1584603557-43263-1-git-send-email-wangmy@cn.fujitsu.com>

Security Advisory

References:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../php/php/CVE-2019-11045.patch              | 78 +++++++++++++++++++
 .../php/php/CVE-2019-11046.patch              | 59 ++++++++++++++
 .../php/php/CVE-2019-11047.patch              | 57 ++++++++++++++
 .../php/php/CVE-2019-11050.patch              | 53 +++++++++++++
 meta-oe/recipes-devtools/php/php_7.3.11.bb    |  4 +
 5 files changed, 251 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
 create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch

diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
new file mode 100644
index 000000000..3b3c187a4
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch
@@ -0,0 +1,78 @@
+From a5a15965da23c8e97657278fc8dfbf1dfb20c016 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69 at gmx.de>
+Date: Mon, 25 Nov 2019 16:56:34 +0100
+Subject: [PATCH] Fix #78863: DirectoryIterator class silently truncates after
+ a null byte
+
+Since the constructor of DirectoryIterator and friends is supposed to
+accepts paths (i.e. strings without NUL bytes), we must not accept
+arbitrary strings.
+
+Upstream-Status: Accepted
+CVE: CVE-2019-11045
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=a5a15965da23c8e97657278fc8dfbf1dfb20c016
+http://git.php.net/?p=php-src.git;a=commit;h=d74907b8575e6edb83b728c2a94df434c23e1f79
+---
+ ext/spl/spl_directory.c     |  4 ++--
+ ext/spl/tests/bug78863.phpt | 31 +++++++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+), 2 deletions(-)
+ create mode 100644 ext/spl/tests/bug78863.phpt
+
+diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
+index 91ea2e0265..56e809b1c7 100644
+--- a/ext/spl/spl_directory.c
++++ b/ext/spl/spl_directory.c
+@@ -708,10 +708,10 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto
+ 
+ 	if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_FLAGS)) {
+ 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO;
+-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &path, &len, &flags);
++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &path, &len, &flags);
+ 	} else {
+ 		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
+-		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &len);
++		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &len);
+ 	}
+ 	if (SPL_HAS_FLAG(ctor_flags, SPL_FILE_DIR_SKIPDOTS)) {
+ 		flags |= SPL_FILE_DIR_SKIPDOTS;
+diff --git a/ext/spl/tests/bug78863.phpt b/ext/spl/tests/bug78863.phpt
+new file mode 100644
+index 0000000000..dc88d98dee
+--- /dev/null
++++ b/ext/spl/tests/bug78863.phpt
+@@ -0,0 +1,31 @@
++--TEST--
++Bug #78863 (DirectoryIterator class silently truncates after a null byte)
++--FILE--
++<?php
++$dir = __DIR__ . '/bug78863';
++mkdir($dir);
++touch("$dir/bad");
++mkdir("$dir/sub");
++touch("$dir/sub/good");
++
++$it = new DirectoryIterator(__DIR__ . "/bug78863\0/sub");
++foreach ($it as $fileinfo) {
++    if (!$fileinfo->isDot()) {
++        var_dump($fileinfo->getFilename());
++    }
++}
++?>
++--EXPECTF--
++Fatal error: Uncaught UnexpectedValueException: DirectoryIterator::__construct() expects parameter 1 to be a valid path, string given in %s:%d
++Stack trace:
++#0 %s(%d): DirectoryIterator->__construct('%s')
++#1 {main}
++  thrown in %s on line %d
++--CLEAN--
++<?php
++$dir = __DIR__ . '/bug78863';
++unlink("$dir/sub/good");
++rmdir("$dir/sub");
++unlink("$dir/bad");
++rmdir($dir);
++?>
+-- 
+2.11.0
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
new file mode 100644
index 000000000..711b8525a
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch
@@ -0,0 +1,59 @@
+From 2d07f00b73d8f94099850e0f5983e1cc5817c196 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69 at gmx.de>
+Date: Sat, 30 Nov 2019 12:26:37 +0100
+Subject: [PATCH] Fix #78878: Buffer underflow in bc_shift_addsub
+
+We must not rely on `isdigit()` to detect digits, since we only support
+decimal ASCII digits in the following processing.
+
+(cherry picked from commit eb23c6008753b1cdc5359dead3a096dce46c9018)
+
+Upstream-Status: Accepted
+CVE: CVE-2019-11046
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=eb23c6008753b1cdc5359dead3a096dce46c9018
+http://git.php.net/?p=php-src.git;a=commit;h=2d07f00b73d8f94099850e0f5983e1cc5817c196
+---
+ ext/bcmath/libbcmath/src/str2num.c |  4 ++--
+ ext/bcmath/tests/bug78878.phpt     | 13 +++++++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100644 ext/bcmath/tests/bug78878.phpt
+
+diff --git a/ext/bcmath/libbcmath/src/str2num.c b/ext/bcmath/libbcmath/src/str2num.c
+index f38d341570..03aec15930 100644
+--- a/ext/bcmath/libbcmath/src/str2num.c
++++ b/ext/bcmath/libbcmath/src/str2num.c
+@@ -57,9 +57,9 @@ bc_str2num (bc_num *num, char *str, int scale)
+   zero_int = FALSE;
+   if ( (*ptr == '+') || (*ptr == '-'))  ptr++;  /* Sign */
+   while (*ptr == '0') ptr++;			/* Skip leading zeros. */
+-  while (isdigit((int)*ptr)) ptr++, digits++;	/* digits */
++  while (*ptr >= '0' && *ptr <= '9') ptr++, digits++;	/* digits */
+   if (*ptr == '.') ptr++;			/* decimal point */
+-  while (isdigit((int)*ptr)) ptr++, strscale++;	/* digits */
++  while (*ptr >= '0' && *ptr <= '9') ptr++, strscale++;	/* digits */
+   if ((*ptr != '\0') || (digits+strscale == 0))
+     {
+       *num = bc_copy_num (BCG(_zero_));
+diff --git a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt
+new file mode 100644
+index 0000000000..2c9d72b946
+--- /dev/null
++++ b/ext/bcmath/tests/bug78878.phpt
+@@ -0,0 +1,13 @@
++--TEST--
++Bug #78878 (Buffer underflow in bc_shift_addsub)
++--SKIPIF--
++<?php
++if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
++?>
++--FILE--
++<?php
++print @bcmul("\xB26483605105519922841849335928742092", bcpowmod(2, 65535, -4e-4));
++?>
++--EXPECT--
++bc math warning: non-zero scale in modulus
++0
+-- 
+2.11.0
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
new file mode 100644
index 000000000..e2922bf8f
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch
@@ -0,0 +1,57 @@
+From d348cfb96f2543565691010ade5e0346338be5a7 Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas at php.net>
+Date: Mon, 16 Dec 2019 00:10:39 -0800
+Subject: [PATCH] Fixed bug #78910
+
+Upstream-Status: Accepted
+CVE-2019-11047
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=d348cfb96f2543565691010ade5e0346338be5a7
+http://git.php.net/?p=php-src.git;a=commit;h=57325460d2bdee01a13d8e6cf03345c90543ff4f
+---
+ ext/exif/exif.c              |  3 ++-
+ ext/exif/tests/bug78910.phpt | 17 +++++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+ create mode 100644 ext/exif/tests/bug78910.phpt
+
+diff --git a/ext/exif/exif.c b/ext/exif/exif.c
+index 2804807e..a5780113 100644
+--- a/ext/exif/exif.c
++++ b/ext/exif/exif.c
+@@ -3138,7 +3138,8 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
+ 		/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s)", maker_note->make?maker_note->make:"");*/
+ 		if (maker_note->make && (!ImageInfo->make || strcmp(maker_note->make, ImageInfo->make)))
+ 			continue;
+-		if (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
++		if (maker_note->id_string && value_len >= maker_note->id_string_len
++				&& strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
+ 			continue;
+ 		break;
+ 	}
+diff --git a/ext/exif/tests/bug78910.phpt b/ext/exif/tests/bug78910.phpt
+new file mode 100644
+index 00000000..f5b1c32c
+--- /dev/null
++++ b/ext/exif/tests/bug78910.phpt
+@@ -0,0 +1,17 @@
++--TEST--
++Bug #78910: Heap-buffer-overflow READ in exif (OSS-Fuzz #19044)
++--FILE--
++<?php
++
++var_dump(exif_read_data('data:image/jpg;base64,TU0AKgAAAAwgICAgAAIBDwAEAAAAAgAAACKSfCAgAAAAAEZVSklGSUxN'));
++
++?>
++--EXPECTF--
++Notice: exif_read_data(): Read from TIFF: tag(0x927C, MakerNote  ): Illegal format code 0x2020, switching to BYTE in %s on line %d
++
++Warning: exif_read_data(): Process tag(x927C=MakerNote  ): Illegal format code 0x2020, suppose BYTE in %s on line %d
++
++Warning: exif_read_data(): IFD data too short: 0x0000 offset 0x000C in %s on line %d
++
++Warning: exif_read_data(): Invalid TIFF file in %s on line %d
++bool(false)
+-- 
+2.17.1
+
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
new file mode 100644
index 000000000..700b99bd9
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch
@@ -0,0 +1,53 @@
+From c14eb8de974fc8a4d74f3515424c293bc7a40fba Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas at php.net>
+Date: Mon, 16 Dec 2019 01:14:38 -0800
+Subject: [PATCH] Fix bug #78793
+
+Upstream-Status: Accepted
+CVE-2019-11050
+   
+Reference to upstream patch:
+http://git.php.net/?p=php-src.git;a=commit;h=c14eb8de974fc8a4d74f3515424c293bc7a40fba
+http://git.php.net/?p=php-src.git;a=commit;h=1b3b4a0d367b6f0b67e9f73d82f53db6c6b722b2
+---
+ ext/exif/exif.c              |  5 +++--
+ ext/exif/tests/bug78793.phpt | 12 ++++++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100644 ext/exif/tests/bug78793.phpt
+
+diff --git a/ext/exif/exif.c b/ext/exif/exif.c
+index c0be05922f..7fe055f381 100644
+--- a/ext/exif/exif.c
++++ b/ext/exif/exif.c
+@@ -3240,8 +3240,9 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
+ 	}
+ 
+ 	for (de=0;de<NumDirEntries;de++) {
+-		if (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,
+-								  offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {
++		size_t offset = 2 + 12 * de;
++		if (!exif_process_IFD_TAG(ImageInfo, dir_start + offset,
++								  offset_base, data_len - offset, displacement, section_index, 0, maker_note->tag_table)) {
+ 			return FALSE;
+ 		}
+ 	}
+diff --git a/ext/exif/tests/bug78793.phpt b/ext/exif/tests/bug78793.phpt
+new file mode 100644
+index 0000000000..033f255ace
+--- /dev/null
++++ b/ext/exif/tests/bug78793.phpt
+@@ -0,0 +1,12 @@
++--TEST--
++Bug #78793: Use-after-free in exif parsing under memory sanitizer
++--FILE--
++<?php
++$f = "ext/exif/tests/bug77950.tiff";
++for ($i = 0; $i < 10; $i++) {
++    @exif_read_data($f);
++}
++?>
++===DONE===
++--EXPECT--
++===DONE===
+-- 
+2.11.0
diff --git a/meta-oe/recipes-devtools/php/php_7.3.11.bb b/meta-oe/recipes-devtools/php/php_7.3.11.bb
index 8dbaf8922..880ac839b 100644
--- a/meta-oe/recipes-devtools/php/php_7.3.11.bb
+++ b/meta-oe/recipes-devtools/php/php_7.3.11.bb
@@ -19,6 +19,10 @@ SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
            file://debian-php-fixheader.patch \
            file://CVE-2019-6978.patch \
            file://CVE-2020-7059.patch \
+           file://CVE-2019-11045.patch \
+           file://CVE-2019-11046.patch \
+           file://CVE-2019-11047.patch \
+           file://CVE-2019-11050.patch \
           "
 
 SRC_URI_append_class-target = " \
-- 
2.17.1




From wangmy at cn.fujitsu.com  Thu Mar 19 07:39:17 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Thu, 19 Mar 2020 00:39:17 -0700
Subject: [oe]  [meta-oe] [PATCH] nss: upgrade 3.50 -> 3.51
In-Reply-To: <1584603557-43263-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1584603557-43263-1-git-send-email-wangmy@cn.fujitsu.com>
Message-ID: <1584603557-43263-3-git-send-email-wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 meta-oe/recipes-support/nss/{nss_3.50.bb => nss_3.51.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/nss/{nss_3.50.bb => nss_3.51.bb} (98%)

diff --git a/meta-oe/recipes-support/nss/nss_3.50.bb b/meta-oe/recipes-support/nss/nss_3.51.bb
similarity index 98%
rename from meta-oe/recipes-support/nss/nss_3.50.bb
rename to meta-oe/recipes-support/nss/nss_3.51.bb
index e9855d7a7..889967c03 100644
--- a/meta-oe/recipes-support/nss/nss_3.50.bb
+++ b/meta-oe/recipes-support/nss/nss_3.51.bb
@@ -34,8 +34,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
            file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
            "
 
-SRC_URI[md5sum] = "e0366615e12b147cebc136c915baea37"
-SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7"
+SRC_URI[md5sum] = "e59dc16965ef7713669c628d2640ebd1"
+SRC_URI[sha256sum] = "75348b3b3229362486c57a880db917da1f96ef4eb639dc9cc2ff17d72268459c"
 
 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
-- 
2.17.1




From raj.khem at gmail.com  Thu Mar 19 04:13:32 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Wed, 18 Mar 2020 21:13:32 -0700
Subject: [oe] [PATCH 4/5] networkmanager-openvpn: Make PACKAGECONFIG
	gnome work
In-Reply-To: <20200318204411.12996-4-schnitzeltony@gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
	<20200318204411.12996-4-schnitzeltony@gmail.com>
Message-ID: <CAMKF1sobKhs8spp7UY-dny3nZQtKLS3BMOTNR9q6updeaLSuLA@mail.gmail.com>

On Wed, Mar 18, 2020 at 1:45 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
>
> Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> ---
>  .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> index 5e246a85b..d455a0f06 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> @@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
>
>  S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
>
> -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
> +# meta-gnome in layers is required using gnome:
> +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
> +
> +do_configure_append() {
> +    # network-manager-openvpn.metainfo.xml is created in source folder but
> +    # compile expects it in build folder. As long as nobody comes up with a
> +    # better solution just support build:
> +    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
> +        mkdir -p ${B}/appdata
> +        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/

perhaps use install -Dm 0644 here

> +    fi
> +}
>
>  do_install_append () {
>      rm -rf ${D}${libdir}/NetworkManager/*.la
> --
> 2.21.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From zangrc.fnst at cn.fujitsu.com  Thu Mar 19 05:40:32 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Thu, 19 Mar 2020 13:40:32 +0800
Subject: [oe] [meta-networking] [zeus] [PATCH] wireshark: upgrade 3.0.6 ->
	3.0.9
Message-ID: <20200319054032.14353-1-zangrc.fnst@cn.fujitsu.com>

To fix CVE issues, update to 3.0.9.

3.0.9
wnpa-sec-2020-03 LTE RRC dissector memory leak. Bug 16341.
wnpa-sec-2020-04 WiMax DLMAP dissector crash. Bug 16368.
wnpa-sec-2020-05 EAP dissector crash. Bug 16397.

3.0.8
wnpa-sec-2020-02 BT ATT dissector crash. Bug 16258. CVE-2020-7045.
3.0.7
wnpa-sec-2019-22 CMS dissector crash. Bug 15961. CVE-2019-19553.

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../wireshark/{wireshark_3.0.6.bb => wireshark_3.0.9.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.9.bb} (95%)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.9.bb
similarity index 95%
rename from meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
rename to meta-networking/recipes-support/wireshark/wireshark_3.0.9.bb
index ccaa0c94a..76309f140 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.9.bb
@@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-SRC_URI[md5sum] = "c6f8d12a3efe21cc7885f7cb0c4bd938"
-SRC_URI[sha256sum] = "a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e"
+SRC_URI[md5sum] = "4250b5bfb7f0ce04321114df9682503c"
+SRC_URI[sha256sum] = "bb4697ead91824b1fa33ffbe6643f6193459a66c906910a7611d5b26ff32aa04"
 
 PE = "1"
 
-- 
2.20.1




From schnitzeltony at gmail.com  Thu Mar 19 08:16:52 2020
From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=)
Date: Thu, 19 Mar 2020 09:16:52 +0100
Subject: [oe] [PATCH 4/5] networkmanager-openvpn: Make PACKAGECONFIG
	gnome work
In-Reply-To: <CAMKF1sobKhs8spp7UY-dny3nZQtKLS3BMOTNR9q6updeaLSuLA@mail.gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
	<20200318204411.12996-4-schnitzeltony@gmail.com>
	<CAMKF1sobKhs8spp7UY-dny3nZQtKLS3BMOTNR9q6updeaLSuLA@mail.gmail.com>
Message-ID: <CALbNGRRG+_-J9_ixPpA24AvkO3iAOKqrSM4kP9-gXwgHQpP7Gg@mail.gmail.com>

On Thu, Mar 19, 2020 at 5:14 AM Khem Raj <raj.khem at gmail.com> wrote:
>
> On Wed, Mar 18, 2020 at 1:45 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
> >
> > Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> > ---
> >  .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
> >  1 file changed, 12 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> > index 5e246a85b..d455a0f06 100644
> > --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> > +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> > @@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
> >
> >  S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
> >
> > -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
> > +# meta-gnome in layers is required using gnome:
> > +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
> > +
> > +do_configure_append() {
> > +    # network-manager-openvpn.metainfo.xml is created in source folder but
> > +    # compile expects it in build folder. As long as nobody comes up with a
> > +    # better solution just support build:
> > +    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
> > +        mkdir -p ${B}/appdata
> > +        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/
>
> perhaps use install -Dm 0644 here
In do_configure for a file required for buld-time only?

Andreas

From raj.khem at gmail.com  Thu Mar 19 08:29:58 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Thu, 19 Mar 2020 01:29:58 -0700
Subject: [oe] [PATCH 4/5] networkmanager-openvpn: Make PACKAGECONFIG
	gnome work
In-Reply-To: <CALbNGRRG+_-J9_ixPpA24AvkO3iAOKqrSM4kP9-gXwgHQpP7Gg@mail.gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
	<20200318204411.12996-4-schnitzeltony@gmail.com>
	<CAMKF1sobKhs8spp7UY-dny3nZQtKLS3BMOTNR9q6updeaLSuLA@mail.gmail.com>
	<CALbNGRRG+_-J9_ixPpA24AvkO3iAOKqrSM4kP9-gXwgHQpP7Gg@mail.gmail.com>
Message-ID: <CAMKF1sqgk6pMmeAG8r7QQAqAeneXY4PSFM1LBAf=ebP__1g0Sw@mail.gmail.com>

On Thu, Mar 19, 2020 at 1:17 AM Andreas M?ller <schnitzeltony at gmail.com> wrote:
>
> On Thu, Mar 19, 2020 at 5:14 AM Khem Raj <raj.khem at gmail.com> wrote:
> >
> > On Wed, Mar 18, 2020 at 1:45 PM Andreas M?ller <schnitzeltony at gmail.com> wrote:
> > >
> > > Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
> > > ---
> > >  .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++-
> > >  1 file changed, 12 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> > > index 5e246a85b..d455a0f06 100644
> > > --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> > > +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb
> > > @@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f
> > >
> > >  S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
> > >
> > > -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
> > > +# meta-gnome in layers is required using gnome:
> > > +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
> > > +
> > > +do_configure_append() {
> > > +    # network-manager-openvpn.metainfo.xml is created in source folder but
> > > +    # compile expects it in build folder. As long as nobody comes up with a
> > > +    # better solution just support build:
> > > +    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
> > > +        mkdir -p ${B}/appdata
> > > +        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/
> >
> > perhaps use install -Dm 0644 here
> In do_configure for a file required for buld-time only?
>

ah nevermind.

> Andreas

From raj.khem at gmail.com  Thu Mar 19 08:44:25 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Thu, 19 Mar 2020 01:44:25 -0700
Subject: [oe] [zeus 00/13] Patch review
In-Reply-To: <cover.1583981708.git.akuster808@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
Message-ID: <CAMKF1sooQTeEkmOSu+torVhMZ8R_3FqCzEOWwRMT0drKpAOZDw@mail.gmail.com>

look

On Wed, Mar 11, 2020 at 7:58 PM Armin Kuster <akuster808 at gmail.com> wrote:
>
> Here is the next set for meta-openembedded.
> Please have reviews back by Friday.
>
> The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
>
>   fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
>
> are available in the Git repository at:
>
>   git://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
>   http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
>
> Adrian Bunk (1):
>   wireshark: Upgrade 3.0.6 -> 3.0.8
>
> Carlos Rafael Giani (1):
>   opencv: Enable pkg-config .pc file generation
>
> Khem Raj (2):
>   ade: Fix install paths in multilib builds
>   sanlock: Replace cp -a with cp -R --no-dereference
>
> Martin Jansa (1):
>   s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
>     use git fetcher instead of svn fetcher
>
> Mike Krupicka (1):
>   mosquitto: Use mosquitto.init for daemon init
>
> Paul Barker (1):
>   lmsensors: Fix sensord dependencies
>
> Peter Kjellerstedt (2):
>   lvm2, libdevmapper: Do not patch configure
>   libldb: Do not require the "pam" distro feature to be enabled
>
> Ross Burton (4):
>   opencv: don't download during configure
>   opencv: also download face alignment data in do_fetch()
>   opencv: PACKAGECONFIG for G-API, use system ADE
>   opencv: abort configure if we need to download
>
>  .../mosquitto/files/mosquitto.init            |  2 +-
>  .../recipes-support/libldb/libldb_1.5.6.bb    |  3 +-
>  ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} |  4 +-
>  .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb |  3 +-
>  ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++
>  .../recipes-extended/sanlock/sanlock_3.8.0.bb |  4 +-
>  ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------
>  ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++
>  meta-oe/recipes-support/opencv/ade_0.1.1f.bb  |  1 +
>  .../opencv/opencv/download.patch              | 32 ++++++++++++
>  .../recipes-support/opencv/opencv_4.1.0.bb    | 32 ++++++++++--
>  ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} |  7 ++-
>  ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} |  6 +--
>  ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++--
>  .../{usbpath_svn.bb => usbpath_git.bb}        | 10 ++--
>  .../{wmiconfig_svn.bb => wmiconfig_git.bb}    | 13 +++--
>  16 files changed, 183 insertions(+), 69 deletions(-)
>  rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%)
>  create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
>  create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
>  create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%)
>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%)
>  rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
>  rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%)
>  rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From rpjday at crashcourse.ca  Thu Mar 19 13:22:54 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Thu, 19 Mar 2020 09:22:54 -0400 (EDT)
Subject: [oe] proper way to report(?) conflicting files being installed?
Message-ID: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>


  long story short, colleague was adding packages to a build and ran
into error wherein both of:

  * autoconf-archive
  * gnome-common

were trying to install a couple identical m4-related files. some
quick googling produced this:

  https://patchwork.openembedded.org/patch/142467/

with the self-evident solution being applied to gnome-common to
"uninstall" the two conflicting files:

--- a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb
+++ b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb
@@ -17,4 +17,15 @@  DEPENDS = ""
 FILES_${PN} += "${datadir}/aclocal"
 FILES_${PN}-dev = ""

+# ax_code_coverage.m4 and ax_check_enable_debug.m4 are in gnome-common only
+# because older versions of autoconf-archive didn't have them yet. Now they
+# are in autoconf-archive from OE-core. We depend on that below to ensure
+# that recipes which only depend on gnome-common still get them.
+do_install_append () {
+    rm -f ${D}${datadir}/aclocal/ax_code_coverage.m4
+    rm -f ${D}${datadir}/aclocal/ax_check_enable_debug.m4
+}
+RDEPENDS_${PN} += "autoconf-archive"
+DEPENDS_append_class-native = " autoconf-archive-native"
+

  it *appears* that solved the problem, which raises the question --
should this patch be applied to the current gnome-common recipe? that
patchwork entry dates back to 2017 ... should it have been applied at
some point?

rday

From pjtexier at koncepto.io  Thu Mar 19 13:41:08 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Thu, 19 Mar 2020 14:41:08 +0100
Subject: [oe] [meta-oe][PATCH] libev: upgrade 4.31 -> 4.33
Message-ID: <1584625268-20452-1-git-send-email-pjtexier@koncepto.io>

The complete Changes since 4.31 are:

4.33 Wed Mar 18 13:22:29 CET 2020
        - the 4.31 timerfd code wrongly changed the priority of the signal
          fd watcher, which is usually harmless unless signal fds are
          also used (found via cpan tester service).
        - the documentation wrongly claimed that user may modify fd and events
          members in io watchers when the watcher was stopped
          (found by b_jonas).
        - new ev_io_modify mutator which changes only the events member,
          which can be faster. also added ev::io::set (int events) method
          to ev++.h.
        - officially allow a zero events mask for io watchers. this should
          work with older libev versions as well but was not officially
          allowed before.
        - do not wake up every minute when timerfd is used to detect timejumps.
        - do not wake up every minute when periodics are disabled and we have
          a monotonic clock.
        - support a lot more "uncommon" compile time configurations,
          such as ev_embed enabled but ev_timer disabled.
        - use a start/stop wrapper class to reduce code duplication in
          ev++.h and make it needlessly more c++-y.
        - the linux aio backend is no longer compiled in by default.
        - update to libecb version 0x00010008.

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 meta-oe/recipes-connectivity/libev/{libev_4.31.bb => libev_4.33.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/libev/{libev_4.31.bb => libev_4.33.bb} (80%)

diff --git a/meta-oe/recipes-connectivity/libev/libev_4.31.bb b/meta-oe/recipes-connectivity/libev/libev_4.33.bb
similarity index 80%
rename from meta-oe/recipes-connectivity/libev/libev_4.31.bb
rename to meta-oe/recipes-connectivity/libev/libev_4.33.bb
index beea855..760c2db 100644
--- a/meta-oe/recipes-connectivity/libev/libev_4.31.bb
+++ b/meta-oe/recipes-connectivity/libev/libev_4.33.bb
@@ -5,8 +5,8 @@ LICENSE = "BSD-2-Clause | GPL-2.0+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347"
 
 SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz"
-SRC_URI[md5sum] = "20111fda0df0a289c152faa2aac91b08"
-SRC_URI[sha256sum] = "ed855d2b52118e32c0c1a6a32bd18c97f9e6711ca511f5ee12de3b9eccc66e5a"
+SRC_URI[md5sum] = "a3433f23583167081bf4acdd5b01b34f"
+SRC_URI[sha256sum] = "507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea"
 
 inherit autotools
 
-- 
2.7.4


From bunk at stusta.de  Thu Mar 19 13:42:13 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Thu, 19 Mar 2020 15:42:13 +0200
Subject: [oe] proper way to report(?) conflicting files being installed?
In-Reply-To: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
References: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
Message-ID: <20200319134213.GA29515@localhost>

On Thu, Mar 19, 2020 at 09:22:54AM -0400, Robert P. J. Day wrote:
>...
> +# ax_code_coverage.m4 and ax_check_enable_debug.m4 are in gnome-common only
> +# because older versions of autoconf-archive didn't have them yet. Now they
> +# are in autoconf-archive from OE-core. We depend on that below to ensure
> +# that recipes which only depend on gnome-common still get them.
> +do_install_append () {
> +    rm -f ${D}${datadir}/aclocal/ax_code_coverage.m4
> +    rm -f ${D}${datadir}/aclocal/ax_check_enable_debug.m4
> +}
> +RDEPENDS_${PN} += "autoconf-archive"
> +DEPENDS_append_class-native = " autoconf-archive-native"
> +
> 
>   it *appears* that solved the problem, which raises the question --
> should this patch be applied to the current gnome-common recipe? that
> patchwork entry dates back to 2017 ... should it have been applied at
> some point?

The currently implemented solution is:
# Default to enable autoconf-archive to avoid conflicts
PACKAGECONFIG ??= "autoconf-archive"
PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive"

It is not clear to me why this gives the user to disable it
instead of unconditionally enabling it.

> rday

cu
Adrian

From rpjday at crashcourse.ca  Thu Mar 19 14:59:17 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Thu, 19 Mar 2020 10:59:17 -0400 (EDT)
Subject: [oe] proper way to report(?) conflicting files being installed?
In-Reply-To: <20200319134213.GA29515@localhost>
References: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
	<20200319134213.GA29515@localhost>
Message-ID: <alpine.LFD.2.21.2003191058290.13214@localhost.localdomain>

On Thu, 19 Mar 2020, Adrian Bunk wrote:

> On Thu, Mar 19, 2020 at 09:22:54AM -0400, Robert P. J. Day wrote:
> >...
> > +# ax_code_coverage.m4 and ax_check_enable_debug.m4 are in gnome-common only
> > +# because older versions of autoconf-archive didn't have them yet. Now they
> > +# are in autoconf-archive from OE-core. We depend on that below to ensure
> > +# that recipes which only depend on gnome-common still get them.
> > +do_install_append () {
> > +    rm -f ${D}${datadir}/aclocal/ax_code_coverage.m4
> > +    rm -f ${D}${datadir}/aclocal/ax_check_enable_debug.m4
> > +}
> > +RDEPENDS_${PN} += "autoconf-archive"
> > +DEPENDS_append_class-native = " autoconf-archive-native"
> > +
> >
> >   it *appears* that solved the problem, which raises the question --
> > should this patch be applied to the current gnome-common recipe? that
> > patchwork entry dates back to 2017 ... should it have been applied at
> > some point?
>
> The currently implemented solution is:
> # Default to enable autoconf-archive to avoid conflicts
> PACKAGECONFIG ??= "autoconf-archive"
> PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive"
>
> It is not clear to me why this gives the user to disable it
> instead of unconditionally enabling it.

  i was a bit confused by that as well, but i figured i just didn't
read it carefully enough.

rday

From mhalstead at linuxfoundation.org  Thu Mar 19 16:44:43 2020
From: mhalstead at linuxfoundation.org (Michael Halstead)
Date: Thu, 19 Mar 2020 09:44:43 -0700
Subject: [oe] Mailing list platform change March 20th
In-Reply-To: <CADfgfobNNXr9HSOiwyamzbZ4q1uc8wgD5PzobDF56cDyYui-HQ@mail.gmail.com>
References: <CADfgfobNNXr9HSOiwyamzbZ4q1uc8wgD5PzobDF56cDyYui-HQ@mail.gmail.com>
Message-ID: <CADfgfoYCjVip=oc_U0TdFzOVst5U-KU+R31JhdckRv77APzQ-g@mail.gmail.com>

Everything is proceeding smoothly and this work will continue as planned.
The migration starts at noon PDT tomorrow.

List owners please take care of all outstanding moderation in the next 24
hours to ensure a smooth transition.

Thank you,
--
Michael Halstead
Linux Foundation / Yocto Project
Systems Operations Engineer

On Fri, Mar 13, 2020 at 4:58 PM Michael Halstead <
mhalstead at linuxfoundation.org> wrote:

> We are moving our lists from Mailman to Groups.io. E-mail to lists will
> be delayed during the move window. We are aiming to complete the migration
> during business hours in the Pacific time zone.
>
> A new account will be created for you on the Groups.io platform if you
> don't already have one.
>
> You can read more about the change on the wiki:
> https://www.openembedded.org/wiki/GroupsMigration
>
> If there are serious issues we will rollback the changes. We will e-mail
> all lists when work is complete.
>
> --
> Michael Halstead
> Linux Foundation / Yocto Project
> Systems Operations Engineer
>
>

From rpjday at crashcourse.ca  Thu Mar 19 17:09:13 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Thu, 19 Mar 2020 13:09:13 -0400 (EDT)
Subject: [oe] proper way to report(?) conflicting files being installed?
In-Reply-To: <20200319134213.GA29515@localhost>
References: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
	<20200319134213.GA29515@localhost>
Message-ID: <alpine.LFD.2.21.2003191302490.458222@localhost.localdomain>

On Thu, 19 Mar 2020, Adrian Bunk wrote:

> On Thu, Mar 19, 2020 at 09:22:54AM -0400, Robert P. J. Day wrote:
> >...
> > +# ax_code_coverage.m4 and ax_check_enable_debug.m4 are in gnome-common only
> > +# because older versions of autoconf-archive didn't have them yet. Now they
> > +# are in autoconf-archive from OE-core. We depend on that below to ensure
> > +# that recipes which only depend on gnome-common still get them.
> > +do_install_append () {
> > +    rm -f ${D}${datadir}/aclocal/ax_code_coverage.m4
> > +    rm -f ${D}${datadir}/aclocal/ax_check_enable_debug.m4
> > +}
> > +RDEPENDS_${PN} += "autoconf-archive"
> > +DEPENDS_append_class-native = " autoconf-archive-native"
> > +
> >
> >   it *appears* that solved the problem, which raises the question --
> > should this patch be applied to the current gnome-common recipe? that
> > patchwork entry dates back to 2017 ... should it have been applied at
> > some point?
>
> The currently implemented solution is:
> # Default to enable autoconf-archive to avoid conflicts
> PACKAGECONFIG ??= "autoconf-archive"
> PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive"
>
> It is not clear to me why this gives the user to disable it
> instead of unconditionally enabling it.

  this does seem backwards ... if both gnome-common and
autoconf-archive currently try to install those two m4-related files,
doing the above pretty much *assures* an installation conflict, unless
you apply the patch i linked to earlier at:

  https://patchwork.openembedded.org/patch/142467/

where (as i read it) the gnome-common patch uninstalls them, but then
drags in autoconf-archive just to make sure they're installed. so what
*should* this look like?

rday

From bunk at stusta.de  Thu Mar 19 17:32:23 2020
From: bunk at stusta.de (Adrian Bunk)
Date: Thu, 19 Mar 2020 19:32:23 +0200
Subject: [oe] proper way to report(?) conflicting files being installed?
In-Reply-To: <alpine.LFD.2.21.2003191302490.458222@localhost.localdomain>
References: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
	<20200319134213.GA29515@localhost>
	<alpine.LFD.2.21.2003191302490.458222@localhost.localdomain>
Message-ID: <20200319173223.GC29515@localhost>

On Thu, Mar 19, 2020 at 01:09:13PM -0400, Robert P. J. Day wrote:
> On Thu, 19 Mar 2020, Adrian Bunk wrote:
> 
> > On Thu, Mar 19, 2020 at 09:22:54AM -0400, Robert P. J. Day wrote:
> > >...
> > > +# ax_code_coverage.m4 and ax_check_enable_debug.m4 are in gnome-common only
> > > +# because older versions of autoconf-archive didn't have them yet. Now they
> > > +# are in autoconf-archive from OE-core. We depend on that below to ensure
> > > +# that recipes which only depend on gnome-common still get them.
> > > +do_install_append () {
> > > +    rm -f ${D}${datadir}/aclocal/ax_code_coverage.m4
> > > +    rm -f ${D}${datadir}/aclocal/ax_check_enable_debug.m4
> > > +}
> > > +RDEPENDS_${PN} += "autoconf-archive"
> > > +DEPENDS_append_class-native = " autoconf-archive-native"
> > > +
> > >
> > >   it *appears* that solved the problem, which raises the question --
> > > should this patch be applied to the current gnome-common recipe? that
> > > patchwork entry dates back to 2017 ... should it have been applied at
> > > some point?
> >
> > The currently implemented solution is:
> > # Default to enable autoconf-archive to avoid conflicts
> > PACKAGECONFIG ??= "autoconf-archive"
> > PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive"
> >
> > It is not clear to me why this gives the user to disable it
> > instead of unconditionally enabling it.
> 
>   this does seem backwards ... if both gnome-common and
> autoconf-archive currently try to install those two m4-related files,
> doing the above pretty much *assures* an installation conflict,
>...

No, --with-autoconf-archive makes gnome-common not install the 
conflicting files.

> rday

cu
Adrian

From cengic at gmail.com  Thu Mar 19 17:44:52 2020
From: cengic at gmail.com (=?UTF-8?B?R29yYW4gxIxlbmdpxIc=?=)
Date: Thu, 19 Mar 2020 18:44:52 +0100
Subject: [oe] [meta-oe][PATCH] crash: fix crash-cross build on x86_64
Message-ID: <CACT7hb=oPqWOCet1vzKT0i75=GRzRPpgHrfFEvK1aBTUD3Kx6A@mail.gmail.com>

Remove -m32 from CFLAGS even for -cross recipe. Also remove
${GDB_CONF_FLAGS} from GDB_TARGET variable (that is passed to the gdb
configuration) since the use of GDB_CONF_FLAGS is removed by
0001-cross_add_configure_option.patch.

Signed-off-by: Goran Cengic <cengic at gmail.com>
---
 meta-oe/recipes-kernel/crash/crash_7.2.8.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
index 61cc71f..5fc25f4 100644
--- a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
+++ b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
@@ -10,7 +10,7 @@ SECTION = "devel"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504"

-DEPENDS = "zlib readline coreutils-native"
+DEPENDS = "zlib readline coreutils-native ncurses-native"

 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/crash-utility/${BPN}.git
<http://github.com/crash-utility/$%7BBPN%7D.git> \
@@ -49,9 +49,7 @@ EXTRA_OEMAKE = 'RPMPKG="${PV}" \
                 '

 EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \
-                            GDB_TARGET="${BUILD_SYS} \
-                                        \${GDB_CONF_FLAGS} \
-                                        --target=${TARGET_SYS}" \
+                            GDB_TARGET="${BUILD_SYS}
--target=${TARGET_SYS}" \
                             GDB_HOST="${BUILD_SYS}" \
                             GDB_MAKE_JOBS="${PARALLEL_MAKE}" \
                             '
@@ -59,10 +57,6 @@ EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \
 EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'"
 EXTRA_OEMAKE_append_class-cross = " LDFLAGS='${BUILD_LDFLAGS}'"

-REMOVE_M32 = "sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define
TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g'
${S}/configure.c"
-
-REMOVE_M32_class-cross = ""
-
 do_configure() {
     :
 }
@@ -79,7 +73,7 @@ do_compile_prepend() {
     esac

     sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c
-    ${REMOVE_M32}
+    sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define
TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g'
${S}/configure.c
     sed -i 's/&gt;/>/g' ${S}/Makefile
 }

-- 
2.7.4

From ross at burtonini.com  Thu Mar 19 17:58:10 2020
From: ross at burtonini.com (Ross Burton)
Date: Thu, 19 Mar 2020 17:58:10 +0000
Subject: [oe] proper way to report(?) conflicting files being installed?
In-Reply-To: <20200319173223.GC29515@localhost>
References: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
	<20200319134213.GA29515@localhost>
	<alpine.LFD.2.21.2003191302490.458222@localhost.localdomain>
	<20200319173223.GC29515@localhost>
Message-ID: <ba526e90-ccd7-04e2-5907-026b754a2da0@burtonini.com>

On 19/03/2020 17:32, Adrian Bunk wrote:
>>    this does seem backwards ... if both gnome-common and
>> autoconf-archive currently try to install those two m4-related files,
>> doing the above pretty much *assures* an installation conflict,
>> ...
> 
> No, --with-autoconf-archive makes gnome-common not install the
> conflicting files.

I should point out that gnome-common is dead upstream and mostly unused 
now, so if you find a recipe using it do check that it is actually needed.

Ross

From cengic at gmail.com  Thu Mar 19 18:29:52 2020
From: cengic at gmail.com (=?UTF-8?B?R29yYW4gxIxlbmdpxIc=?=)
Date: Thu, 19 Mar 2020 19:29:52 +0100
Subject: [oe] [meta-oe][PATCH v2] crash: fix crash-cross build on x86_64
Message-ID: <CACT7hbnzmOgSGkv1MrtpBJSBw=8fUUAh+gpbZtku_rpdCn6Tuw@mail.gmail.com>

>From 3246fc2c813531a6f279e4d4a2071e8af35bdcf5 Mon Sep 17 00:00:00 2001
From: Goran Cengic <cengic at gmail.com>
Date: Thu, 19 Mar 2020 00:11:52 +0100
Subject: [PATCH] crash: fix crash-cross build on x86_64

Remove -m32 from CFLAGS even for -cross recipe. Also remove
${GDB_CONF_FLAGS} from GDB_TARGET variable (that is passed to the gdb
configuration) since the use of GDB_CONF_FLAGS is removed by
0001-cross_add_configure_option.patch.

Signed-off-by: Goran Cengic <cengic at gmail.com>
---
 meta-oe/recipes-kernel/crash/crash_7.2.8.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
index 61cc71f..5fc25f4 100644
--- a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
+++ b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
@@ -10,7 +10,7 @@ SECTION = "devel"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504"

-DEPENDS = "zlib readline coreutils-native"
+DEPENDS = "zlib readline coreutils-native ncurses-native"

 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/crash-utility/${BPN}.git
<http://github.com/crash-utility/$%7BBPN%7D.git> \
@@ -49,9 +49,7 @@ EXTRA_OEMAKE = 'RPMPKG="${PV}" \
                 '

 EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \
-                            GDB_TARGET="${BUILD_SYS} \
-                                        \${GDB_CONF_FLAGS} \
-                                        --target=${TARGET_SYS}" \
+                            GDB_TARGET="${BUILD_SYS}
--target=${TARGET_SYS}" \
                             GDB_HOST="${BUILD_SYS}" \
                             GDB_MAKE_JOBS="${PARALLEL_MAKE}" \
                             '
@@ -59,10 +57,6 @@ EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \
 EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'"
 EXTRA_OEMAKE_append_class-cross = " LDFLAGS='${BUILD_LDFLAGS}'"

-REMOVE_M32 = "sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define
TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g'
${S}/configure.c"
-
-REMOVE_M32_class-cross = ""
-
 do_configure() {
     :
 }
@@ -79,7 +73,7 @@ do_compile_prepend() {
     esac

     sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c
-    ${REMOVE_M32}
+    sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define
TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g'
${S}/configure.c
     sed -i 's/&gt;/>/g' ${S}/Makefile
 }

-- 
2.7.4

From cengic at gmail.com  Thu Mar 19 18:43:55 2020
From: cengic at gmail.com (Goran Cengic)
Date: Thu, 19 Mar 2020 19:43:55 +0100
Subject: [oe] [meta-oe][PATCH v3] crash: fix crash-cross build on x86_64
Message-ID: <1584643435-1936-1-git-send-email-cengic@gmail.com>

Remove -m32 from CFLAGS even for -cross recipe. Also remove
${GDB_CONF_FLAGS} from GDB_TARGET variable (that is passed to the gdb
configuration) since the use of GDB_CONF_FLAGS is removed by
0001-cross_add_configure_option.patch.

Signed-off-by: Goran Cengic <cengic at gmail.com>
---
 meta-oe/recipes-kernel/crash/crash_7.2.8.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
index 61cc71f..5fc25f4 100644
--- a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
+++ b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb
@@ -10,7 +10,7 @@ SECTION = "devel"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504"
 
-DEPENDS = "zlib readline coreutils-native"
+DEPENDS = "zlib readline coreutils-native ncurses-native"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/crash-utility/${BPN}.git \
@@ -49,9 +49,7 @@ EXTRA_OEMAKE = 'RPMPKG="${PV}" \
                 '
 
 EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \
-                            GDB_TARGET="${BUILD_SYS} \
-                                        \${GDB_CONF_FLAGS} \
-                                        --target=${TARGET_SYS}" \
+                            GDB_TARGET="${BUILD_SYS} --target=${TARGET_SYS}" \
                             GDB_HOST="${BUILD_SYS}" \
                             GDB_MAKE_JOBS="${PARALLEL_MAKE}" \
                             '
@@ -59,10 +57,6 @@ EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \
 EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'"
 EXTRA_OEMAKE_append_class-cross = " LDFLAGS='${BUILD_LDFLAGS}'"
 
-REMOVE_M32 = "sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c"
-
-REMOVE_M32_class-cross = ""
-
 do_configure() {
     :
 }
@@ -79,7 +73,7 @@ do_compile_prepend() {
     esac
 
     sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c
-    ${REMOVE_M32}
+    sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c
     sed -i 's/&gt;/>/g' ${S}/Makefile
 }
 
-- 
2.7.4


From rpjday at crashcourse.ca  Thu Mar 19 19:10:44 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Thu, 19 Mar 2020 15:10:44 -0400 (EDT)
Subject: [oe] proper way to report(?) conflicting files being installed?
In-Reply-To: <20200319173223.GC29515@localhost>
References: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
	<20200319134213.GA29515@localhost>
	<alpine.LFD.2.21.2003191302490.458222@localhost.localdomain>
	<20200319173223.GC29515@localhost>
Message-ID: <alpine.LFD.2.21.2003191510270.3869@localhost.localdomain>

On Thu, 19 Mar 2020, Adrian Bunk wrote:

> On Thu, Mar 19, 2020 at 01:09:13PM -0400, Robert P. J. Day wrote:
> > On Thu, 19 Mar 2020, Adrian Bunk wrote:
> >
> > > On Thu, Mar 19, 2020 at 09:22:54AM -0400, Robert P. J. Day wrote:
> > > >...
> > > > +# ax_code_coverage.m4 and ax_check_enable_debug.m4 are in gnome-common only
> > > > +# because older versions of autoconf-archive didn't have them yet. Now they
> > > > +# are in autoconf-archive from OE-core. We depend on that below to ensure
> > > > +# that recipes which only depend on gnome-common still get them.
> > > > +do_install_append () {
> > > > +    rm -f ${D}${datadir}/aclocal/ax_code_coverage.m4
> > > > +    rm -f ${D}${datadir}/aclocal/ax_check_enable_debug.m4
> > > > +}
> > > > +RDEPENDS_${PN} += "autoconf-archive"
> > > > +DEPENDS_append_class-native = " autoconf-archive-native"
> > > > +
> > > >
> > > >   it *appears* that solved the problem, which raises the question --
> > > > should this patch be applied to the current gnome-common recipe? that
> > > > patchwork entry dates back to 2017 ... should it have been applied at
> > > > some point?
> > >
> > > The currently implemented solution is:
> > > # Default to enable autoconf-archive to avoid conflicts
> > > PACKAGECONFIG ??= "autoconf-archive"
> > > PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive"
> > >
> > > It is not clear to me why this gives the user to disable it
> > > instead of unconditionally enabling it.
> >
> >   this does seem backwards ... if both gnome-common and
> > autoconf-archive currently try to install those two m4-related files,
> > doing the above pretty much *assures* an installation conflict,
> >...
>
> No, --with-autoconf-archive makes gnome-common not install the
> conflicting files.

  ah, right, i was just reading (and thinking) backwards.

rday

From rpjday at crashcourse.ca  Thu Mar 19 19:12:36 2020
From: rpjday at crashcourse.ca (Robert P. J. Day)
Date: Thu, 19 Mar 2020 15:12:36 -0400 (EDT)
Subject: [oe] proper way to report(?) conflicting files being installed?
In-Reply-To: <ba526e90-ccd7-04e2-5907-026b754a2da0@burtonini.com>
References: <alpine.LFD.2.21.2003190907590.10468@localhost.localdomain>
	<20200319134213.GA29515@localhost>
	<alpine.LFD.2.21.2003191302490.458222@localhost.localdomain>
	<20200319173223.GC29515@localhost>
	<ba526e90-ccd7-04e2-5907-026b754a2da0@burtonini.com>
Message-ID: <alpine.LFD.2.21.2003191511320.3869@localhost.localdomain>

On Thu, 19 Mar 2020, Ross Burton wrote:

> On 19/03/2020 17:32, Adrian Bunk wrote:
> >>    this does seem backwards ... if both gnome-common and
> >> autoconf-archive currently try to install those two m4-related files,
> >> doing the above pretty much *assures* an installation conflict,
> >> ...
> >
> > No, --with-autoconf-archive makes gnome-common not install the
> > conflicting files.
>
> I should point out that gnome-common is dead upstream and mostly
> unused now, so if you find a recipe using it do check that it is
> actually needed.

  in fact, just earlier this aft, i sent the short note, "um ...
what are you doing that needs that gnome-common thing?"

  i await the reply.

rday

From pjtexier at koncepto.io  Thu Mar 19 19:49:59 2020
From: pjtexier at koncepto.io (Pierre-Jean Texier)
Date: Thu, 19 Mar 2020 20:49:59 +0100
Subject: [oe] [meta-oe][PATCH] nvme-cli: upgrade 1.9 -> 1.10.1
Message-ID: <1584647399-3555-1-git-send-email-pjtexier@koncepto.io>

Also backport a patch to fix a build failure
with the mucl libc.

Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
---
 .../nvme-cli/0001-fix-musl-compilation.patch       | 26 ++++++++++++++++++++++
 .../{nvme-cli_1.9.bb => nvme-cli_1.10.1.bb}        |  6 +++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch
 rename meta-oe/recipes-bsp/nvme-cli/{nvme-cli_1.9.bb => nvme-cli_1.10.1.bb} (85%)

diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch
new file mode 100644
index 0000000..be5d0da
--- /dev/null
+++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch
@@ -0,0 +1,26 @@
+From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001
+From: Neel Chotai <neel at chot.ai>
+Date: Fri, 14 Feb 2020 17:56:23 +0000
+Subject: [PATCH] fix musl compilation
+
+Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f]
+Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
+---
+ plugins/micron/micron-nvme.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
+index 8240887..165fcf0 100644
+--- a/plugins/micron/micron-nvme.c
++++ b/plugins/micron/micron-nvme.c
+@@ -13,6 +13,7 @@
+ #include "nvme-print.h"
+ #include "nvme-ioctl.h"
+ #include <sys/ioctl.h>
++#include <limits.h>
+ 
+ #define CREATE_CMD
+ #include "micron-nvme.h"
+-- 
+2.7.4
+
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb
similarity index 85%
rename from meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb
rename to meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb
index ea8bc17..4f4bb2d 100644
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb
+++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb
@@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022"
 DEPENDS = "util-linux"
 PV .= "+git${SRCPV}"
 
-SRC_URI = "git://github.com/linux-nvme/nvme-cli.git"
-SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45"
+SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \
+           file://0001-fix-musl-compilation.patch \
+"
+SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4


From akuster808 at gmail.com  Thu Mar 19 23:16:19 2020
From: akuster808 at gmail.com (akuster808)
Date: Thu, 19 Mar 2020 16:16:19 -0700
Subject: [oe] [zeus 00/13] Patch review
In-Reply-To: <CAMKF1sooQTeEkmOSu+torVhMZ8R_3FqCzEOWwRMT0drKpAOZDw@mail.gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
	<CAMKF1sooQTeEkmOSu+torVhMZ8R_3FqCzEOWwRMT0drKpAOZDw@mail.gmail.com>
Message-ID: <0eab7733-7605-ff7f-a7af-c4f8e93aa258@gmail.com>



On 3/19/20 1:44 AM, Khem Raj wrote:
> look
What does that mean?

- armin
>
> On Wed, Mar 11, 2020 at 7:58 PM Armin Kuster <akuster808 at gmail.com> wrote:
>> Here is the next set for meta-openembedded.
>> Please have reviews back by Friday.
>>
>> The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
>>
>>   fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
>>
>> are available in the Git repository at:
>>
>>   git://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
>>   http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
>>
>> Adrian Bunk (1):
>>   wireshark: Upgrade 3.0.6 -> 3.0.8
>>
>> Carlos Rafael Giani (1):
>>   opencv: Enable pkg-config .pc file generation
>>
>> Khem Raj (2):
>>   ade: Fix install paths in multilib builds
>>   sanlock: Replace cp -a with cp -R --no-dereference
>>
>> Martin Jansa (1):
>>   s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
>>     use git fetcher instead of svn fetcher
>>
>> Mike Krupicka (1):
>>   mosquitto: Use mosquitto.init for daemon init
>>
>> Paul Barker (1):
>>   lmsensors: Fix sensord dependencies
>>
>> Peter Kjellerstedt (2):
>>   lvm2, libdevmapper: Do not patch configure
>>   libldb: Do not require the "pam" distro feature to be enabled
>>
>> Ross Burton (4):
>>   opencv: don't download during configure
>>   opencv: also download face alignment data in do_fetch()
>>   opencv: PACKAGECONFIG for G-API, use system ADE
>>   opencv: abort configure if we need to download
>>
>>  .../mosquitto/files/mosquitto.init            |  2 +-
>>  .../recipes-support/libldb/libldb_1.5.6.bb    |  3 +-
>>  ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} |  4 +-
>>  .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb |  3 +-
>>  ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++
>>  .../recipes-extended/sanlock/sanlock_3.8.0.bb |  4 +-
>>  ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------
>>  ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++
>>  meta-oe/recipes-support/opencv/ade_0.1.1f.bb  |  1 +
>>  .../opencv/opencv/download.patch              | 32 ++++++++++++
>>  .../recipes-support/opencv/opencv_4.1.0.bb    | 32 ++++++++++--
>>  ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} |  7 ++-
>>  ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} |  6 +--
>>  ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++--
>>  .../{usbpath_svn.bb => usbpath_git.bb}        | 10 ++--
>>  .../{wmiconfig_svn.bb => wmiconfig_git.bb}    | 13 +++--
>>  16 files changed, 183 insertions(+), 69 deletions(-)
>>  rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%)
>>  create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
>>  create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
>>  create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
>>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%)
>>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%)
>>  rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
>>  rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%)
>>  rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)
>>
>> --
>> 2.17.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


From ticotimo at gmail.com  Fri Mar 20 00:23:25 2020
From: ticotimo at gmail.com (Tim Orling)
Date: Thu, 19 Mar 2020 17:23:25 -0700
Subject: [oe] [zeus 00/13] Patch review
In-Reply-To: <0eab7733-7605-ff7f-a7af-c4f8e93aa258@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
	<CAMKF1sooQTeEkmOSu+torVhMZ8R_3FqCzEOWwRMT0drKpAOZDw@mail.gmail.com>
	<0eab7733-7605-ff7f-a7af-c4f8e93aa258@gmail.com>
Message-ID: <CANx9H-Bz_BqSYfgaXX8oXve6SsWj4yXCuBtvS++3B7dtsfTf-w@mail.gmail.com>

On Thu, Mar 19, 2020 at 4:16 PM akuster808 <akuster808 at gmail.com> wrote:

>
>
> On 3/19/20 1:44 AM, Khem Raj wrote:
> > look
> What does that mean?


This is an all time favorite terse Khem review!


> - armin
> >
> > On Wed, Mar 11, 2020 at 7:58 PM Armin Kuster <akuster808 at gmail.com>
> wrote:
> >> Here is the next set for meta-openembedded.
> >> Please have reviews back by Friday.
> >>
> >> The following changes since commit
> bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
> >>
> >>   fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
> >>
> >> are available in the Git repository at:
> >>
> >>   git://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
> >>
> http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
> >>
> >> Adrian Bunk (1):
> >>   wireshark: Upgrade 3.0.6 -> 3.0.8
> >>
> >> Carlos Rafael Giani (1):
> >>   opencv: Enable pkg-config .pc file generation
> >>
> >> Khem Raj (2):
> >>   ade: Fix install paths in multilib builds
> >>   sanlock: Replace cp -a with cp -R --no-dereference
> >>
> >> Martin Jansa (1):
> >>   s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
> >>     use git fetcher instead of svn fetcher
> >>
> >> Mike Krupicka (1):
> >>   mosquitto: Use mosquitto.init for daemon init
> >>
> >> Paul Barker (1):
> >>   lmsensors: Fix sensord dependencies
> >>
> >> Peter Kjellerstedt (2):
> >>   lvm2, libdevmapper: Do not patch configure
> >>   libldb: Do not require the "pam" distro feature to be enabled
> >>
> >> Ross Burton (4):
> >>   opencv: don't download during configure
> >>   opencv: also download face alignment data in do_fetch()
> >>   opencv: PACKAGECONFIG for G-API, use system ADE
> >>   opencv: abort configure if we need to download
> >>
> >>  .../mosquitto/files/mosquitto.init            |  2 +-
> >>  .../recipes-support/libldb/libldb_1.5.6.bb    |  3 +-
> >>  ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} |  4 +-
> >>  .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb |  3 +-
> >>  ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++
> >>  .../recipes-extended/sanlock/sanlock_3.8.0.bb |  4 +-
> >>  ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------
> >>  ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++
> >>  meta-oe/recipes-support/opencv/ade_0.1.1f.bb  |  1 +
> >>  .../opencv/opencv/download.patch              | 32 ++++++++++++
> >>  .../recipes-support/opencv/opencv_4.1.0.bb    | 32 ++++++++++--
> >>  ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} |  7 ++-
> >>  ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} |  6 +--
> >>  ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++--
> >>  .../{usbpath_svn.bb => usbpath_git.bb}        | 10 ++--
> >>  .../{wmiconfig_svn.bb => wmiconfig_git.bb}    | 13 +++--
> >>  16 files changed, 183 insertions(+), 69 deletions(-)
> >>  rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb
> => wireshark_3.0.8.bb} (95%)
> >>  create mode 100644
> meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
> >>  create mode 100644
> meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
> >>  create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
> >>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb
> => s3c24xx-gpio_git.bb} (73%)
> >>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb
> => s3c64xx-gpio_git.bb} (74%)
> >>  rename meta-oe/recipes-support/samsung-soc-utils/{
> sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
> >>  rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb =>
> usbpath_git.bb} (68%)
> >>  rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb =>
> wmiconfig_git.bb} (58%)
> >>
> >> --
> >> 2.17.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From raj.khem at gmail.com  Fri Mar 20 01:40:31 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Thu, 19 Mar 2020 18:40:31 -0700
Subject: [oe] [zeus 00/13] Patch review
In-Reply-To: <0eab7733-7605-ff7f-a7af-c4f8e93aa258@gmail.com>
References: <cover.1583981708.git.akuster808@gmail.com>
	<CAMKF1sooQTeEkmOSu+torVhMZ8R_3FqCzEOWwRMT0drKpAOZDw@mail.gmail.com>
	<0eab7733-7605-ff7f-a7af-c4f8e93aa258@gmail.com>
Message-ID: <CAMKF1sph-7S8LzrPJyFujvpQdhtuoKtBiaQY5Dxz4RXz5GL0ww@mail.gmail.com>

On Thu, Mar 19, 2020 at 4:16 PM akuster808 <akuster808 at gmail.com> wrote:
>
>
>
> On 3/19/20 1:44 AM, Khem Raj wrote:
> > look
> What does that mean?

`s OK` got stuck in transmission.

>
> - armin
> >
> > On Wed, Mar 11, 2020 at 7:58 PM Armin Kuster <akuster808 at gmail.com> wrote:
> >> Here is the next set for meta-openembedded.
> >> Please have reviews back by Friday.
> >>
> >> The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
> >>
> >>   fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
> >>
> >> are available in the Git repository at:
> >>
> >>   git://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
> >>   http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
> >>
> >> Adrian Bunk (1):
> >>   wireshark: Upgrade 3.0.6 -> 3.0.8
> >>
> >> Carlos Rafael Giani (1):
> >>   opencv: Enable pkg-config .pc file generation
> >>
> >> Khem Raj (2):
> >>   ade: Fix install paths in multilib builds
> >>   sanlock: Replace cp -a with cp -R --no-dereference
> >>
> >> Martin Jansa (1):
> >>   s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
> >>     use git fetcher instead of svn fetcher
> >>
> >> Mike Krupicka (1):
> >>   mosquitto: Use mosquitto.init for daemon init
> >>
> >> Paul Barker (1):
> >>   lmsensors: Fix sensord dependencies
> >>
> >> Peter Kjellerstedt (2):
> >>   lvm2, libdevmapper: Do not patch configure
> >>   libldb: Do not require the "pam" distro feature to be enabled
> >>
> >> Ross Burton (4):
> >>   opencv: don't download during configure
> >>   opencv: also download face alignment data in do_fetch()
> >>   opencv: PACKAGECONFIG for G-API, use system ADE
> >>   opencv: abort configure if we need to download
> >>
> >>  .../mosquitto/files/mosquitto.init            |  2 +-
> >>  .../recipes-support/libldb/libldb_1.5.6.bb    |  3 +-
> >>  ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} |  4 +-
> >>  .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb |  3 +-
> >>  ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++
> >>  .../recipes-extended/sanlock/sanlock_3.8.0.bb |  4 +-
> >>  ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------
> >>  ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++
> >>  meta-oe/recipes-support/opencv/ade_0.1.1f.bb  |  1 +
> >>  .../opencv/opencv/download.patch              | 32 ++++++++++++
> >>  .../recipes-support/opencv/opencv_4.1.0.bb    | 32 ++++++++++--
> >>  ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} |  7 ++-
> >>  ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} |  6 +--
> >>  ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++--
> >>  .../{usbpath_svn.bb => usbpath_git.bb}        | 10 ++--
> >>  .../{wmiconfig_svn.bb => wmiconfig_git.bb}    | 13 +++--
> >>  16 files changed, 183 insertions(+), 69 deletions(-)
> >>  rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%)
> >>  create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
> >>  create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
> >>  create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
> >>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%)
> >>  rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%)
> >>  rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
> >>  rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%)
> >>  rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)
> >>
> >> --
> >> 2.17.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From wangmy at cn.fujitsu.com  Fri Mar 20 07:05:58 2020
From: wangmy at cn.fujitsu.com (Wang Mingyu)
Date: Fri, 20 Mar 2020 00:05:58 -0700
Subject: [oe]  [meta-networking][PATCH] civetweb: upgrade 1.11 -> 1.12
Message-ID: <1584687958-63336-1-git-send-email-wangmy@cn.fujitsu.com>

-License-Update: Copyright year updated to 2020.

Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 .../recipes-connectivity/civetweb/civetweb_git.bb           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
index 71368c1a1..2820f9fa6 100644
--- a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
+++ b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
@@ -2,10 +2,10 @@ SUMMARY = "Civetweb embedded web server"
 HOMEPAGE = "https://github.com/civetweb/civetweb"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f28fdcba0dda735eed62bac6a397562"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=50bd1d7f135b50d7e218996ba28d0d88"
 
-SRCREV = "6423faea4800f6cd4055750a7af2da85cdbe4e96"
-PV = "1.11+git${SRCPV}"
+SRCREV = "4b440a339979852d5a51fb11a822952712231c23"
+PV = "1.12+git${SRCPV}"
 SRC_URI = "git://github.com/civetweb/civetweb.git \
            file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \
            "
-- 
2.17.1




From zangrc.fnst at cn.fujitsu.com  Fri Mar 20 02:20:10 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Fri, 20 Mar 2020 10:20:10 +0800
Subject: [oe]  [meta-python] [PATCH] python3-webcolors: Enable ptest
Message-ID: <20200320022010.11690-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../recipes-devtools/python/python-webcolors.inc   | 14 ++++++++++++++
 .../python/python3-webcolors/run-ptest             |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-webcolors/run-ptest

diff --git a/meta-python/recipes-devtools/python/python-webcolors.inc b/meta-python/recipes-devtools/python/python-webcolors.inc
index ef254e33b..ad012c979 100644
--- a/meta-python/recipes-devtools/python/python-webcolors.inc
+++ b/meta-python/recipes-devtools/python/python-webcolors.inc
@@ -10,3 +10,17 @@ RDEPENDS_${PN}_class-target = "\
 "
 
 BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += " \
+	file://run-ptest \
+"
+inherit ptest
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}/tests
+	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-webcolors/run-ptest b/meta-python/recipes-devtools/python/python3-webcolors/run-ptest
new file mode 100644
index 000000000..40c284799
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-webcolors/run-ptest
@@ -0,0 +1,2 @@
+#!/bin/sh
+pytest
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Fri Mar 20 02:21:00 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Fri, 20 Mar 2020 10:21:00 +0800
Subject: [oe] [PATCH]  [meta-python] [PATCH] python3-xlrd: Enable ptest
Message-ID: <20200320022100.3489-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../recipes-devtools/python/python-xlrd.inc      | 16 ++++++++++++++++
 .../python/python3-xlrd/run-ptest                |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-xlrd/run-ptest

diff --git a/meta-python/recipes-devtools/python/python-xlrd.inc b/meta-python/recipes-devtools/python/python-xlrd.inc
index f87d2ab7c..ee73e76b9 100644
--- a/meta-python/recipes-devtools/python/python-xlrd.inc
+++ b/meta-python/recipes-devtools/python/python-xlrd.inc
@@ -12,3 +12,19 @@ SRC_URI[sha256sum] = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a
 RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell"
 
 BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += " \
+	file://run-ptest \
+"
+inherit ptest
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}/tests
+	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+	install -d ${D}${PTEST_PATH}/examples
+	cp -rf ${S}/examples/* ${D}${PTEST_PATH}/examples/
+}
diff --git a/meta-python/recipes-devtools/python/python3-xlrd/run-ptest b/meta-python/recipes-devtools/python/python3-xlrd/run-ptest
new file mode 100644
index 000000000..5cec71169
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-xlrd/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Fri Mar 20 02:21:33 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Fri, 20 Mar 2020 10:21:33 +0800
Subject: [oe]  [meta-python] [PATCH] python3-xmltodict: Enable ptest
Message-ID: <20200320022133.9938-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../python/python3-xmltodict/run-ptest            |  3 +++
 .../python/python3-xmltodict_0.12.0.bb            | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-xmltodict/run-ptest

diff --git a/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest b/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest
new file mode 100644
index 000000000..5cec71169
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest
diff --git a/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb b/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb
index 00aa81809..d07888324 100644
--- a/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb
+++ b/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb
@@ -9,4 +9,17 @@ SRC_URI[sha256sum] = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d16
 
 PYPI_PACKAGE = "xmltodict"
 
-inherit pypi setuptools3
+inherit pypi setuptools3 ptest
+
+SRC_URI += " \
+	file://run-ptest \
+"
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}/tests
+	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Fri Mar 20 02:22:05 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Fri, 20 Mar 2020 10:22:05 +0800
Subject: [oe]  [meta-python] [PATCH] python3-xxhash: Enable ptest
Message-ID: <20200320022205.29037-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../recipes-devtools/python/python-xxhash.inc     | 15 +++++++++++++++
 .../python/python3-xxhash/run-ptest               |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-xxhash/run-ptest

diff --git a/meta-python/recipes-devtools/python/python-xxhash.inc b/meta-python/recipes-devtools/python/python-xxhash.inc
index 80f5e9c7f..c02c29eb7 100644
--- a/meta-python/recipes-devtools/python/python-xxhash.inc
+++ b/meta-python/recipes-devtools/python/python-xxhash.inc
@@ -5,3 +5,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5"
 
 SRC_URI[md5sum] = "ce9cbbcc89620fd47a2468badd08dcf0"
 SRC_URI[sha256sum] = "8b6b1afe7731d7d9cbb0398b4a811ebb5e6be5c174f72c68abf81f919a435de9"
+
+SRC_URI += " \
+	file://run-ptest \
+"
+
+inherit ptest
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}/tests
+	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-xxhash/run-ptest b/meta-python/recipes-devtools/python/python3-xxhash/run-ptest
new file mode 100644
index 000000000..6a26348b1
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-xxhash/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest tests/test.py
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Fri Mar 20 02:22:33 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Fri, 20 Mar 2020 10:22:33 +0800
Subject: [oe] [PATCH]  [meta-python] [PATCH] python3-yappi: Enable ptest
Message-ID: <20200320022233.5235-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../recipes-devtools/python/python-yappi.inc   | 18 +++++++++++++++++-
 .../python/python3-yappi/run-ptest             |  3 +++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-yappi/run-ptest

diff --git a/meta-python/recipes-devtools/python/python-yappi.inc b/meta-python/recipes-devtools/python/python-yappi.inc
index b3718d7d1..d6e9d4ed6 100644
--- a/meta-python/recipes-devtools/python/python-yappi.inc
+++ b/meta-python/recipes-devtools/python/python-yappi.inc
@@ -7,10 +7,26 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9a193c13f346884e597acdcac7fe9ac8"
 SRC_URI[md5sum] = "a545101aa8a435b0780f06f4723f58c8"
 SRC_URI[sha256sum] = "7f814131515d51db62b1a3468bcb84de30499124752806a5a6e11caf0b4344bf"
 
-inherit pypi setuptools3
+SRC_URI += " \
+	file://run-ptest \
+"
+
+inherit pypi setuptools3 ptest
 
 RDEPENDS_${PN} += "\
     ${PYTHON_PN}-datetime \
     ${PYTHON_PN}-pickle \
     ${PYTHON_PN}-threading \
     "
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+	${PYTHON_PN}-multiprocessing \
+	${PYTHON_PN}-profile \
+"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}/tests
+	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+	cp -f ${S}/yappi.py ${D}/${PTEST_PATH}/
+}
diff --git a/meta-python/recipes-devtools/python/python3-yappi/run-ptest b/meta-python/recipes-devtools/python/python3-yappi/run-ptest
new file mode 100644
index 000000000..5cec71169
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-yappi/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest
-- 
2.20.1




From zangrc.fnst at cn.fujitsu.com  Fri Mar 20 02:23:01 2020
From: zangrc.fnst at cn.fujitsu.com (Zang Ruochen)
Date: Fri, 20 Mar 2020 10:23:01 +0800
Subject: [oe]  [meta-python] [PATCH] python3-yarl: Enable ptest
Message-ID: <20200320022301.9838-1-zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 .../recipes-devtools/python/python-yarl.inc       | 15 ++++++++++++++-
 .../python/python3-yarl/run-ptest                 |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-yarl/run-ptest

diff --git a/meta-python/recipes-devtools/python/python-yarl.inc b/meta-python/recipes-devtools/python/python-yarl.inc
index 98066d73b..911c79d66 100644
--- a/meta-python/recipes-devtools/python/python-yarl.inc
+++ b/meta-python/recipes-devtools/python/python-yarl.inc
@@ -6,9 +6,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b"
 SRC_URI[md5sum] = "08ba0d6e18f460b44d9e5459f3d217ba"
 SRC_URI[sha256sum] = "58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b"
 
+SRC_URI += " \
+	file://run-ptest \
+"
+
 PYPI_PACKAGE = "yarl"
-inherit pypi
+inherit pypi ptest
 RDEPENDS_${PN} = "\
     ${PYTHON_PN}-multidict \
     ${PYTHON_PN}-idna \
 "
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}/tests
+	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-yarl/run-ptest b/meta-python/recipes-devtools/python/python3-yarl/run-ptest
new file mode 100644
index 000000000..f82f6ea1b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-yarl/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest 
-- 
2.20.1




From Qi.Chen at windriver.com  Fri Mar 20 03:45:47 2020
From: Qi.Chen at windriver.com (Chen, Qi)
Date: Fri, 20 Mar 2020 03:45:47 +0000
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28
In-Reply-To: <20200318204411.12996-1-schnitzeltony@gmail.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
Message-ID: <DM6PR11MB349890ADEBB154F7AB354EF4EDF50@DM6PR11MB3498.namprd11.prod.outlook.com>

Hi Andreas,

I got the following error.

gcr was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'libnma', 'gcr']

Could you please take a look at it if convenient?

Best Regards,
Chen Qi
________________________________
From: openembedded-devel-bounces at lists.openembedded.org <openembedded-devel-bounces at lists.openembedded.org> on behalf of Andreas M?ller <schnitzeltony at gmail.com>
Sent: Thursday, March 19, 2020 4:44
To: openembedded-devel at lists.openembedded.org <openembedded-devel at lists.openembedded.org>
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28

With upcoming network-manager-applet 1.16 this library gets mandatory: GNOME
splitted out common code from network-manager-applet to libnma.

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../libnma/libnma_1.8.28.bb                    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb

diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
new file mode 100644
index 000000000..de5ad0863
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
@@ -0,0 +1,18 @@
+SUMMARY = "NetworkManager GUI library"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0 networkmanager"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gtk-doc gettext vala
+
+SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
+SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
+
+PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
+PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
--
2.21.1

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From Qi.Chen at windriver.com  Fri Mar 20 06:42:43 2020
From: Qi.Chen at windriver.com (Chen, Qi)
Date: Fri, 20 Mar 2020 06:42:43 +0000
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28
In-Reply-To: <DM6PR11MB349890ADEBB154F7AB354EF4EDF50@DM6PR11MB3498.namprd11.prod.outlook.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>,
	<DM6PR11MB349890ADEBB154F7AB354EF4EDF50@DM6PR11MB3498.namprd11.prod.outlook.com>
Message-ID: <DM6PR11MB3498A7172CD23A5BCE165647EDF50@DM6PR11MB3498.namprd11.prod.outlook.com>

Hi Andreas,

There's also another problem. The PACKAGECONFIG item, 'gcr', cannot be disabled, otherwise, we will have do_configure error.

Best Regards,
Chen Qi
________________________________
From: openembedded-devel-bounces at lists.openembedded.org <openembedded-devel-bounces at lists.openembedded.org> on behalf of Chen, Qi <Qi.Chen at windriver.com>
Sent: Friday, March 20, 2020 11:45
To: Andreas M?ller <schnitzeltony at gmail.com>; openembedded-devel at lists.openembedded.org <openembedded-devel at lists.openembedded.org>
Subject: Re: [oe] [PATCH 1/5] libnma: initial add 1.8.28

Hi Andreas,

I got the following error.

gcr was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'libnma', 'gcr']

Could you please take a look at it if convenient?

Best Regards,
Chen Qi
________________________________
From: openembedded-devel-bounces at lists.openembedded.org <openembedded-devel-bounces at lists.openembedded.org> on behalf of Andreas M?ller <schnitzeltony at gmail.com>
Sent: Thursday, March 19, 2020 4:44
To: openembedded-devel at lists.openembedded.org <openembedded-devel at lists.openembedded.org>
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28

With upcoming network-manager-applet 1.16 this library gets mandatory: GNOME
splitted out common code from network-manager-applet to libnma.

Signed-off-by: Andreas M?ller <schnitzeltony at gmail.com>
---
 .../libnma/libnma_1.8.28.bb                    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb

diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
new file mode 100644
index 000000000..de5ad0863
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb
@@ -0,0 +1,18 @@
+SUMMARY = "NetworkManager GUI library"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0 networkmanager"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gtk-doc gettext vala
+
+SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
+SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
+
+PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
+PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
--
2.21.1

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

From schnitzeltony at gmail.com  Fri Mar 20 08:19:15 2020
From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=)
Date: Fri, 20 Mar 2020 09:19:15 +0100
Subject: [oe] [PATCH 1/5] libnma: initial add 1.8.28
In-Reply-To: <DM6PR11MB3498A7172CD23A5BCE165647EDF50@DM6PR11MB3498.namprd11.prod.outlook.com>
References: <20200318204411.12996-1-schnitzeltony@gmail.com>
	<DM6PR11MB349890ADEBB154F7AB354EF4EDF50@DM6PR11MB3498.namprd11.prod.outlook.com>
	<DM6PR11MB3498A7172CD23A5BCE165647EDF50@DM6PR11MB3498.namprd11.prod.outlook.com>
Message-ID: <CALbNGRTwwQzzb6Xij0WwxuMMv7wLs2909V9Mx36LcdemPMrGpg@mail.gmail.com>

On Fri, Mar 20, 2020 at 7:42 AM Chen, Qi <Qi.Chen at windriver.com> wrote:
>
> Hi Andreas,
>
> There's also another problem. The PACKAGECONFIG item, 'gcr', cannot be disabled, otherwise, we will have do_configure error.
>
> Best Regards,
> Chen Qi
Thanks for feedback - will look into both issues and send follow up.

Andreas

From raj.khem at gmail.com  Fri Mar 20 14:45:51 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Fri, 20 Mar 2020 07:45:51 -0700
Subject: [oe] [meta-oe][PATCH 1/3] node: Enable cross-compiling options and
	disable dtrace and etw
Message-ID: <20200320144553.2587659-1-raj.khem@gmail.com>

dtrace and etw are hardly used for embedded usecase

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index a482c6b4ca..28b4136a5a 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -99,7 +99,9 @@ do_configure () {
     export LD="${CXX}"
     GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
     # $TARGET_ARCH settings don't match --dest-cpu settings
-    python3 configure.py --prefix=${prefix} --without-snapshot --shared-openssl \
+    python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \
+               --without-dtrace \
+               --without-etw \
                --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
                --dest-os=linux \
                --libdir=${D}${libdir} \
-- 
2.25.2


From raj.khem at gmail.com  Fri Mar 20 14:45:52 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Fri, 20 Mar 2020 07:45:52 -0700
Subject: [oe] [meta-oe][PATCH 2/3] safec: Put perl requiring tools into
	separate package
In-Reply-To: <20200320144553.2587659-1-raj.khem@gmail.com>
References: <20200320144553.2587659-1-raj.khem@gmail.com>
Message-ID: <20200320144553.2587659-2-raj.khem@gmail.com>

There is one script - a check tool that needs perl on
target, which perhaps is only needed during development and testing
therefore move that to a separate package. Rest of safec is then
independent of perl runtime requirement.

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-core/safec/safec_3.5.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-oe/recipes-core/safec/safec_3.5.bb
index c9ace3b0b8..66b1f6a1aa 100644
--- a/meta-oe/recipes-core/safec/safec_3.5.bb
+++ b/meta-oe/recipes-core/safec/safec_3.5.bb
@@ -16,4 +16,8 @@ CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE"
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux'
 
-RDEPENDS_${PN} = "perl"
+PACKAGES =+ "${PN}-check"
+
+FILES_${PN}-check += "${bindir}/check_for_unsafe_apis"
+
+RDEPENDS_${PN}-check += "perl"
-- 
2.25.2


From raj.khem at gmail.com  Fri Mar 20 14:45:53 2020
From: raj.khem at gmail.com (Khem Raj)
Date: Fri, 20 Mar 2020 07:45:53 -0700
Subject: [oe] [PATCH 3/3] layers: update LAYERSERIES_COMPAT to dunfell
In-Reply-To: <20200320144553.2587659-1-raj.khem@gmail.com>
References: <20200320144553.2587659-1-raj.khem@gmail.com>
Message-ID: <20200320144553.2587659-3-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-filesystems/conf/layer.conf | 2 +-
 meta-gnome/conf/layer.conf       | 2 +-
 meta-initramfs/conf/layer.conf   | 2 +-
 meta-multimedia/conf/layer.conf  | 2 +-
 meta-networking/conf/layer.conf  | 2 +-
 meta-oe/conf/layer.conf          | 2 +-
 meta-perl/conf/layer.conf        | 2 +-
 meta-python/conf/layer.conf      | 2 +-
 meta-webserver/conf/layer.conf   | 2 +-
 meta-xfce/conf/layer.conf        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf
index e8bd3628f8..be1635deea 100644
--- a/meta-filesystems/conf/layer.conf
+++ b/meta-filesystems/conf/layer.conf
@@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1"
 
 LAYERDEPENDS_filesystems-layer = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus dunfell"
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index d381fdf070..7aa9507eb5 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -17,4 +17,4 @@ LAYERVERSION_gnome-layer = "1"
 
 LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer"
 
-LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus dunfell"
diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf
index 93220b1208..634e0883c6 100644
--- a/meta-initramfs/conf/layer.conf
+++ b/meta-initramfs/conf/layer.conf
@@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-initramfs = "8"
 LAYERDEPENDS_meta-initramfs = "core"
 
-LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus"
+LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus dunfell"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   dracut->virtual/kernel \
diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf
index 74dd4a1b03..2d52fb938a 100644
--- a/meta-multimedia/conf/layer.conf
+++ b/meta-multimedia/conf/layer.conf
@@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1"
 
 LAYERDEPENDS_multimedia-layer = "core meta-python"
 
-LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus dunfell"
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index 866bda7558..7bc0702ba7 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core"
 LAYERDEPENDS_networking-layer += "openembedded-layer"
 LAYERDEPENDS_networking-layer += "meta-python"
 
-LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus dunfell"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 652a378f28..434537fd3a 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -34,7 +34,7 @@ LAYERVERSION_openembedded-layer = "1"
 
 LAYERDEPENDS_openembedded-layer = "core"
 
-LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus dunfell"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf
index 2c730e4c75..1361fe0842 100644
--- a/meta-perl/conf/layer.conf
+++ b/meta-perl/conf/layer.conf
@@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1"
 
 LAYERDEPENDS_perl-layer = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus dunfell"
diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf
index db65943f56..7cfeafe599 100644
--- a/meta-python/conf/layer.conf
+++ b/meta-python/conf/layer.conf
@@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1"
 
 LAYERDEPENDS_meta-python = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_meta-python = "thud warrior zeus"
+LAYERSERIES_COMPAT_meta-python = "thud warrior zeus dunfell"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf
index 2c6fad4ac6..24469115e4 100644
--- a/meta-webserver/conf/layer.conf
+++ b/meta-webserver/conf/layer.conf
@@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1"
 
 LAYERDEPENDS_webserver = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_webserver = "thud warrior zeus"
+LAYERSERIES_COMPAT_webserver = "thud warrior zeus dunfell"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf
index 070ea6ac7d..199c69e7b2 100644
--- a/meta-xfce/conf/layer.conf
+++ b/meta-xfce/conf/layer.conf
@@ -19,4 +19,4 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer"
 LAYERDEPENDS_xfce-layer += "meta-python"
 LAYERDEPENDS_xfce-layer += "networking-layer"
 
-LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus dunfell"
-- 
2.25.2


From martin.jansa at gmail.com  Fri Mar 20 15:27:34 2020
From: martin.jansa at gmail.com (Martin Jansa)
Date: Fri, 20 Mar 2020 16:27:34 +0100
Subject: [oe] [PATCH 3/3] layers: update LAYERSERIES_COMPAT to dunfell
In-Reply-To: <20200320144553.2587659-3-raj.khem@gmail.com>
References: <20200320144553.2587659-1-raj.khem@gmail.com>
	<20200320144553.2587659-3-raj.khem@gmail.com>
Message-ID: <CA+chaQczKRWOke9maR0n_4LRZ4KsUWYDuEjWtE7-Gawk8RoCRw@mail.gmail.com>

Can we drop at least thud and warrior? without e.g. features_check or
mime-xdg bbclasses from dunfell oe-core some of these layers don't even
parse, so it might be worth keeping just dunfell (that's what I did for
meta-qt5 now).

On Fri, Mar 20, 2020 at 3:46 PM Khem Raj <raj.khem at gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  meta-filesystems/conf/layer.conf | 2 +-
>  meta-gnome/conf/layer.conf       | 2 +-
>  meta-initramfs/conf/layer.conf   | 2 +-
>  meta-multimedia/conf/layer.conf  | 2 +-
>  meta-networking/conf/layer.conf  | 2 +-
>  meta-oe/conf/layer.conf          | 2 +-
>  meta-perl/conf/layer.conf        | 2 +-
>  meta-python/conf/layer.conf      | 2 +-
>  meta-webserver/conf/layer.conf   | 2 +-
>  meta-xfce/conf/layer.conf        | 2 +-
>  10 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/meta-filesystems/conf/layer.conf
> b/meta-filesystems/conf/layer.conf
> index e8bd3628f8..be1635deea 100644
> --- a/meta-filesystems/conf/layer.conf
> +++ b/meta-filesystems/conf/layer.conf
> @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1"
>
>  LAYERDEPENDS_filesystems-layer = "core openembedded-layer"
>
> -LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus"
> +LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus dunfell"
> diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
> index d381fdf070..7aa9507eb5 100644
> --- a/meta-gnome/conf/layer.conf
> +++ b/meta-gnome/conf/layer.conf
> @@ -17,4 +17,4 @@ LAYERVERSION_gnome-layer = "1"
>
>  LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer"
>
> -LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus"
> +LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus dunfell"
> diff --git a/meta-initramfs/conf/layer.conf
> b/meta-initramfs/conf/layer.conf
> index 93220b1208..634e0883c6 100644
> --- a/meta-initramfs/conf/layer.conf
> +++ b/meta-initramfs/conf/layer.conf
> @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/"
>  BBFILE_PRIORITY_meta-initramfs = "8"
>  LAYERDEPENDS_meta-initramfs = "core"
>
> -LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus"
> +LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus dunfell"
>
>  SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
>    dracut->virtual/kernel \
> diff --git a/meta-multimedia/conf/layer.conf
> b/meta-multimedia/conf/layer.conf
> index 74dd4a1b03..2d52fb938a 100644
> --- a/meta-multimedia/conf/layer.conf
> +++ b/meta-multimedia/conf/layer.conf
> @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1"
>
>  LAYERDEPENDS_multimedia-layer = "core meta-python"
>
> -LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus"
> +LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus dunfell"
> diff --git a/meta-networking/conf/layer.conf
> b/meta-networking/conf/layer.conf
> index 866bda7558..7bc0702ba7 100644
> --- a/meta-networking/conf/layer.conf
> +++ b/meta-networking/conf/layer.conf
> @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core"
>  LAYERDEPENDS_networking-layer += "openembedded-layer"
>  LAYERDEPENDS_networking-layer += "meta-python"
>
> -LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus"
> +LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus dunfell"
>
>  LICENSE_PATH += "${LAYERDIR}/licenses"
>
> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
> index 652a378f28..434537fd3a 100644
> --- a/meta-oe/conf/layer.conf
> +++ b/meta-oe/conf/layer.conf
> @@ -34,7 +34,7 @@ LAYERVERSION_openembedded-layer = "1"
>
>  LAYERDEPENDS_openembedded-layer = "core"
>
> -LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
> +LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus dunfell"
>
>  LICENSE_PATH += "${LAYERDIR}/licenses"
>
> diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf
> index 2c730e4c75..1361fe0842 100644
> --- a/meta-perl/conf/layer.conf
> +++ b/meta-perl/conf/layer.conf
> @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1"
>
>  LAYERDEPENDS_perl-layer = "core openembedded-layer"
>
> -LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus"
> +LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus dunfell"
> diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf
> index db65943f56..7cfeafe599 100644
> --- a/meta-python/conf/layer.conf
> +++ b/meta-python/conf/layer.conf
> @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1"
>
>  LAYERDEPENDS_meta-python = "core openembedded-layer"
>
> -LAYERSERIES_COMPAT_meta-python = "thud warrior zeus"
> +LAYERSERIES_COMPAT_meta-python = "thud warrior zeus dunfell"
>
>  LICENSE_PATH += "${LAYERDIR}/licenses"
> diff --git a/meta-webserver/conf/layer.conf
> b/meta-webserver/conf/layer.conf
> index 2c6fad4ac6..24469115e4 100644
> --- a/meta-webserver/conf/layer.conf
> +++ b/meta-webserver/conf/layer.conf
> @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1"
>
>  LAYERDEPENDS_webserver = "core openembedded-layer"
>
> -LAYERSERIES_COMPAT_webserver = "thud warrior zeus"
> +LAYERSERIES_COMPAT_webserver = "thud warrior zeus dunfell"
>
>  LICENSE_PATH += "${LAYERDIR}/licenses"
>
> diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf
> index 070ea6ac7d..199c69e7b2 100644
> --- a/meta-xfce/conf/layer.conf
> +++ b/meta-xfce/conf/layer.conf
> @@ -19,4 +19,4 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer"
>  LAYERDEPENDS_xfce-layer += "meta-python"
>  LAYERDEPENDS_xfce-layer += "networking-layer"
>
> -LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus"
> +LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus dunfell"
> --
> 2.25.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

From akuster808 at gmail.com  Fri Mar 20 15:53:07 2020
From: akuster808 at gmail.com (akuster808)
Date: Fri, 20 Mar 2020 08:53:07 -0700
Subject: [oe] [PATCH 3/3] layers: update LAYERSERIES_COMPAT to dunfell
In-Reply-To: <CA+chaQczKRWOke9maR0n_4LRZ4KsUWYDuEjWtE7-Gawk8RoCRw@mail.gmail.com>
References: <20200320144553.2587659-1-raj.khem@gmail.com>
	<20200320144553.2587659-3-raj.khem@gmail.com>
	<CA+chaQczKRWOke9maR0n_4LRZ4KsUWYDuEjWtE7-Gawk8RoCRw@mail.gmail.com>
Message-ID: <dd222844-2183-a23c-d445-ac90b3305043@gmail.com>



On 3/20/20 8:27 AM, Martin Jansa wrote:
> Can we drop at least thud and warrior? without e.g. features_check or
> mime-xdg bbclasses from dunfell oe-core some of these layers don't even
> parse, so it might be worth keeping just dunfell (that's what I did for
> meta-qt5 now).
Not to mention the shifting of packages between core and meta-oe.

- armin
>
> On Fri, Mar 20, 2020 at 3:46 PM Khem Raj <raj.khem at gmail.com> wrote:
>
>> Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> ---
>>  meta-filesystems/conf/layer.conf | 2 +-
>>  meta-gnome/conf/layer.conf       | 2 +-
>>  meta-initramfs/conf/layer.conf   | 2 +-
>>  meta-multimedia/conf/layer.conf  | 2 +-
>>  meta-networking/conf/layer.conf  | 2 +-
>>  meta-oe/conf/layer.conf          | 2 +-
>>  meta-perl/conf/layer.conf        | 2 +-
>>  meta-python/conf/layer.conf      | 2 +-
>>  meta-webserver/conf/layer.conf   | 2 +-
>>  meta-xfce/conf/layer.conf        | 2 +-
>>  10 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/meta-filesystems/conf/layer.conf
>> b/meta-filesystems/conf/layer.conf
>> index e8bd3628f8..be1635deea 100644
>> --- a/meta-filesystems/conf/layer.conf
>> +++ b/meta-filesystems/conf/layer.conf
>> @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1"
>>
>>  LAYERDEPENDS_filesystems-layer = "core openembedded-layer"
>>
>> -LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus dunfell"
>> diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
>> index d381fdf070..7aa9507eb5 100644
>> --- a/meta-gnome/conf/layer.conf
>> +++ b/meta-gnome/conf/layer.conf
>> @@ -17,4 +17,4 @@ LAYERVERSION_gnome-layer = "1"
>>
>>  LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer"
>>
>> -LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus dunfell"
>> diff --git a/meta-initramfs/conf/layer.conf
>> b/meta-initramfs/conf/layer.conf
>> index 93220b1208..634e0883c6 100644
>> --- a/meta-initramfs/conf/layer.conf
>> +++ b/meta-initramfs/conf/layer.conf
>> @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/"
>>  BBFILE_PRIORITY_meta-initramfs = "8"
>>  LAYERDEPENDS_meta-initramfs = "core"
>>
>> -LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus dunfell"
>>
>>  SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
>>    dracut->virtual/kernel \
>> diff --git a/meta-multimedia/conf/layer.conf
>> b/meta-multimedia/conf/layer.conf
>> index 74dd4a1b03..2d52fb938a 100644
>> --- a/meta-multimedia/conf/layer.conf
>> +++ b/meta-multimedia/conf/layer.conf
>> @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1"
>>
>>  LAYERDEPENDS_multimedia-layer = "core meta-python"
>>
>> -LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus dunfell"
>> diff --git a/meta-networking/conf/layer.conf
>> b/meta-networking/conf/layer.conf
>> index 866bda7558..7bc0702ba7 100644
>> --- a/meta-networking/conf/layer.conf
>> +++ b/meta-networking/conf/layer.conf
>> @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core"
>>  LAYERDEPENDS_networking-layer += "openembedded-layer"
>>  LAYERDEPENDS_networking-layer += "meta-python"
>>
>> -LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus dunfell"
>>
>>  LICENSE_PATH += "${LAYERDIR}/licenses"
>>
>> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
>> index 652a378f28..434537fd3a 100644
>> --- a/meta-oe/conf/layer.conf
>> +++ b/meta-oe/conf/layer.conf
>> @@ -34,7 +34,7 @@ LAYERVERSION_openembedded-layer = "1"
>>
>>  LAYERDEPENDS_openembedded-layer = "core"
>>
>> -LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus dunfell"
>>
>>  LICENSE_PATH += "${LAYERDIR}/licenses"
>>
>> diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf
>> index 2c730e4c75..1361fe0842 100644
>> --- a/meta-perl/conf/layer.conf
>> +++ b/meta-perl/conf/layer.conf
>> @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1"
>>
>>  LAYERDEPENDS_perl-layer = "core openembedded-layer"
>>
>> -LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus dunfell"
>> diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf
>> index db65943f56..7cfeafe599 100644
>> --- a/meta-python/conf/layer.conf
>> +++ b/meta-python/conf/layer.conf
>> @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1"
>>
>>  LAYERDEPENDS_meta-python = "core openembedded-layer"
>>
>> -LAYERSERIES_COMPAT_meta-python = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_meta-python = "thud warrior zeus dunfell"
>>
>>  LICENSE_PATH += "${LAYERDIR}/licenses"
>> diff --git a/meta-webserver/conf/layer.conf
>> b/meta-webserver/conf/layer.conf
>> index 2c6fad4ac6..24469115e4 100644
>> --- a/meta-webserver/conf/layer.conf
>> +++ b/meta-webserver/conf/layer.conf
>> @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1"
>>
>>  LAYERDEPENDS_webserver = "core openembedded-layer"
>>
>> -LAYERSERIES_COMPAT_webserver = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_webserver = "thud warrior zeus dunfell"
>>
>>  LICENSE_PATH += "${LAYERDIR}/licenses"
>>
>> diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf
>> index 070ea6ac7d..199c69e7b2 100644
>> --- a/meta-xfce/conf/layer.conf
>> +++ b/meta-xfce/conf/layer.conf
>> @@ -19,4 +19,4 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer"
>>  LAYERDEPENDS_xfce-layer += "meta-python"
>>  LAYERDEPENDS_xfce-layer += "networking-layer"
>>
>> -LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus"
>> +LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus dunfell"
>> --
>> 2.25.2
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>


From robert.berger.oe.devel at gmail.com  Fri Mar 20 16:38:17 2020
From: robert.berger.oe.devel at gmail.com (robert.berger.oe.devel)
Date: Fri, 20 Mar 2020 18:38:17 +0200
Subject: [oe] [meta-java] archiver.bbclass incompatible with openjdk-8
Message-ID: <add27e61-09ac-3e8a-af0e-73479a3f97ab@gmail.com>

Hi,

The problem can be very easily reproduced. Just enable the 
archiver.bbclass and build openjdk-8 and it will break. I'll explain 
further down why.

I would really like to have some upstream solution, so openjdk-8 can be 
built with the archiver.bbclass active, but so far I only have my hacky 
patch[1].

[1] 
https://github.com/RobertBerger/meta-java/commit/a97d27ea0d6701df222c79fb1ce983fc39308c0c

Here I try to explain the problem:

1) Without the archiver class:

in openjdk-8-common.inc:

1.1) do_unpack[postfuncs] += "do_unpack_extract_submodules"

1.2)

do_unpack_extract_submodules () {
     cd "${S}"
     # tar --transform
     tar xjf ${WORKDIR}/${CORBA_FILE_LOCAL} --transform 
"s,-${CORBA_CHANGESET},,g"
...
}

2) With the archiver class:

2.1) do_unpack_and_patch could be used instead of do_unpack directly:

2.1.1) It is always used for ARCHIVER_MODE[src] = "patched" and 
ARCHIVER_MODE[src] = "configured".

2.1.2) For ARCHIVER_MODE[src] = "original" it is only enabled if 
ARCHIVER_MODE[diff] = "1" is also enabled.

2.1.3) And for the new ARCHIVE_MODE[src] = "mirror" it is never enabled.

Thanks to Saur for the detailed explanation when and when not 
do_unpack_and_patch is being called.

2.2) if do_unpack_and_patch() is used it sets WORKDIR itself to 
${ARCHIVER_WORKDIR}, which defaults to ${WORKDIR}/archiver-work/

2.3) Which makes

do_unpack_extract_submodules () {
     cd "${S}"
     # tar --transform
     tar xjf ${WORKDIR}/${CORBA_FILE_LOCAL} --transform 
"s,-${CORBA_CHANGESET},,g"
...
}

fail, since it should be tar xjf ${WORKDIR}/../${CORBA_FILE_LOCAL} 
--transform "s,-${CORBA_CHANGESET},,g"

...

due to the additional directory structure.

I would be happy to hear suggestions how to improve my hack.

If I could somehow programatically figure out within BitBake that 
do_unpack_extract_submodules is called from do_unpack_and_patch -> 
do_unpack I guess it would be better. Just don't know how this can be 
done. Is there a BitBake callstack?

3) My (hacky) solution

[1] 
https://github.com/RobertBerger/meta-java/commit/a97d27ea0d6701df222c79fb1ce983fc39308c0c


Regards,

Robert

From robert.berger.oe.devel at gmail.com  Fri Mar 20 16:53:17 2020
From: robert.berger.oe.devel at gmail.com (robert.berger.oe.devel)
Date: Fri, 20 Mar 2020 18:53:17 +0200
Subject: [oe] [meta-java] host gcc-9,
	icetea-7 gcc-9 but how older gcc versions?
Message-ID: <7946cd8c-4a94-5e5a-7bdc-64963af21006@gmail.com>

Hi,

I tried to add support for a host gcc-9 and suggested this patch[1]

[1] 
https://github.com/RobertBerger/meta-java/commit/898a0ae33c9102387aae2e3427a007e3935e663e

and, as per your suggestion, since it restricts the host compiler to >= 
gcc9 I added "-Wno-unknown-warning".

https://github.com/RobertBerger/meta-java/commit/3d8ae5afb639ec7abcc48f15c74b42b373863c57

... but it does not build:

https://pastebin.com/B1nxHcPH

cc1plus: error: unrecognized command line option ?-Wno-unknown-warning? 
[-Werror]

That's my host gcc:

pokyuser at 3a469e7032d9:/workdir$ gcc --version
gcc (Ubuntu 9.2.1-17ubuntu1~16.04) 9.2.1 20191102
Copyright (C) 2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

pokyuser at 3a469e7032d9:/workdir$

Please advise.

Regards,

Robert

From mhalstead at linuxfoundation.org  Fri Mar 20 18:59:42 2020
From: mhalstead at linuxfoundation.org (Michael Halstead)
Date: Fri, 20 Mar 2020 11:59:42 -0700
Subject: [oe] Mailing list platform change March 20th
In-Reply-To: <CADfgfoYCjVip=oc_U0TdFzOVst5U-KU+R31JhdckRv77APzQ-g@mail.gmail.com>
References: <CADfgfobNNXr9HSOiwyamzbZ4q1uc8wgD5PzobDF56cDyYui-HQ@mail.gmail.com>
	<CADfgfoYCjVip=oc_U0TdFzOVst5U-KU+R31JhdckRv77APzQ-g@mail.gmail.com>
Message-ID: <CADfgfob4=Zeh=jn9b9uMqq6Wnt83oGmJ-8yf1wSXYEFTppv2Bg@mail.gmail.com>

The migration will begin shortly. List mail will be delayed until the
process is complete. E-mail sent during downtime should eventually be
delivered. However waiting to send until after the switch is recommended.

Thank you,
--
Michael Halstead
Linux Foundation / Yocto Project
Systems Operations Engineer

On Thu, Mar 19, 2020 at 9:44 AM Michael Halstead <
mhalstead at linuxfoundation.org> wrote:

> Everything is proceeding smoothly and this work will continue as planned.
> The migration starts at noon PDT tomorrow.
>
> List owners please take care of all outstanding moderation in the next 24
> hours to ensure a smooth transition.
>
> Thank you,
> --
> Michael Halstead
> Linux Foundation / Yocto Project
> Systems Operations Engineer
>
> On Fri, Mar 13, 2020 at 4:58 PM Michael Halstead <
> mhalstead at linuxfoundation.org> wrote:
>
>> We are moving our lists from Mailman to Groups.io. E-mail to lists will
>> be delayed during the move window. We are aiming to complete the migration
>> during business hours in the Pacific time zone.
>>
>> A new account will be created for you on the Groups.io platform if you
>> don't already have one.
>>
>> You can read more about the change on the wiki:
>> https://www.openembedded.org/wiki/GroupsMigration
>>
>> If there are serious issues we will rollback the changes. We will e-mail
>> all lists when work is complete.
>>
>> --
>> Michael Halstead
>> Linux Foundation / Yocto Project
>> Systems Operations Engineer
>>
>>