[honister][PATCH 00/17] Review request

[honister][PATCH 00/17] Review request

[Anuj Mittal]

Please review these changes for honister. No issues seen on autobuilder.

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

Thanks,

Anuj

The following changes since commit d2cba06c27c87c64423636153c0f186c5f45b147:

  glibc-version.inc: remove branch= from GLIBC_GIT_URI (2021-11-12 10:57:32 +0800)

are available in the Git repository at:

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

Bruce Ashfield (4):
  linux-yocto/5.14: update to v5.14.16
  linux-yocto/5.10: update to v5.10.77
  linux-yocto/5.14: update to v5.14.17
  linux-yocto/5.10: update to v5.10.78

Chen Qi (1):
  avahi: update CVE id fixed by local-ping.patch

Jon Mason (1):
  scripts/lib/wic/help.py: Update Fedora Kickstart URLs

Kai Kang (2):
  squashfs-tools: follow-up fix for CVE-2021-41072
  convert-srcuri.py: use regex to check space in SRC_URI

Peter Kjellerstedt (1):
  insane.bbclass: Add a check for directories that are expected to be
    empty

Richard Purdie (6):
  mirrors: Add uninative mirror on kernel.org
  scripts/oe-package-browser: Fix after overrides change
  scripts/oe-package-browser: Handle no packages being built
  wpa-supplicant: Match package override to PACKAGES for pkg_postinst
  uninative: Add version to uninative tarball name
  mirrors: Add kernel.org sources mirror for downloads.yoctoproject.org

Ross Burton (2):
  vim: fix CVE-2021-3796, CVE-2021-3872, and CVE-2021-3875
  vim: add patch number to CVE-2021-3778 patch

 meta/classes/insane.bbclass                   | 30 ++++++
 meta/classes/mirrors.bbclass                  |  2 +
 meta/classes/uninative.bbclass                |  2 +-
 meta/conf/distro/include/yocto-uninative.inc  |  3 +-
 meta/conf/documentation.conf                  |  2 +
 .../avahi/files/local-ping.patch              |  1 +
 .../wpa-supplicant/wpa-supplicant_2.9.bb      |  2 +-
 .../squashfs-tools/CVE-2021-41072.patch       |  6 +-
 .../linux/linux-yocto-rt_5.10.bb              |  6 +-
 .../linux/linux-yocto-rt_5.14.bb              |  6 +-
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +-
 .../linux/linux-yocto-tiny_5.14.bb            |  8 +-
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 ++---
 meta/recipes-kernel/linux/linux-yocto_5.14.bb | 26 ++---
 ...28-using-freed-memory-when-replacing.patch | 83 ++++++++++++++++
 ...llegal-memory-access-if-buffer-name-.patch | 86 ++++++++++++++++
 ...ml_get-error-after-search-with-range.patch | 72 ++++++++++++++
 ...nvalid-memory-access-when-scrolling-.patch | 97 +++++++++++++++++++
 .../vim/files/CVE-2021-3778.patch             | 37 ++++---
 meta/recipes-support/vim/vim.inc              |  8 +-
 scripts/contrib/convert-srcuri.py             |  8 +-
 scripts/lib/wic/help.py                       |  4 +-
 scripts/oe-pkgdata-browser                    |  8 +-
 23 files changed, 464 insertions(+), 65 deletions(-)
 create mode 100644 meta/recipes-support/vim/files/0002-patch-8.2.3428-using-freed-memory-when-replacing.patch
 create mode 100644 meta/recipes-support/vim/files/0003-patch-8.2.3487-illegal-memory-access-if-buffer-name-.patch
 create mode 100644 meta/recipes-support/vim/files/0004-patch-8.2.3489-ml_get-error-after-search-with-range.patch
 create mode 100644 meta/recipes-support/vim/files/0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch

-- 
2.33.1

[honister][PATCH 01/17] avahi: update CVE id fixed by local-ping.patch

[Anuj Mittal]

From: Chen Qi <Qi.Chen@windriver.com>

CVE-2021-36217 is treated as a duplicate of CVE-2021-3502.
Update the local-ping.patch to mark it resolve both.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4d75d6c39f1faeb38191b55f1fa9311b63fcfb29)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/recipes-connectivity/avahi/files/local-ping.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/avahi/files/local-ping.patch b/meta/recipes-connectivity/avahi/files/local-ping.patch
index 94116ad1f3..29c192d296 100644
--- a/meta/recipes-connectivity/avahi/files/local-ping.patch
+++ b/meta/recipes-connectivity/avahi/files/local-ping.patch
@@ -1,4 +1,5 @@
 CVE: CVE-2021-36217
+CVE: CVE-2021-3502
 Upstream-Status: Backport
 Signed-off-by: Ross Burton <ross.burton@arm.com>
 
-- 
2.33.1

[honister][PATCH 02/17] mirrors: Add uninative mirror on kernel.org

[Anuj Mittal]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

At the last nas outage, we realised that we don't have good mirrors of the
uninative tarball if our main system can't be accessed. kernel.org mirrors
some Yocto Project data so we've ensured uninative is there. Add the appropriate
mirror url to make use of that.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1833cb0c5841afafb468b963b74b63366b09a134)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/classes/mirrors.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index ba325a658b..75eb86a724 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -62,6 +62,7 @@ ftp://.*/.*     http://sources.openembedded.org/ \n \
 npm://.*/?.*    http://sources.openembedded.org/ \n \
 ${CPAN_MIRROR}  http://cpan.metacpan.org/ \n \
 ${CPAN_MIRROR}  http://search.cpan.org/CPAN/ \n \
+https?$://downloads.yoctoproject.org/releases/uninative/ https://mirrors.kernel.org/yocto/uninative/ \n \
 "
 
 # Use MIRRORS to provide git repo fallbacks using the https protocol, for cases
-- 
2.33.1

[honister][PATCH 03/17] squashfs-tools: follow-up fix for CVE-2021-41072

[Anuj Mittal]

From: Kai Kang <kai.kang@windriver.com>

Squash a follow-up fix for CVE-2021-41072 from upstream:
https://github.com/plougher/squashfs-tools/commit/19fcc93

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 70709ff0741ed9fb9c111ef4b7aa2ee7432453f4)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../squashfs-tools/squashfs-tools/CVE-2021-41072.patch      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
index 94d6da4b14..f807af60bc 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
@@ -1,6 +1,10 @@
 CVE: CVE-2021-41072
 Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/e048580]
 
+Update on 20211109:
+Squash a follow-up fix for CVE-2021-41072 from upstream:
+https://github.com/plougher/squashfs-tools/commit/19fcc93
+
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 
 From e0485802ec72996c20026da320650d8362f555bd Mon Sep 17 00:00:00 2001
@@ -65,7 +69,7 @@ index 7262a2e..1b544ed 100755
  
  unsquash-1234.o: unsquash-1234.c unsquashfs_error.h
  
-+unsquash-1234.o: unsquash-12.c
++unsquash-12.o: unsquash-12.c unsquashfs.h
 +
  unsquashfs_xattr.o: unsquashfs_xattr.c unsquashfs.h squashfs_fs.h xattr.h unsquashfs_error.h
  
-- 
2.33.1

[honister][PATCH 04/17] vim: fix CVE-2021-3796, CVE-2021-3872, and CVE-2021-3875

[Anuj Mittal]

From: Ross Burton <ross@burtonini.com>

Backport patches from upstream to fix these CVEs.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b493eb4f9a6bb75a2f01a53b6c70762845bf79f9)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...28-using-freed-memory-when-replacing.patch | 83 ++++++++++++++++
 ...llegal-memory-access-if-buffer-name-.patch | 86 ++++++++++++++++
 ...ml_get-error-after-search-with-range.patch | 72 ++++++++++++++
 ...nvalid-memory-access-when-scrolling-.patch | 97 +++++++++++++++++++
 meta/recipes-support/vim/vim.inc              |  8 +-
 5 files changed, 344 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/vim/files/0002-patch-8.2.3428-using-freed-memory-when-replacing.patch
 create mode 100644 meta/recipes-support/vim/files/0003-patch-8.2.3487-illegal-memory-access-if-buffer-name-.patch
 create mode 100644 meta/recipes-support/vim/files/0004-patch-8.2.3489-ml_get-error-after-search-with-range.patch
 create mode 100644 meta/recipes-support/vim/files/0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch

diff --git a/meta/recipes-support/vim/files/0002-patch-8.2.3428-using-freed-memory-when-replacing.patch b/meta/recipes-support/vim/files/0002-patch-8.2.3428-using-freed-memory-when-replacing.patch
new file mode 100644
index 0000000000..ecfae0301e
--- /dev/null
+++ b/meta/recipes-support/vim/files/0002-patch-8.2.3428-using-freed-memory-when-replacing.patch
@@ -0,0 +1,83 @@
+CVE: CVE-2021-3796
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From 1160e5f74b229336502fc376416f21108d36cfc2 Mon Sep 17 00:00:00 2001
+From: Bram Moolenaar <Bram@vim.org>
+Date: Sat, 11 Sep 2021 21:14:20 +0200
+Subject: [PATCH] patch 8.2.3428: using freed memory when replacing
+
+Problem:    Using freed memory when replacing. (Dhiraj Mishra)
+Solution:   Get the line pointer after calling ins_copychar().
+---
+ src/normal.c              | 10 +++++++---
+ src/testdir/test_edit.vim | 14 ++++++++++++++
+ src/version.c             |  2 ++
+ 3 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/src/normal.c b/src/normal.c
+index c4963e621..d6333b948 100644
+--- a/src/normal.c
++++ b/src/normal.c
+@@ -5009,19 +5009,23 @@ nv_replace(cmdarg_T *cap)
+ 	    {
+ 		/*
+ 		 * Get ptr again, because u_save and/or showmatch() will have
+-		 * released the line.  At the same time we let know that the
+-		 * line will be changed.
++		 * released the line.  This may also happen in ins_copychar().
++		 * At the same time we let know that the line will be changed.
+ 		 */
+-		ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
+ 		if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
+ 		{
+ 		  int c = ins_copychar(curwin->w_cursor.lnum
+ 					   + (cap->nchar == Ctrl_Y ? -1 : 1));
++
++		  ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
+ 		  if (c != NUL)
+ 		    ptr[curwin->w_cursor.col] = c;
+ 		}
+ 		else
++		{
++		    ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
+ 		    ptr[curwin->w_cursor.col] = cap->nchar;
++		}
+ 		if (p_sm && msg_silent == 0)
+ 		    showmatch(cap->nchar);
+ 		++curwin->w_cursor.col;
+diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
+index 4e29e7fe1..f94e6c181 100644
+--- a/src/testdir/test_edit.vim
++++ b/src/testdir/test_edit.vim
+@@ -1519,3 +1519,17 @@ func Test_edit_noesckeys()
+   bwipe!
+   set esckeys
+ endfunc
++
++" Test for getting the character of the line below after "p"
++func Test_edit_put_CTRL_E()
++  set encoding=latin1
++  new
++  let @" = ''
++  sil! norm or\x03ggRx
++  sil! norm pr\x05
++  call assert_equal(['r', 'r'], getline(1, 2))
++  bwipe!
++  set encoding=utf-8
++endfunc
++
++" vim: shiftwidth=2 sts=2 expandtab
+diff --git a/src/version.c b/src/version.c
+index 85bdfc601..1046993d6 100644
+--- a/src/version.c
++++ b/src/version.c
+@@ -742,6 +742,8 @@ static char *(features[]) =
+ 
+ static int included_patches[] =
+ {   /* Add new patch number below this line */
++/**/
++    3428,
+ /**/
+     3409,
+ /**/
diff --git a/meta/recipes-support/vim/files/0003-patch-8.2.3487-illegal-memory-access-if-buffer-name-.patch b/meta/recipes-support/vim/files/0003-patch-8.2.3487-illegal-memory-access-if-buffer-name-.patch
new file mode 100644
index 0000000000..576664f436
--- /dev/null
+++ b/meta/recipes-support/vim/files/0003-patch-8.2.3487-illegal-memory-access-if-buffer-name-.patch
@@ -0,0 +1,86 @@
+CVE: CVE-2021-3872
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From 61629ea24a2fff1f89c37479d3fb52f17c3480fc Mon Sep 17 00:00:00 2001
+From: Bram Moolenaar <Bram@vim.org>
+Date: Fri, 8 Oct 2021 18:39:28 +0100
+Subject: [PATCH] patch 8.2.3487: illegal memory access if buffer name is very
+ long
+
+Problem:    Illegal memory access if buffer name is very long.
+Solution:   Make sure not to go over the end of the buffer.
+---
+ src/drawscreen.c                | 10 +++++-----
+ src/testdir/test_statusline.vim | 11 +++++++++++
+ src/version.c                   |  2 ++
+ 3 files changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/src/drawscreen.c b/src/drawscreen.c
+index 3a88ee979..9acb70552 100644
+--- a/src/drawscreen.c
++++ b/src/drawscreen.c
+@@ -446,13 +446,13 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
+ 	    *(p + len++) = ' ';
+ 	if (bt_help(wp->w_buffer))
+ 	{
+-	    STRCPY(p + len, _("[Help]"));
++	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Help]"));
+ 	    len += (int)STRLEN(p + len);
+ 	}
+ #ifdef FEAT_QUICKFIX
+ 	if (wp->w_p_pvw)
+ 	{
+-	    STRCPY(p + len, _("[Preview]"));
++	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Preview]"));
+ 	    len += (int)STRLEN(p + len);
+ 	}
+ #endif
+@@ -462,12 +462,12 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
+ #endif
+ 		)
+ 	{
+-	    STRCPY(p + len, "[+]");
+-	    len += 3;
++	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", "[+]");
++	    len += (int)STRLEN(p + len);
+ 	}
+ 	if (wp->w_buffer->b_p_ro)
+ 	{
+-	    STRCPY(p + len, _("[RO]"));
++	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[RO]"));
+ 	    len += (int)STRLEN(p + len);
+ 	}
+ 
+diff --git a/src/testdir/test_statusline.vim b/src/testdir/test_statusline.vim
+index 1f705b847..91bce1407 100644
+--- a/src/testdir/test_statusline.vim
++++ b/src/testdir/test_statusline.vim
+@@ -393,3 +393,14 @@ func Test_statusline_visual()
+   bwipe! x1
+   bwipe! x2
+ endfunc
++" Used to write beyond allocated memory.  This assumes MAXPATHL is 4096 bytes.
++func Test_statusline_verylong_filename()
++  let fname = repeat('x', 4090)
++  exe "new " .. fname
++  set buftype=help
++  set previewwindow
++  redraw
++  bwipe!
++endfunc
++
++" vim: shiftwidth=2 sts=2 expandtab
+diff --git a/src/version.c b/src/version.c
+index 1046993d6..2b5de5ccf 100644
+--- a/src/version.c
++++ b/src/version.c
+@@ -742,6 +742,8 @@ static char *(features[]) =
+ 
+ static int included_patches[] =
+ {   /* Add new patch number below this line */
++/**/
++    3487,
+ /**/
+     3428,
+ /**/
diff --git a/meta/recipes-support/vim/files/0004-patch-8.2.3489-ml_get-error-after-search-with-range.patch b/meta/recipes-support/vim/files/0004-patch-8.2.3489-ml_get-error-after-search-with-range.patch
new file mode 100644
index 0000000000..045081579c
--- /dev/null
+++ b/meta/recipes-support/vim/files/0004-patch-8.2.3489-ml_get-error-after-search-with-range.patch
@@ -0,0 +1,72 @@
+CVE: CVE-2021-3875
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From b8968e26d7508e7d64bfc86808142818b0a9288c Mon Sep 17 00:00:00 2001
+From: Bram Moolenaar <Bram@vim.org>
+Date: Sat, 9 Oct 2021 13:58:55 +0100
+Subject: [PATCH] patch 8.2.3489: ml_get error after search with range
+
+Problem:    ml_get error after search with range.
+Solution:   Limit the line number to the buffer line count.
+---
+ src/ex_docmd.c              |  6 ++++--
+ src/testdir/test_search.vim | 17 +++++++++++++++++
+ src/version.c               |  2 ++
+ 3 files changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/src/ex_docmd.c b/src/ex_docmd.c
+index fb07450f8..fde726477 100644
+--- a/src/ex_docmd.c
++++ b/src/ex_docmd.c
+@@ -3586,8 +3586,10 @@ get_address(
+ 
+ 		    // When '/' or '?' follows another address, start from
+ 		    // there.
+-		    if (lnum != MAXLNUM)
+-			curwin->w_cursor.lnum = lnum;
++		    if (lnum > 0 && lnum != MAXLNUM)
++			curwin->w_cursor.lnum =
++				lnum > curbuf->b_ml.ml_line_count
++					   ? curbuf->b_ml.ml_line_count : lnum;
+ 
+ 		    // Start a forward search at the end of the line (unless
+ 		    // before the first line).
+diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
+index 187671305..e142c3547 100644
+--- a/src/testdir/test_search.vim
++++ b/src/testdir/test_search.vim
+@@ -1366,3 +1366,20 @@ func Test_searchdecl()
+ 
+   bwipe!
+ endfunc
++
++func Test_search_with_invalid_range()
++  new
++  let lines =<< trim END
++    /\%.v
++    5/
++    c
++  END
++  call writefile(lines, 'Xrangesearch')
++  source Xrangesearch
++
++  bwipe!
++  call delete('Xrangesearch')
++endfunc
++
++
++" vim: shiftwidth=2 sts=2 expandtab
+diff --git a/src/version.c b/src/version.c
+index 2b5de5ccf..092864bbb 100644
+--- a/src/version.c
++++ b/src/version.c
+@@ -742,6 +742,8 @@ static char *(features[]) =
+ 
+ static int included_patches[] =
+ {   /* Add new patch number below this line */
++/**/
++    3489,
+ /**/
+     3487,
+ /**/
diff --git a/meta/recipes-support/vim/files/0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch b/meta/recipes-support/vim/files/0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch
new file mode 100644
index 0000000000..7184b37cad
--- /dev/null
+++ b/meta/recipes-support/vim/files/0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch
@@ -0,0 +1,97 @@
+CVE: CVE-2021-3903
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From b15919c1fe0f7fc3d98ff5207ed2feb43c59009d Mon Sep 17 00:00:00 2001
+From: Bram Moolenaar <Bram@vim.org>
+Date: Mon, 25 Oct 2021 17:07:04 +0100
+Subject: [PATCH] patch 8.2.3564: invalid memory access when scrolling without
+ valid screen
+
+Problem:    Invalid memory access when scrolling without a valid screen.
+Solution:   Do not set VALID_BOTLINE in w_valid.
+---
+ src/move.c                  |  1 -
+ src/testdir/test_normal.vim | 23 ++++++++++++++++++++---
+ src/version.c               |  2 ++
+ 3 files changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/src/move.c b/src/move.c
+index 8e53d8bcb..10165ef4d 100644
+--- a/src/move.c
++++ b/src/move.c
+@@ -198,7 +198,6 @@ update_topline(void)
+     {
+ 	curwin->w_topline = curwin->w_cursor.lnum;
+ 	curwin->w_botline = curwin->w_topline;
+-	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
+ 	curwin->w_scbind_pos = 1;
+ 	return;
+     }
+diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
+index d45cf4159..ca87928f5 100644
+--- a/src/testdir/test_normal.vim
++++ b/src/testdir/test_normal.vim
+@@ -33,14 +33,14 @@ func CountSpaces(type, ...)
+   else
+     silent exe "normal! `[v`]y"
+   endif
+-  let g:a=strlen(substitute(@@, '[^ ]', '', 'g'))
++  let g:a = strlen(substitute(@@, '[^ ]', '', 'g'))
+   let &selection = sel_save
+   let @@ = reg_save
+ endfunc
+ 
+ func OpfuncDummy(type, ...)
+   " for testing operatorfunc
+-  let g:opt=&linebreak
++  let g:opt = &linebreak
+ 
+   if a:0  " Invoked from Visual mode, use gv command.
+     silent exe "normal! gvy"
+@@ -51,7 +51,7 @@ func OpfuncDummy(type, ...)
+   endif
+   " Create a new dummy window
+   new
+-  let g:bufnr=bufnr('%')
++  let g:bufnr = bufnr('%')
+ endfunc
+ 
+ fun! Test_normal00_optrans()
+@@ -718,6 +718,23 @@ func Test_normal17_z_scroll_hor2()
+   bw!
+ endfunc
+ 
++
++func Test_scroll_in_ex_mode()
++  " This was using invalid memory because w_botline was invalid.
++  let lines =<< trim END
++      diffsplit
++      norm os0\x030(\x04
++      call writefile(['done'], 'Xdone')
++      qa!
++  END
++  call writefile(lines, 'Xscript')
++  call assert_equal(1, RunVim([], [], '--clean -X -Z -e -s -S Xscript'))
++  call assert_equal(['done'], readfile('Xdone'))
++
++  call delete('Xscript')
++  call delete('Xdone')
++endfunc
++
+ func Test_normal18_z_fold()
+   " basic tests for foldopen/folddelete
+   if !has("folding")
+diff --git a/src/version.c b/src/version.c
+index 092864bbb..a9e8be0e7 100644
+--- a/src/version.c
++++ b/src/version.c
+@@ -742,6 +742,8 @@ static char *(features[]) =
+ 
+ static int included_patches[] =
+ {   /* Add new patch number below this line */
++/**/
++    3564,
+ /**/
+     3489,
+ /**/
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 50e215d20f..943856e07c 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -18,8 +18,12 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://no-path-adjust.patch \
            file://racefix.patch \
            file://b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch \
-          file://CVE-2021-3778.patch \
-"
+           file://CVE-2021-3778.patch \
+           file://0002-patch-8.2.3428-using-freed-memory-when-replacing.patch \
+           file://0003-patch-8.2.3487-illegal-memory-access-if-buffer-name-.patch \
+           file://0004-patch-8.2.3489-ml_get-error-after-search-with-range.patch \
+           file://0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch \
+           "
 
 SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44"
 
-- 
2.33.1

[honister][PATCH 05/17] vim: add patch number to CVE-2021-3778 patch

[Anuj Mittal]

From: Ross Burton <ross@burtonini.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 222be29051a3543ac63a0eb07019e90d44429b16)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../vim/files/CVE-2021-3778.patch             | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-support/vim/files/CVE-2021-3778.patch b/meta/recipes-support/vim/files/CVE-2021-3778.patch
index 769a7a07ac..544af04458 100644
--- a/meta/recipes-support/vim/files/CVE-2021-3778.patch
+++ b/meta/recipes-support/vim/files/CVE-2021-3778.patch
@@ -1,4 +1,4 @@
-From eb41373c8c88b0789e5cf04669d6116f9a199264 Mon Sep 17 00:00:00 2001
+From 6d351cec5b97cb72b226d03bd727e453a235ed8d Mon Sep 17 00:00:00 2001
 From: Minjae Kim <flowergom@gmail.com>
 Date: Sun, 26 Sep 2021 23:48:00 +0000
 Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8
@@ -10,16 +10,18 @@ Solution: Check for NUL when advancing.
 Upstream-Status: Accepted [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f]
 CVE: CVE-2021-3778
 Signed-off-by: Minjae Kim <flowergom@gmail.com>
+
 ---
  src/regexp_nfa.c                 | 3 ++-
  src/testdir/test_regexp_utf8.vim | 7 +++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
+ src/version.c                    | 2 ++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
 
-Index: git/src/regexp_nfa.c
-===================================================================
---- git.orig/src/regexp_nfa.c
-+++ git/src/regexp_nfa.c
-@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int re
+diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
+index fb512f961..ace83a1a3 100644
+--- a/src/regexp_nfa.c
++++ b/src/regexp_nfa.c
+@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text)
  		match = FALSE;
  		break;
  	    }
@@ -29,10 +31,10 @@ Index: git/src/regexp_nfa.c
  	}
  	if (match
  		// check that no composing char follows
-Index: git/src/testdir/test_regexp_utf8.vim
-===================================================================
---- git.orig/src/testdir/test_regexp_utf8.vim
-+++ git/src/testdir/test_regexp_utf8.vim
+diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim
+index 19ff882be..e0665818b 100644
+--- a/src/testdir/test_regexp_utf8.vim
++++ b/src/testdir/test_regexp_utf8.vim
 @@ -215,3 +215,10 @@ func Test_optmatch_toolong()
    set re=0
  endfunc
@@ -44,3 +46,16 @@ Index: git/src/testdir/test_regexp_utf8.vim
 +  bwipe!
 +  call delete('Xinvalid')
 +endfunc
+diff --git a/src/version.c b/src/version.c
+index 8912f6215..85bdfc601 100644
+--- a/src/version.c
++++ b/src/version.c
+@@ -742,6 +742,8 @@ static char *(features[]) =
+ 
+ static int included_patches[] =
+ {   /* Add new patch number below this line */
++/**/
++    3409,
+ /**/
+     3402,
+ /**/
-- 
2.33.1

[honister][PATCH 06/17] linux-yocto/5.14: update to v5.14.16

[Anuj Mittal]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

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

    f63179c1e68c Linux 5.14.16
    e874c870dfd8 KVM: x86: Take srcu lock in post_kvm_run_save()
    9ab39a3d0cec KVM: SEV-ES: fix another issue with string I/O VMGEXITs
    eb0461c572e9 KVM: x86: switch pvclock_gtod_sync_lock to a raw spinlock
    10242cc2ad79 KVM: x86/xen: Fix kvm_xen_has_interrupt() sleeping in kvm_vcpu_block()
    669a7e147ee6 perf script: Check session->header.env.arch before using it
    e914237feb46 riscv: Fix asan-stack clang build
    4606bbb6b19c riscv: Do not re-populate shadow memory with kasan_populate_early_shadow
    7567abe63797 riscv: fix misalgned trap vector base address
    20bd764387ac scsi: ibmvfc: Fix up duplicate response detection
    f6782c0ca808 perf script: Fix PERF_SAMPLE_WEIGHT_STRUCT support
    04ced3822a66 scsi: ufs: ufs-exynos: Correct timeout value setting registers
    d748da838b21 KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu
    4faa35ce98c7 KVM: s390: clear kicked_mask before sleeping again
    ae566351ca18 octeontx2-af: Check whether ipolicers exists
    45d9cd363786 virtio-ring: fix DMA metadata flags
    52a936b037b5 net: hns3: expand buffer len for some debugfs command
    efccb66bc917 net: hns3: add more string spaces for dumping packets number of queue info in debugfs
    e5c6ad377c07 bpf: Move BPF_MAP_TYPE for INODE_STORAGE and TASK_STORAGE outside of CONFIG_NET
    b341612b659d watchdog: sbsa: only use 32-bit accessors
    de709ec74f8b bpf: Use kvmalloc for map values in syscall
    0717c71deae6 sctp: add vtag check in sctp_sf_ootb
    1c255b5f68f4 sctp: add vtag check in sctp_sf_do_8_5_1_E_sa
    dd82b3a345ab sctp: add vtag check in sctp_sf_violation
    44ef3ecbc24a sctp: fix the processing for COOKIE_ECHO chunk
    7975f42f1038 sctp: fix the processing for INIT_ACK chunk
    6277d424ead2 sctp: fix the processing for INIT chunk
    332933f9ae0a sctp: use init_tag from inithdr for ABORT chunk
    44d44bf72591 RDMA/irdma: Do not hold qos mutex twice on QP resume
    6392f26fbe92 RDMA/irdma: Set VLAN in UD work completion correctly
    7762917173cc RDMA/irdma: Process extended CQ entries correctly
    7860484eeb90 phy: phy_ethtool_ksettings_set: Lock the PHY while changing settings
    37a1b9befb73 phy: phy_start_aneg: Add an unlocked version
    1f9c99e0bb5b phy: phy_ethtool_ksettings_set: Move after phy_start_aneg
    2191b1e8eb3d phy: phy_ethtool_ksettings_get: Lock the phy for consistency
    e2b4dd261720 net/tls: Fix flipped sign in async_wait.err assignment
    373f94d73651 net: ethernet: microchip: lan743x: Fix skb allocation failure
    228862acb549 net: hns3: fix data endian problem of some functions of debugfs
    20d88211706b net: hns3: fix pause config problem after autoneg disabled
    7cc73feb57f6 net: nxp: lpc_eth.c: avoid hang when bringing interface down
    d8774769d198 net: ethernet: microchip: lan743x: Fix dma allocation failure by using dma_set_mask_and_coherent
    69d3c7785ec4 net: ethernet: microchip: lan743x: Fix driver crash when lan743x_pm_resume fails
    18bd5e285a78 mlxsw: pci: Recycle received packet upon allocation failure
    960f4a54b909 nios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TEST
    030f05812d81 gpio: xgs-iproc: fix parsing of ngpios property
    c653c522e521 RDMA/sa_query: Use strscpy_pad instead of memcpy to copy a string
    5f6995295f65 RDMA/mlx5: Initialize the ODP xarray when creating an ODP MR
    ed894f5439ab net: Prevent infinite while loop in skb_tx_hash()
    f435287d719b cfg80211: correct bridge/4addr mode check
    da279dac227a net-sysfs: initialize uid and gid before calling net_ns_get_ownership
    a8f7359259dd net: batman-adv: fix error handling
    50cc1462a668 regmap: Fix possible double-free in regcache_rbtree_exit()
    c9e39214fddf reset: brcmstb-rescal: fix incorrect polarity of status bit
    86f9394073d8 arm64: dts: allwinner: h5: NanoPI Neo 2: Fix ethernet node
    63a97a9f95f2 ice: check whether PTP is initialized in ice_ptp_release()
    ebd0edad1cdf RDMA/mlx5: Set user priority for DCT
    e83b3cce4722 ice: Respond to a NETDEV_UNREGISTER event for LAG
    f1e3cd1cc802 octeontx2-af: Fix possible null pointer dereference.
    98db2a8c14be octeontx2-af: Display all enabled PF VF rsrc_alloc entries.
    c7752ec9ad39 nvme-tcp: fix possible req->offset corruption
    7258a6eef5be nvme-tcp: fix data digest pointer calculation
    daa12f0c1d1b nvmet-tcp: fix data digest pointer calculation
    5d33bd6b4d4d IB/hfi1: Fix abba locking issue with sc_disable()
    0d4395477741 IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields
    6525bfbd546f bpf: Fix error usage of map_fd and fdget() in generic_map_update_batch()
    adb17f828177 bpf: Fix potential race in tail call compatibility check
    6f226ffe4458 tcp_bpf: Fix one concurrency problem in the tcp_bpf_send_verdict function
    e1b80a5ebe54 riscv, bpf: Fix potential NULL dereference
    b529f88d9388 cgroup: Fix memory leak caused by missing cgroup_bpf_offline
    b7ca59297fa3 Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout"
    0a8b7eba95a0 drm/amd/display: Fix deadlock when falling back to v2 from v3
    a363d80566cc drm/amd/display: Fallback to clocks which meet requested voltage on DCN31
    aeadb0662478 drm/amd/display: Moved dccg init to after bios golden init
    5a5f1f070c3e drm/amd/display: Increase watermark latencies for DCN3.1
    85cf47160d0e drm/amd/display: increase Z9 latency to workaround underflow in Z9
    01f39421d590 drm/amd/display: Fix prefetch bandwidth calculation for DCN3.1
    b60efcaf5e8b drm/amd/display: Limit display scaling to up to true 4k for DCN 3.1
    c3ae5cf3e3ee drm/amdgpu: support B0&B1 external revision id for yellow carp
    d3ed72495a59 drm/amdgpu: fix out of bounds write
    9eb4bdd554fc drm/amdgpu: Fix even more out of bound writes from debugfs
    d87ac6054e3d drm/i915/dp: Skip the HW readout of DPCD on disabled encoders
    7650327e7174 drm/i915: Catch yet another unconditioal clflush
    0ed2dfb5f598 drm/i915: Convert unconditional clflush to drm_clflush_virt_range()
    132a3d998d67 drm/ttm: fix memleak in ttm_transfered_destroy
    15a4f2bdbdfd mac80211: mesh: fix HE operation element length check
    ce277959d77c arm64: dts: imx8mm-kontron: Make sure SOC and DRAM supply voltages are correct
    8c684aaceaf3 arm64: dts: imx8mm-kontron: Set lower limit of VDD_SNVS to 800 mV
    f5eaf91dd8af arm64: dts: imx8mm-kontron: Fix connection type for VSC8531 RGMII PHY
    da32086a0203 arm64: dts: imx8mm-kontron: Fix CAN SPI clock frequency
    d2bdcd23cba9 arm64: dts: imx8mm-kontron: Fix polarity of reg_rst_eth2
    5fcb6fce74ff mm: khugepaged: skip huge page collapse for special files
    5e669d8ab30a mm, thp: bail out early in collapse_file for writeback page
    6ac017254b59 mm: filemap: check if THP has hwpoisoned subpage for PMD page fault
    8821fedc7f83 mm: hwpoison: remove the unnecessary THP check
    67979d186c51 drm/amd/display: Require immediate flip support for DCN3.1 planes
    75b1b172ae5a net: lan78xx: fix division by zero in send path
    3c897f39b71f cfg80211: fix management registrations locking
    2a000d137589 cfg80211: scan: fix RCU in cfg80211_add_nontrans_list()
    e6d02b0da2df ftrace/nds32: Update the proto for ftrace_trace_function to match ftrace_stub
    ea081b13b00e nvme-tcp: fix H2CData PDU send accounting (again)
    2e382600e885 ocfs2: fix race between searching chunks and release journal_head from buffer_head
    7335acd51f6b block: Fix partition check for host-aware zoned block devices
    10bcaafc5753 mmc: sdhci-esdhc-imx: clear the buffer_read_ready to reset standard tuning circuit
    78873d5a2717 mmc: sdhci-pci: Read card detect from ACPI for Intel Merrifield
    b572d6c18511 mmc: sdhci: Map more voltage level to SDHCI_POWER_330
    ac6f66f208a1 mmc: dw_mmc: exynos: fix the finding clock sample value
    b1ad3ecffaac mmc: tmio: reenable card irqs after the reset callback
    e1b94f0e744f mmc: mediatek: Move cqhci init behind ungate clock
    9106d68c8082 mmc: cqhci: clear HALT state after CQE enable
    aa2f3e425e22 mmc: vub300: fix control-message timeouts
    e41473543f75 net/tls: Fix flipped sign in tls_err_abort() calls
    8ba94a7f7b9f Revert "net: mdiobus: Fix memory leak in __mdiobus_register"
    836f40777d58 nfc: port100: fix using -ERRNO as command type mask
    e029c9828c5b tipc: fix size validations for the MSG_CRYPTO type
    43849df432c9 ata: sata_mv: Fix the error handling of mv_chip_id()
    66a1c8748068 pinctrl: amd: disable and mask interrupts on probe
    18f31a907c9f Revert "pinctrl: bcm: ns: support updated DT binding as syscon subnode"
    b5c410a4af7d usbnet: fix error return code in usbnet_probe()
    7e8b6a4f18ed usbnet: sanity check for maxpacket
    a350df591870 ARM: 9148/1: handle CONFIG_CPU_ENDIAN_BE32 in arch/arm/kernel/head.S
    351d0f587b4c ARM: 9141/1: only warn about XIP address when not compile testing
    a51d78193d21 ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype
    4108f38c05bd ARM: 9138/1: fix link warning with XIP + frame-pointer
    6aa2d9cf81f9 ARM: 9134/1: remove duplicate memcpy() definition
    78a7a2694e69 ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned
    e108afbd38a5 ARM: 9132/1: Fix __get_user_check failure with ARM KASAN images

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ae32a59571abec59cc9f19bf9289ec9472b3923b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../linux/linux-yocto-rt_5.14.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.14.bb            |  8 +++---
 meta/recipes-kernel/linux/linux-yocto_5.14.bb | 26 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
index 05f5df71b9..be4c678f65 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "dcf40cf2b562e9b6ec814a9ca1912aab881de0e0"
-SRCREV_meta ?= "edb4dc09c55f317085688e3a5f6438ced46bc77d"
+SRCREV_machine ?= "d1275779725dc0ebe673b10c4617e0c3bb6262d2"
+SRCREV_meta ?= "a3884078f4675c3061094525a04729eba6b11c4a"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.14.15"
+LINUX_VERSION ?= "5.14.16"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
index f752b61d2b..134c4813fc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.14.15"
+LINUX_VERSION ?= "5.14.16"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "70f10165ff7c856cbf0512231ef9b6533efe1d1d"
-SRCREV_machine ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_meta ?= "edb4dc09c55f317085688e3a5f6438ced46bc77d"
+SRCREV_machine:qemuarm ?= "5fa2600d6ad51505a546646e7d4ab85eac23cc54"
+SRCREV_machine ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_meta ?= "a3884078f4675c3061094525a04729eba6b11c4a"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.14.bb b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
index f719966a7b..56a61897ba 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
@@ -13,17 +13,17 @@ KBRANCH:qemux86  ?= "v5.14/standard/base"
 KBRANCH:qemux86-64 ?= "v5.14/standard/base"
 KBRANCH:qemumips64 ?= "v5.14/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "8b3f9104862f9486f4a6fb526e4d9cc9dc2217cb"
-SRCREV_machine:qemuarm64 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_machine:qemumips ?= "fab0cfca42f3509a5570b437f2a2df216927c055"
-SRCREV_machine:qemuppc ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_machine:qemuriscv64 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_machine:qemuriscv32 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_machine:qemux86 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_machine:qemux86-64 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_machine:qemumips64 ?= "baf66f78949c175483eea2a5d0e7221a997d8e44"
-SRCREV_machine ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
-SRCREV_meta ?= "edb4dc09c55f317085688e3a5f6438ced46bc77d"
+SRCREV_machine:qemuarm ?= "272e3443b607073023075ee7901933d874a86e6d"
+SRCREV_machine:qemuarm64 ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_machine:qemumips ?= "4e6b51635881e6027ea2b61885537e5d427f11f4"
+SRCREV_machine:qemuppc ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_machine:qemuriscv64 ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_machine:qemuriscv32 ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_machine:qemux86 ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_machine:qemux86-64 ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_machine:qemumips64 ?= "be5e677a1904b7f6555a1d619cd379f5031dbe24"
+SRCREV_machine ?= "9e759d64ede1347c5611633962d239661b2198e7"
+SRCREV_meta ?= "a3884078f4675c3061094525a04729eba6b11c4a"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
@@ -31,7 +31,7 @@ SRCREV_meta ?= "edb4dc09c55f317085688e3a5f6438ced46bc77d"
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
 DEFAULT_PREFERENCE:class-devupstream = "-1"
-SRCREV_machine:class-devupstream ?= "b46092c7497e5aaede15b10f162e32d6473f1862"
+SRCREV_machine:class-devupstream ?= "f63179c1e68ce99d511b683ad05d3829d0e4d9e9"
 PN:class-devupstream = "linux-yocto-upstream"
 KBRANCH:class-devupstream = "v5.14/base"
 
@@ -42,7 +42,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.14.15"
+LINUX_VERSION ?= "5.14.16"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
-- 
2.33.1

[honister][PATCH 07/17] linux-yocto/5.10: update to v5.10.77

[Anuj Mittal]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

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

    09df347cfd18 Linux 5.10.77
    fbb91dadb512 perf script: Check session->header.env.arch before using it
    6f416815c505 riscv: Fix asan-stack clang build
    7a4cf25d8329 riscv: fix misalgned trap vector base address
    acb8832f6a1c scsi: ufs: ufs-exynos: Correct timeout value setting registers
    8ecddaca7942 KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu
    e11a7355fb98 KVM: s390: clear kicked_mask before sleeping again
    727e5deca802 lan743x: fix endianness when accessing descriptors
    a7112b8eeb14 sctp: add vtag check in sctp_sf_ootb
    c2442f721972 sctp: add vtag check in sctp_sf_do_8_5_1_E_sa
    14c1e02b11c2 sctp: add vtag check in sctp_sf_violation
    dad2486414b5 sctp: fix the processing for COOKIE_ECHO chunk
    8c50693d25e4 sctp: fix the processing for INIT_ACK chunk
    ad111d4435d8 sctp: use init_tag from inithdr for ABORT chunk
    4509000a2515 phy: phy_ethtool_ksettings_set: Lock the PHY while changing settings
    5b88bb9377ee phy: phy_start_aneg: Add an unlocked version
    81780b624d1c phy: phy_ethtool_ksettings_set: Move after phy_start_aneg
    258c5fea44cf phy: phy_ethtool_ksettings_get: Lock the phy for consistency
    58722323d4bc net/tls: Fix flipped sign in async_wait.err assignment
    44e8c93e1e49 net: nxp: lpc_eth.c: avoid hang when bringing interface down
    c2af2092c9bb net: ethernet: microchip: lan743x: Fix dma allocation failure by using dma_set_mask_and_coherent
    bfa6fbdb4e39 net: ethernet: microchip: lan743x: Fix driver crash when lan743x_pm_resume fails
    e81bed557fe7 mlxsw: pci: Recycle received packet upon allocation failure
    be98be1a17e9 nios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TEST
    aead02927af3 gpio: xgs-iproc: fix parsing of ngpios property
    863a423ee07b RDMA/sa_query: Use strscpy_pad instead of memcpy to copy a string
    2b7c5eed19d3 net: Prevent infinite while loop in skb_tx_hash()
    04121b10cdf0 cfg80211: correct bridge/4addr mode check
    aed897e96b19 net-sysfs: initialize uid and gid before calling net_ns_get_ownership
    b0a2cd38553c net: batman-adv: fix error handling
    36e911a16b37 regmap: Fix possible double-free in regcache_rbtree_exit()
    e51371bd687e reset: brcmstb-rescal: fix incorrect polarity of status bit
    2cf7d935d6ba arm64: dts: allwinner: h5: NanoPI Neo 2: Fix ethernet node
    10e40fb2f508 RDMA/mlx5: Set user priority for DCT
    24fd8e2f027d octeontx2-af: Display all enabled PF VF rsrc_alloc entries.
    c63d7f2ca99a nvme-tcp: fix possible req->offset corruption
    32f3db20f126 nvme-tcp: fix data digest pointer calculation
    4286c72c5321 nvmet-tcp: fix data digest pointer calculation
    d98883f6c33e IB/hfi1: Fix abba locking issue with sc_disable()
    c3e17e58f571 IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields
    ee4908f909b3 bpf: Fix error usage of map_fd and fdget() in generic_map_update_batch()
    dd2260ec643d bpf: Fix potential race in tail call compatibility check
    15dec6d8f864 tcp_bpf: Fix one concurrency problem in the tcp_bpf_send_verdict function
    cac6b043cea3 riscv, bpf: Fix potential NULL dereference
    01599bf7cc2b cgroup: Fix memory leak caused by missing cgroup_bpf_offline
    eb3b6805e3e9 drm/amdgpu: fix out of bounds write
    c21b4002214c drm/ttm: fix memleak in ttm_transfered_destroy
    69a7fa5cb0de mm, thp: bail out early in collapse_file for writeback page
    8fb858b74ac5 net: lan78xx: fix division by zero in send path
    4c22227e39c7 cfg80211: fix management registrations locking
    fa29cec42c2d cfg80211: scan: fix RCU in cfg80211_add_nontrans_list()
    db1191a529e4 nvme-tcp: fix H2CData PDU send accounting (again)
    5043fbd294f5 ocfs2: fix race between searching chunks and release journal_head from buffer_head
    01169a43353d mmc: sdhci-esdhc-imx: clear the buffer_read_ready to reset standard tuning circuit
    ee3213b117ce mmc: sdhci: Map more voltage level to SDHCI_POWER_330
    a95a76fc01a0 mmc: dw_mmc: exynos: fix the finding clock sample value
    12a46f72f499 mmc: mediatek: Move cqhci init behind ungate clock
    44c2bc2a6bbe mmc: cqhci: clear HALT state after CQE enable
    efe934629fff mmc: vub300: fix control-message timeouts
    f3dec7e7ace3 net/tls: Fix flipped sign in tls_err_abort() calls
    c828115a14ea Revert "net: mdiobus: Fix memory leak in __mdiobus_register"
    11c0406b4c33 nfc: port100: fix using -ERRNO as command type mask
    0b1b3e086b0a tipc: fix size validations for the MSG_CRYPTO type
    5aa5bab57957 ata: sata_mv: Fix the error handling of mv_chip_id()
    9a52798dce73 pinctrl: amd: disable and mask interrupts on probe
    01c2881bb0e0 Revert "pinctrl: bcm: ns: support updated DT binding as syscon subnode"
    017718dfbb6f usbnet: fix error return code in usbnet_probe()
    693ecbe8f799 usbnet: sanity check for maxpacket
    b663890d8544 ext4: fix possible UAF when remounting r/o a mmp-protected file system
    d4d9c065988c arm64: Avoid premature usercopy failure
    e184a21b5ccc powerpc/bpf: Fix BPF_MOD when imm == 1
    3f2c12ec8a3f io_uring: don't take uring_lock during iowq cancel
    5a768b4d3e1a ARM: 9141/1: only warn about XIP address when not compile testing
    15b278f94bbb ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype
    c06d7d9bfcf6 ARM: 9138/1: fix link warning with XIP + frame-pointer
    8a6af97c31be ARM: 9134/1: remove duplicate memcpy() definition
    6ad8bbc9d301 ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned
    3ceaa85c331d ARM: 9132/1: Fix __get_user_check failure with ARM KASAN images

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d57bc7281015d09e2ff7a8a028dbf31559ff7331)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../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 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index c210667350..cc9aaf8b27 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "f01089784fd6234111851aad756297e0f258276c"
-SRCREV_meta ?= "e1979ceb171bc91ef2cb71cfcde548a101dab687"
+SRCREV_machine ?= "3a416eeb4d0bdbba2a133744a465f2c9a46e3a96"
+SRCREV_meta ?= "257ed971bc7fd76ccb27f622df1ef6412f6b340d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.10.76"
+LINUX_VERSION ?= "5.10.77"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index e898bc1325..7a61793569 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.10.76"
+LINUX_VERSION ?= "5.10.77"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "4575e0b8282d99c79dac96a77c03685d66fb0a08"
-SRCREV_machine ?= "da50565d028a2d87eabc7a53ee73a53f82f10f39"
-SRCREV_meta ?= "e1979ceb171bc91ef2cb71cfcde548a101dab687"
+SRCREV_machine:qemuarm ?= "c5c9d2c5c8ce7a84f6aebf02b3ae824a4c5f9d56"
+SRCREV_machine ?= "c3e3199c6359736c373aaecc8f447eaec7cf9432"
+SRCREV_meta ?= "257ed971bc7fd76ccb27f622df1ef6412f6b340d"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index b4f9faf0f3..98c1ade1df 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH:qemux86  ?= "v5.10/standard/base"
 KBRANCH:qemux86-64 ?= "v5.10/standard/base"
 KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "da5f8508e569eb5d64a2efe5a5c4aa138c8f2738"
-SRCREV_machine:qemuarm64 ?= "a473fe3ad480df6565134d42a95826e71ae77a1a"
-SRCREV_machine:qemumips ?= "317762b8a9da49cd12eb51e879b6eba2b7c3a4a4"
-SRCREV_machine:qemuppc ?= "8a3eb888460464e612b79ab983c99cf868f82780"
-SRCREV_machine:qemuriscv64 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
-SRCREV_machine:qemuriscv32 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
-SRCREV_machine:qemux86 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
-SRCREV_machine:qemux86-64 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
-SRCREV_machine:qemumips64 ?= "efe59773d3289e7b34d99684547968849a2e6aa9"
-SRCREV_machine ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
-SRCREV_meta ?= "e1979ceb171bc91ef2cb71cfcde548a101dab687"
+SRCREV_machine:qemuarm ?= "51e48df3dbbc2b03579e95b296bf7b2625cf456b"
+SRCREV_machine:qemuarm64 ?= "c437750233de239844757e4c79bfd9e9c56e1b0d"
+SRCREV_machine:qemumips ?= "f2acb9e5f819ce240b530851f9e8ed45a8f7d878"
+SRCREV_machine:qemuppc ?= "b36a906729ef754c48d730f15a7f079eb4942356"
+SRCREV_machine:qemuriscv64 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
+SRCREV_machine:qemuriscv32 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
+SRCREV_machine:qemux86 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
+SRCREV_machine:qemux86-64 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
+SRCREV_machine:qemumips64 ?= "1b436658828965d7f96ff5e532ff0bb6b1099cff"
+SRCREV_machine ?= "789500dfe326ab238562529175d99d33a3db1d0c"
+SRCREV_meta ?= "257ed971bc7fd76ccb27f622df1ef6412f6b340d"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE:qemuarm ?= "qemuarma15"
@@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.76"
+LINUX_VERSION ?= "5.10.77"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
-- 
2.33.1

[honister][PATCH 08/17] linux-yocto/5.14: update to v5.14.17

[Anuj Mittal]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

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

    3dfa869cb79d Linux 5.14.17
    b1dbd891bfe5 ALSA: usb-audio: Add Audient iD14 to mixer map quirk table
    570b5004f827 ALSA: usb-audio: Add Schiit Hel device to mixer map quirk table
    db6d7c4acca3 Revert "drm/i915/gt: Propagate change in error status to children on unhold"
    aac2f6861683 drm/amd/display: Revert "Directly retrain link from debugfs"
    77d029e1e218 drm/amdgpu: revert "Add autodump debugfs node for gpu reset v8"
    9f9e09a59c58 Revert "wcn36xx: Disable bmps when encryption is disabled"
    b9722a7369f8 ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
    e556fca311ce Revert "soc: imx: gpcv2: move reset assert after requesting domain power up"
    d6a60e6ada49 drm/i915: Remove memory frequency calculation
    7883e13c2494 drm/amdkfd: fix boot failure when iommu is disabled in Picasso.
    a82fa1213d12 Revert "usb: core: hcd: Add support for deferring roothub registration"
    0979b923ff3f Revert "xhci: Set HCD flag to defer primary roothub registration"
    02a476ca886d media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt()
    ec0c91e2ebb8 vrf: Revert "Reset skb conntrack connection..."
    6467b75cf9d1 sfc: Fix reading non-legacy supported link modes
    f30822c0b4c3 scsi: core: Put LLD module refcnt after SCSI device is released

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a9ac5a388d682bcf0aad59d1b8ae8334846dfcd9)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../linux/linux-yocto-rt_5.14.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.14.bb            |  8 +++---
 meta/recipes-kernel/linux/linux-yocto_5.14.bb | 26 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
index be4c678f65..7e02f83d51 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "d1275779725dc0ebe673b10c4617e0c3bb6262d2"
-SRCREV_meta ?= "a3884078f4675c3061094525a04729eba6b11c4a"
+SRCREV_machine ?= "672665c11dd86abd71bbad0537e6388c6a5a84ca"
+SRCREV_meta ?= "b3ac9c40a22d6b00545b7ce51ef6dfb0cb9d2933"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.14.16"
+LINUX_VERSION ?= "5.14.17"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
index 134c4813fc..9ad9549554 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.14.16"
+LINUX_VERSION ?= "5.14.17"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "5fa2600d6ad51505a546646e7d4ab85eac23cc54"
-SRCREV_machine ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_meta ?= "a3884078f4675c3061094525a04729eba6b11c4a"
+SRCREV_machine:qemuarm ?= "566227d5b0913910467a7736d78cad37e60217f8"
+SRCREV_machine ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_meta ?= "b3ac9c40a22d6b00545b7ce51ef6dfb0cb9d2933"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.14.bb b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
index 56a61897ba..f034f36d45 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
@@ -13,17 +13,17 @@ KBRANCH:qemux86  ?= "v5.14/standard/base"
 KBRANCH:qemux86-64 ?= "v5.14/standard/base"
 KBRANCH:qemumips64 ?= "v5.14/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "272e3443b607073023075ee7901933d874a86e6d"
-SRCREV_machine:qemuarm64 ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_machine:qemumips ?= "4e6b51635881e6027ea2b61885537e5d427f11f4"
-SRCREV_machine:qemuppc ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_machine:qemuriscv64 ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_machine:qemuriscv32 ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_machine:qemux86 ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_machine:qemux86-64 ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_machine:qemumips64 ?= "be5e677a1904b7f6555a1d619cd379f5031dbe24"
-SRCREV_machine ?= "9e759d64ede1347c5611633962d239661b2198e7"
-SRCREV_meta ?= "a3884078f4675c3061094525a04729eba6b11c4a"
+SRCREV_machine:qemuarm ?= "eef94a78151c2227eba9a8468ac611d9507482b5"
+SRCREV_machine:qemuarm64 ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_machine:qemumips ?= "607d94618b35382f38ab2bc0d37494372897ae4d"
+SRCREV_machine:qemuppc ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_machine:qemuriscv64 ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_machine:qemuriscv32 ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_machine:qemux86 ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_machine:qemux86-64 ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_machine:qemumips64 ?= "9ed182ebbcd4c77b8f99439d2feb6c4591148324"
+SRCREV_machine ?= "35888b3a9a222963b856c960e8f0c72c2de18d4a"
+SRCREV_meta ?= "b3ac9c40a22d6b00545b7ce51ef6dfb0cb9d2933"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
@@ -31,7 +31,7 @@ SRCREV_meta ?= "a3884078f4675c3061094525a04729eba6b11c4a"
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
 DEFAULT_PREFERENCE:class-devupstream = "-1"
-SRCREV_machine:class-devupstream ?= "f63179c1e68ce99d511b683ad05d3829d0e4d9e9"
+SRCREV_machine:class-devupstream ?= "3dfa869cb79d60a2fe66efb4a11517ec7c89de16"
 PN:class-devupstream = "linux-yocto-upstream"
 KBRANCH:class-devupstream = "v5.14/base"
 
@@ -42,7 +42,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.14.16"
+LINUX_VERSION ?= "5.14.17"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
-- 
2.33.1

[honister][PATCH 09/17] linux-yocto/5.10: update to v5.10.78

[Anuj Mittal]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

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

    5040520482a5 Linux 5.10.78
    4c7c0243275b ALSA: usb-audio: Add Audient iD14 to mixer map quirk table
    f3eb44f496ef ALSA: usb-audio: Add Schiit Hel device to mixer map quirk table
    68765fc97762 Revert "wcn36xx: Disable bmps when encryption is disabled"
    f84b791d4c3b ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
    bbc920fb320f Revert "drm/ttm: fix memleak in ttm_transfered_destroy"
    6d67b2a73b8e mm: khugepaged: skip huge page collapse for special files
    5a7957491e31 Revert "usb: core: hcd: Add support for deferring roothub registration"
    50f46bd30949 Revert "xhci: Set HCD flag to defer primary roothub registration"
    d7fc85f61042 media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt()
    b93a70bf2b57 net: ethernet: microchip: lan743x: Fix skb allocation failure
    b9c85a71e1b4 vrf: Revert "Reset skb conntrack connection..."
    0382fdf9ae78 sfc: Fix reading non-legacy supported link modes
    748786564a35 Revert "io_uring: reinforce cancel on flush during exit"
    7b57c38d12ae scsi: core: Put LLD module refcnt after SCSI device is released

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7a7d1eed8e3d550ac9bfa301b26095100eeba111)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../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 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index cc9aaf8b27..f666ac0611 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "3a416eeb4d0bdbba2a133744a465f2c9a46e3a96"
-SRCREV_meta ?= "257ed971bc7fd76ccb27f622df1ef6412f6b340d"
+SRCREV_machine ?= "12f6a7187b3c8abab5e139dbfdf7f58f265f4169"
+SRCREV_meta ?= "a0238f7f4f2222d08bb18147bb5e24cc877b0546"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.10.77"
+LINUX_VERSION ?= "5.10.78"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 7a61793569..86010f106f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.10.77"
+LINUX_VERSION ?= "5.10.78"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "c5c9d2c5c8ce7a84f6aebf02b3ae824a4c5f9d56"
-SRCREV_machine ?= "c3e3199c6359736c373aaecc8f447eaec7cf9432"
-SRCREV_meta ?= "257ed971bc7fd76ccb27f622df1ef6412f6b340d"
+SRCREV_machine:qemuarm ?= "cdec5045c5323846adaf2510e539843d0cfe74ae"
+SRCREV_machine ?= "344c0c38f5b892312b0a1db7f613d2704dd4942f"
+SRCREV_meta ?= "a0238f7f4f2222d08bb18147bb5e24cc877b0546"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 98c1ade1df..2e81068330 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH:qemux86  ?= "v5.10/standard/base"
 KBRANCH:qemux86-64 ?= "v5.10/standard/base"
 KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "51e48df3dbbc2b03579e95b296bf7b2625cf456b"
-SRCREV_machine:qemuarm64 ?= "c437750233de239844757e4c79bfd9e9c56e1b0d"
-SRCREV_machine:qemumips ?= "f2acb9e5f819ce240b530851f9e8ed45a8f7d878"
-SRCREV_machine:qemuppc ?= "b36a906729ef754c48d730f15a7f079eb4942356"
-SRCREV_machine:qemuriscv64 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
-SRCREV_machine:qemuriscv32 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
-SRCREV_machine:qemux86 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
-SRCREV_machine:qemux86-64 ?= "789500dfe326ab238562529175d99d33a3db1d0c"
-SRCREV_machine:qemumips64 ?= "1b436658828965d7f96ff5e532ff0bb6b1099cff"
-SRCREV_machine ?= "789500dfe326ab238562529175d99d33a3db1d0c"
-SRCREV_meta ?= "257ed971bc7fd76ccb27f622df1ef6412f6b340d"
+SRCREV_machine:qemuarm ?= "f98b917d7826304daeecf11cc52be2562a9304ff"
+SRCREV_machine:qemuarm64 ?= "13ff8a3ae368724e008e3bcd77833611de7962b2"
+SRCREV_machine:qemumips ?= "7b94dec2b0f5b582b97cdb3ac97fe153559869e4"
+SRCREV_machine:qemuppc ?= "652531fb0cc8eb3607109bb8d878253be2d3d534"
+SRCREV_machine:qemuriscv64 ?= "2daa192783edd4974da8e900c0dc93186e57a838"
+SRCREV_machine:qemuriscv32 ?= "2daa192783edd4974da8e900c0dc93186e57a838"
+SRCREV_machine:qemux86 ?= "2daa192783edd4974da8e900c0dc93186e57a838"
+SRCREV_machine:qemux86-64 ?= "2daa192783edd4974da8e900c0dc93186e57a838"
+SRCREV_machine:qemumips64 ?= "4c817df0fd06350e18693551699c33361e16a193"
+SRCREV_machine ?= "2daa192783edd4974da8e900c0dc93186e57a838"
+SRCREV_meta ?= "a0238f7f4f2222d08bb18147bb5e24cc877b0546"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE:qemuarm ?= "qemuarma15"
@@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.77"
+LINUX_VERSION ?= "5.10.78"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
-- 
2.33.1

[honister][PATCH 10/17] convert-srcuri.py: use regex to check space in SRC_URI

[Anuj Mittal]

From: Kai Kang <kai.kang@windriver.com>

There may be none, one or more spaces including tab before backslash in
SRC_URI. Use regex to check and update. It helps to avoid malformed uri
such as recipe open-iscsi-user in meta-openstack:

SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https  ;branch=master \

And help to check more recipes such as concurrent-ruby in the same
layer:

SRC_URI = "git://github.com/ruby-concurrency/concurrent-ruby.git;protocol=https;tag=v1.1.6\

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a69a53573b1987ee5834a6fc27763f9bbf5fe5a4)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 scripts/contrib/convert-srcuri.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/contrib/convert-srcuri.py b/scripts/contrib/convert-srcuri.py
index 5b362ea2e8..587392334f 100755
--- a/scripts/contrib/convert-srcuri.py
+++ b/scripts/contrib/convert-srcuri.py
@@ -35,16 +35,16 @@ def processfile(fn):
                     if ("git://" in line or "gitsm://" in line) and "branch=" not in line and matchline(line):
                         if line.endswith('"\n'):
                             line = line.replace('"\n', ';branch=master"\n')
-                        elif line.endswith(" \\\n"):
-                            line = line.replace(' \\\n', ';branch=master \\\n')
+                        elif re.search('\s*\\\\$', line):
+                            line = re.sub('\s*\\\\$', ';branch=master \\\\', line)
                         modified = True
                     if ("git://" in line or "gitsm://" in line) and "github.com" in line and "protocol=https" not in line and matchline(line):
                         if "protocol=git" in line:
                             line = line.replace('protocol=git', 'protocol=https')
                         elif line.endswith('"\n'):
                             line = line.replace('"\n', ';protocol=https"\n')
-                        elif line.endswith(" \\\n"):
-                            line = line.replace(' \\\n', ';protocol=https \\\n')
+                        elif re.search('\s*\\\\$', line):
+                            line = re.sub('\s*\\\\$', ';protocol=https \\\\', line)
                         modified = True
                     new_file.write(line)
         if modified:
-- 
2.33.1

[honister][PATCH 11/17] scripts/oe-package-browser: Fix after overrides change

[Anuj Mittal]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

After the overrides change, the format of pkgdata changed and this
usage of configparser no longer works. This change is a bandaid to make
things work but the pkgdata format isn't very similar to ini files
so this may need to be reimplmented in a better way in the long run.

[YOCTO #14619]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 25a8ec6e2891b71bc280aacaf5f62ecc4b0bd1d1)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 scripts/oe-pkgdata-browser | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/oe-pkgdata-browser b/scripts/oe-pkgdata-browser
index 8d223185a4..e07005b807 100755
--- a/scripts/oe-pkgdata-browser
+++ b/scripts/oe-pkgdata-browser
@@ -49,11 +49,11 @@ def load(filename, suffix=None):
     from configparser import ConfigParser
     from itertools import chain
 
-    parser = ConfigParser()
+    parser = ConfigParser(delimiters=('='))
     if suffix:
-        parser.optionxform = lambda option: option.replace("_" + suffix, "")
+        parser.optionxform = lambda option: option.replace(":" + suffix, "")
     with open(filename) as lines:
-        lines = chain(("[fake]",), lines)
+        lines = chain(("[fake]",), (line.replace(": ", " = ", 1) for line in lines))
         parser.read_file(lines)
 
     # TODO extract the data and put it into a real dict so we can transform some
-- 
2.33.1

[honister][PATCH 12/17] scripts/oe-package-browser: Handle no packages being built

[Anuj Mittal]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Give the user a proper error message if there aren't packages built,
rather than a less friendly traceback.

[YOCTO #14619]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b14c176b7dd74b7d63ca0f72e6e00fbf209f5a0b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 scripts/oe-pkgdata-browser | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/oe-pkgdata-browser b/scripts/oe-pkgdata-browser
index e07005b807..a3a381923b 100755
--- a/scripts/oe-pkgdata-browser
+++ b/scripts/oe-pkgdata-browser
@@ -236,6 +236,8 @@ class PkgUi():
         update_deps("RPROVIDES", "Provides: ", self.provides_label, clickable=False)
 
     def load_recipes(self):
+        if not os.path.exists(pkgdata):
+            sys.exit("Error: Please ensure %s exists by generating packages before using this tool." % pkgdata)
         for recipe in sorted(os.listdir(pkgdata)):
             if os.path.isfile(os.path.join(pkgdata, recipe)):
                 self.recipe_iters[recipe] = self.recipe_store.append([recipe])
-- 
2.33.1

[honister][PATCH 13/17] wpa-supplicant: Match package override to PACKAGES for pkg_postinst

[Anuj Mittal]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

In PACKAGES, ${PN} is used so it makes sense for the pkg_postinst variable
override to match that else it causes user confusion.

[YOCTO #14616]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ae9094d45bbfff377bd542939e12a8451a4959b6)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
index 33b1495bb2..25cd8ef82c 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
@@ -108,7 +108,7 @@ do_install () {
 	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }
 
-pkg_postinst:wpa-supplicant () {
+pkg_postinst:${PN} () {
 	# If we're offline, we don't need to do this.
 	if [ "x$D" = "x" ]; then
 		killall -q -HUP dbus-daemon || true
-- 
2.33.1

[honister][PATCH 14/17] scripts/lib/wic/help.py: Update Fedora Kickstart URLs

[Anuj Mittal]

From: Jon Mason <jdmason@kudzu.us>

The URLs describing Kickstart are no longer valid and do not redirect to
the correct location.  Update them with the correct location.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e5ac75f93c8128b0761af5fee99e8603ddd1657d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 scripts/lib/wic/help.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
index 991907d3f5..4ff7470a6a 100644
--- a/scripts/lib/wic/help.py
+++ b/scripts/lib/wic/help.py
@@ -840,8 +840,8 @@ DESCRIPTION
     meanings. The commands are based on the Fedora kickstart
     documentation but with modifications to reflect wic capabilities.
 
-      http://fedoraproject.org/wiki/Anaconda/Kickstart#part_or_partition
-      http://fedoraproject.org/wiki/Anaconda/Kickstart#bootloader
+      https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#part-or-partition
+      https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#bootloader
 
   Commands
 
-- 
2.33.1

[honister][PATCH 15/17] uninative: Add version to uninative tarball name

[Anuj Mittal]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

uninative works via hashes and doesn't need the version in the tarball name but
it does make things easier to inspect in DL_DIR. There were reasons such as
ease of publication of the build tarballs but we can handle those differently
now and the signature issues from the early code aren't an issue now. From 3.4
onwards we can use a version'd name.

[YOCTO #12970]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit dadba70d6a24d8ebb5576598efffa973151c7218)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/classes/uninative.bbclass               | 2 +-
 meta/conf/distro/include/yocto-uninative.inc | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 3c7ccd66f4..4412d7c567 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -2,7 +2,7 @@ UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/
 UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}"
 
 UNINATIVE_URL ?= "unset"
-UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.xz"
+UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc-${UNINATIVE_VERSION}.tar.xz"
 # Example checksums
 #UNINATIVE_CHECKSUM[aarch64] = "dead"
 #UNINATIVE_CHECKSUM[i686] = "dead"
diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc
index 3165fc93b8..6833072cd3 100644
--- a/meta/conf/distro/include/yocto-uninative.inc
+++ b/meta/conf/distro/include/yocto-uninative.inc
@@ -7,8 +7,9 @@
 #
 
 UNINATIVE_MAXGLIBCVERSION = "2.34"
+UNINATIVE_VERSION = "3.4"
 
-UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/3.4/"
+UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/"
 UNINATIVE_CHECKSUM[aarch64] ?= "3013cdda8f0dc6639ce1c80f33eabce66f06b890bd5b58739a6d7a92a0bb7100"
 UNINATIVE_CHECKSUM[i686] ?= "abed500de584aad63ec237546db20cdd0c69d8870a6f8e94ac31721ace64b376"
 UNINATIVE_CHECKSUM[x86_64] ?= "126f4f7f6f21084ee140dac3eb4c536b963837826b7c38599db0b512c3377ba2"
-- 
2.33.1

[honister][PATCH 16/17] mirrors: Add kernel.org sources mirror for downloads.yoctoproject.org

[Anuj Mittal]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

kernel.org now has a mirror of the downloads.yoctoproject.org sources
archive so include this in our mirrors list.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f602b6c2046bbc52a95dcc68a754f1cbb2db6761)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/classes/mirrors.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index 75eb86a724..49685d2f69 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -63,6 +63,7 @@ npm://.*/?.*    http://sources.openembedded.org/ \n \
 ${CPAN_MIRROR}  http://cpan.metacpan.org/ \n \
 ${CPAN_MIRROR}  http://search.cpan.org/CPAN/ \n \
 https?$://downloads.yoctoproject.org/releases/uninative/ https://mirrors.kernel.org/yocto/uninative/ \n \
+https?://downloads.yoctoproject.org/mirror/sources/ https://mirrors.kernel.org/yocto-sources/ \
 "
 
 # Use MIRRORS to provide git repo fallbacks using the https protocol, for cases
-- 
2.33.1

[honister][PATCH 17/17] insane.bbclass: Add a check for directories that are expected to be empty

[Anuj Mittal]

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

The empty-dirs QA check verifies that all directories specified in
QA_EMPTY_DIRS are empty. It is possible to specify why a directory is
expected to be empty by defining QA_EMPTY_DIRS_RECOMMENDATION:<path>,
which will then be included in the error message if the directory is
not empty. If it is not specified for a directory, then "but it is
expected to be empty" will be used.

Compared to the corresponding patch for master, there are two
differences:

* "/var/volatile" is not added to QA_EMPTY_DIRS by default, and
* "empty-dirs" is not enabled in ERROR_QA (nor in WARN_QA).

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/classes/insane.bbclass  | 30 ++++++++++++++++++++++++++++++
 meta/conf/documentation.conf |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index f2d2ca3689..bfaf2577d0 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -50,6 +50,20 @@ ALL_QA = "${WARN_QA} ${ERROR_QA}"
 
 UNKNOWN_CONFIGURE_WHITELIST ?= "--enable-nls --disable-nls --disable-silent-rules --disable-dependency-tracking --with-libtool-sysroot --disable-static"
 
+# This is a list of directories that are expected to be empty.
+QA_EMPTY_DIRS ?= " \
+    /dev/pts \
+    /media \
+    /proc \
+    /run \
+    /tmp \
+    ${localstatedir}/run \
+"
+# It is possible to specify why a directory is expected to be empty by defining
+# QA_EMPTY_DIRS_RECOMMENDATION:<path>, which will then be included in the error
+# message if the directory is not empty. If it is not specified for a directory,
+# then "but it is expected to be empty" will be used.
+
 def package_qa_clean_path(path, d, pkg=None):
     """
     Remove redundant paths from the path for display.  If pkg isn't set then
@@ -917,6 +931,22 @@ def package_qa_check_unlisted_pkg_lics(package, d, messages):
                            "listed in LICENSE" % (package, ' '.join(unlisted)))
     return False
 
+QAPKGTEST[empty-dirs] = "package_qa_check_empty_dirs"
+def package_qa_check_empty_dirs(pkg, d, messages):
+    """
+    Check for the existence of files in directories that are expected to be
+    empty.
+    """
+
+    pkgd = oe.path.join(d.getVar('PKGDEST'), pkg)
+    for dir in (d.getVar('QA_EMPTY_DIRS') or "").split():
+        empty_dir = oe.path.join(pkgd, dir)
+        if os.path.exists(empty_dir) and os.listdir(empty_dir):
+            recommendation = (d.getVar('QA_EMPTY_DIRS_RECOMMENDATION:' + dir) or
+                              "but it is expected to be empty")
+            msg = "%s installs files in %s, %s" % (pkg, dir, recommendation)
+            oe.qa.add_message(messages, "empty-dirs", msg)
+
 def package_qa_check_encoding(keys, encode, d):
     def check_encoding(key, enc):
         sane = True
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index c5a38b0764..d38a88fb49 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -345,6 +345,8 @@ PYPI_SRC_URI[doc] = "The URI to use to fetch from pypi, default uses pythonhoste
 
 #Q
 
+QA_EMPTY_DIRS[doc] = "A list of directories that are expected to be empty."
+QA_EMPTY_DIRS_RECOMMENDATION[doc] = "This specifies a recommendation for a directory why it must be empty, which will be included in the error message if the directory is not empty."
 QMAKE_PROFILES[doc] = "Specifies your own subset of .pro files to be built for use with qmake."
 
 #R
-- 
2.33.1

[honister][PATCH 00/17] Review request

[Anuj Mittal]

Please review these changes for honister. No issues seen while testing
on autobuilder.

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

Thanks,

Anuj

The following changes since commit b8fa0c446ecb3f65d7c134426a07c6244959cdf7:

  libdrm: upgrade 2.4.108 -> 2.4.109 (2021-12-09 09:17:26 +0800)

are available in the Git repository at:

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

Anuj Mittal (1):
  python3: upgrade 3.9.7 -> 3.9.9

Bruce Ashfield (4):
  linux-yocto/5.14: update to v5.14.21
  linux-yocto/5.10: update to v5.10.82
  linux-yocto-rt/5.10: update to -rt56
  kern-tools: bug fixes and kgit-gconfig

Changqing Li (1):
  openssh: fix CVE-2021-41617

Mingli Yu (3):
  ncurses: fix CVE-2021-39537
  bind: fix CVE-2021-25219
  packagedata.py: silence a DeprecationWarning

Richard Purdie (1):
  gcc: Add CVE-2021-37322 to the list of CVEs to ignore

Ross Burton (3):
  runqemu: check the qemu PID has been set before kill()ing it
  oe/license: implement ast.NodeVisitor.visit_Constant
  license.bbclass: implement ast.NodeVisitor.visit_Constant

Stefan Herbrechtsmeier (2):
  recipetool: Set master branch only as fallback
  selftest/devtool: Check branch in git fetch

Steve Sakoman (1):
  cve-extra-exclusions: add db CVEs to exclusion list

Thomas Perrot (1):
  uboot-sign: fix the concatenation when multiple U-BOOT configurations
    are specified

 meta/classes/license.bbclass                  |  4 +
 meta/classes/uboot-sign.bbclass               | 16 +++-
 .../distro/include/cve-extra-exclusions.inc   |  9 ++-
 meta/lib/oe/license.py                        |  6 ++
 meta/lib/oe/packagedata.py                    |  2 +-
 meta/lib/oeqa/selftest/cases/devtool.py       |  5 +-
 .../bind/bind-9.16.20/CVE-2021-25219-1.patch  | 76 +++++++++++++++++++
 .../bind/bind-9.16.20/CVE-2021-25219-2.patch  | 65 ++++++++++++++++
 .../recipes-connectivity/bind/bind_9.16.20.bb |  2 +
 .../openssh/openssh/CVE-2021-41617.patch      | 48 ++++++++++++
 .../openssh/openssh_8.7p1.bb                  |  1 +
 .../ncurses/files/CVE-2021-39537.patch        | 65 ++++++++++++++++
 meta/recipes-core/ncurses/ncurses_6.2.bb      |  1 +
 meta/recipes-devtools/gcc/gcc-11.2.inc        |  3 +
 ...-detection-of-mips-architecture-for-.patch | 20 +++--
 .../{python3_3.9.7.bb => python3_3.9.9.bb}    |  2 +-
 .../kern-tools/kern-tools-native_git.bb       |  5 +-
 .../linux/linux-yocto-rt_5.10.bb              |  6 +-
 .../linux/linux-yocto-rt_5.14.bb              |  6 +-
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +-
 .../linux/linux-yocto-tiny_5.14.bb            |  8 +-
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++---
 meta/recipes-kernel/linux/linux-yocto_5.14.bb | 26 +++----
 scripts/lib/recipetool/create.py              | 15 ++--
 scripts/runqemu                               |  3 +-
 25 files changed, 358 insertions(+), 68 deletions(-)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-1.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-2.patch
 create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2021-41617.patch
 create mode 100644 meta/recipes-core/ncurses/files/CVE-2021-39537.patch
 rename meta/recipes-devtools/python/{python3_3.9.7.bb => python3_3.9.9.bb} (99%)

-- 
2.33.1