subtree updates

poky: 29afbb5e14..aa6cd06a9f:
  Alejandro Hernandez Samaniego (1):
        testimage: Fix error message to reflect new syntax

  Alex Kiernan (2):
        rust: Upgrade 1.66.1 -> 1.67.0
        rust: Add `update_snapshot` task to generate `rust-snapshot.inc`

  Alexander Kanavin (49):
        oeqa/qemurunner: do not use Popen.poll() when terminating runqemu with a signal
        ifupdown: update 0.8.39 -> 0.8.41
        python3-pip: update 22.3.1 -> 23.0
        diffutils: update 3.8 -> 3.9
        mc: update 4.8.28 -> 4.8.29
        xf86-video-vmware: update 13.3.0 -> 13.4.0
        lttng-tools: update 2.13.8 -> 2.13.9
        rt-tests: update 2.4 -> 2.5
        apr: update 1.7.0 -> 1.7.2
        apr-util: update 1.6.1 -> 1.6.3
        glib-2.0: upgrade 2.74.4 -> 2.74.5
        systemd: update 252.4 -> 252.5
        cmake: upgrade 3.25.1 -> 3.25.2
        python3-setuptools: update 65.7.0 -> 67.2.0
        lighttpd: upgrade 1.4.67 -> 1.4.68
        lsof: upgrade 4.96.5 -> 4.98.0
        igt-gpu-tools: upgrade 1.26 -> 1.27.1
        vulkan-headers: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-loader: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-tools: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-tools: upgrade 1.3.236.0 -> 1.3.239.0
        glslang: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-headers: upgrade 1.3.236.0 -> 1.3.239.0
        libxpm: upgrade 3.5.14 -> 3.5.15
        rng-tools: upgrade 6.15 -> 6.16
        fontconfig: upgrade 2.14.1 -> 2.14.2
        ncurses: upgrade 6.3+20220423 -> 6.4
        mpg123: upgrade 1.31.1 -> 1.31.2
        python3-pycryptodomex: upgrade 3.16.0 -> 3.17
        bind: upgrade 9.18.10 -> 9.18.11
        libjpeg-turbo: upgrade 2.1.4 -> 2.1.5
        pkgconf: upgrade 1.9.3 -> 1.9.4
        python3-pycryptodome: upgrade 3.16.0 -> 3.17
        python3-dtschema: upgrade 2022.12 -> 2023.1
        llvm: upgrade 15.0.6 -> 15.0.7
        puzzles: upgrade to latest revision
        dpkg: upgrade 1.21.18 -> 1.21.19
        shaderc: upgrade 2022.4 -> 2023.2
        sysstat: upgrade 12.6.1 -> 12.6.2
        piglit: upgrade to latest revision
        ltp: upgrade 20220930 -> 20230127
        linux-firmware: upgrade 20221214 -> 20230117
        libinput: upgrade 1.22.0 -> 1.22.1
        sudo: upgrade 1.9.12p1 -> 1.9.12p2
        diffoscope: upgrade 230 -> 234
        texinfo: upgrade 7.0.1 -> 7.0.2
        stress-ng: upgrade 0.15.02 -> 0.15.03
        libgit2: upgrade 1.5.0 -> 1.5.1
        python3-pathspec: upgrade 0.10.3 -> 0.11.0

  Andrej Valek (1):
        busybox: 1.35.0 -> 1.36.0

  Arnout Vandecappelle (1):
        python3-pytest: Remove dependency on python3-toml

  Bruce Ashfield (5):
        linux-yocto/6.1: update to v6.1.7
        linux-yocto/5.15: update to v5.15.89
        linux-yocto/6.1: cfg: remove depreciated configs
        linux-yocto/6.1: update to v6.1.9
        linux-yocto/5.15: update to v5.15.91

  Changqing Li (1):
        apt: fix do_package_qa failure

  Chen Qi (1):
        ffmpeg: fix configure failure on noexec /tmp host

  Etienne Cordonnier (1):
        bitbake: siggen: Fix inefficient string concatenation

  George Kelly (1):
        bitbake: fetch2: Add NODE_EXTRA_CA_CERTS to export list

  Harald Seiler (1):
        bootchart2: Fix usrmerge support

  Jan Luebbe (1):
        systemd: add PACKAGECONFIG for pstore

  Khem Raj (6):
        busybox: Make provisions to disable sha256/sha1 accelaration on x86
        nghttp2: Disable python bindings
        scons: Pass MAXLINELENGTH to scons invocation
        scons.bbclass: Make MAXLINELENGTH overridable
        glibc: Upgrade to 2.37 release
        lttng-tools: Update LFS64 patch with upstream feedback

  Louis Rannou (1):
        oeqa/selftest/locales: Add selftest for locale generation/presence

  Markus Volk (3):
        libtiff: add PACKAGECONFIG for libdeflate and zstd
        mesa: add PACKAGECONFIG for video-codecs
        ell: update 0.55 -> 0.56

  Martin Jansa (2):
        meta: remove True option to getVar and getVarFlag calls (again)
        xinetd: move xconv.pl script to separate package

  Mauro Queiros (1):
        image.bbclass: print all QA functions exceptions

  Michael Halstead (1):
        uninative: Upgrade to 3.9 to include glibc 2.37

  Michael Opdenacker (1):
        bitbake: bitbake-user-manual: show how use BB_LOGCONFIG to log warnings

  Mikko Rapeli (1):
        oeqa context.py: fix --target-ip comment to include ssh port number

  Mingli Yu (1):
        glslang: branch rename master -> main

  Pavel Zhukov (1):
        bitbake.conf: Add mercurial to HOSTTOOLS_NONFATAL

  Pedro Baptista (2):
        bitbake: bblayers/query: Replace layer directory name with layer name for show-layers
        bitbake: bblayers/query: Adjust show-layers output layout

  Peter Kjellerstedt (1):
        poky.conf: Switch to post release name/version

  Ravineet Singh (1):
        gnutls: add ptest support

  Richard Purdie (6):
        python3-markupsafe: upgrade 2.1.1 -> 2.1.2
        perf: Fix 6.1 kernel reproducibility issue
        perf: Enable debug/source packaging
        libc-locale: Fix on target locale generation
        oeqa/selftest/locales: Add test for disabled binary locale generation
        valgrind: Workaround glibc upgrade

  Ross Burton (5):
        git: upgrade to 2.39.1
        git: ignore CVE-2022-41953
        sdkext/cases/devtool: pass a logger to HTTPService
        oeqa/utils/httpserver: connect up the request logging
        httpserver: add error handler that write to the logger

  Tim Orling (14):
        libtest-needs-perl: upgrade 0.002009 -> 0.002010
        python3-pytest: upgrade 7.2.0 -> 7.2.1
        python3-hypothesis: upgrade 6.62.0 -> 6.66.0
        python3-poetry-core: upgrade 1.4.0 -> 1.5.0
        python3-iniconfig: upgrade 1.1.1 -> 2.0.0
        python3-pytz: upgrade 2022.7 -> 2022.7.1
        python3-zipp: upgrade 3.11.0 -> 3.12.0
        python3-requests: upgrade 2.28.1 -> 2.28.2
        python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4
        python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1
        python3-pyopenssl: upgrade 22.1.0 -> 23.0.0
        python3-wcwidth: upgrade 0.2.5 -> 0.2.6
        python3-urllib3: upgrade 1.26.13 -> 1.26.14
        python3-sphinx: upgrade 6.0.0 -> 6.1.3

  Tobias Hagelborn (1):
        sstate.bbclass: Fetch non-existing local .sig files if needed

  Ulrich Ölmann (3):
        recipe_sanity: fix old override syntax
        lsof: fix old override syntax
        update-alternatives: fix typos

  Vivek Kumbhar (1):
        openssl: fix CVE-2022-3996 double locking leads to denial of service

  Wang Mingyu (2):
        btrfs-tools: upgrade 6.1.2 -> 6.1.3
        msmtp: upgrade 1.8.22 -> 1.8.23

  Xiaotian Wu (5):
        base: add support for loongarch64
        linux: add loongarch64 support
        binutils: disable gold on loongarch64
        loongarch: disable seccomp from default feature
        uboot: add a loongarch64 entry

meta-security: 7eed4a60f5..3529cfb43e:
  Mikko Rapeli (1):
        linux-yocto: drop version from bbappends

meta-raspberrypi: 6c57b92708..e43af1e3a6:
  Allan Xavier (2):
        linux-raspberrypi: Build eeprom access into kernel
        rpi-eeprom: Add recipe for eeprom update/configuration

  Khem Raj (3):
        linux-raspberrypi: Update to 5.15.90
        linux-raspberrypi: Fix build with gcc13
        linux-raspberrypi: Remove unused patches

  Martin Jansa (1):
        raspidmx, userland, omxplayer: Fix Upstream-Status formatting

meta-arm: aecbb77f72..dc10b73cc5:
  Jon Mason (1):
        arm/linux-yocto: avoid kernel defconfig warning

  Khem Raj (2):
        gator-daemon: Fix build with gcc13
        sbsa: Fix build with gcc13

  Ross Burton (2):
        arm-bsp/corstone*00: disable openssl in kmod
        CI: pin to kas 3.2 as 3.2.1 fails

  Rui Miguel Silva (6):
        meta-arm: add build to gitignore
        kas/corstone1000: move from langdale to master
        arm-bsp/corstone500: bump u-boot version to 2023.01
        arm-bsp/corstone1000: bump u-boot version to 2023.01
        arm-bsp: corstone500: bump kernel version to 6.1
        arm-bsp/corstone1000: bump kernel version to v6.1

meta-openembedded: ea63f13846..cba6df61c7:
  Alex Kiernan (2):
        mdns: Upgrade 1790.60.25 -> 1790.80.10
        dnsmasq: Upgrade 2.88 -> 2.89

  Chen Qi (1):
        syslog-ng: workaround segfault for ppc64le

  Christian Hohnstaedt (1):
        libb64: reactivate BUFFERSIZE patch

  David Bagonyi (1):
        concurrencykit: Make patch compatible with Bourne shell

  Geoff Parker (1):
        python3-pillow: add tk to RDEPENDS ptest pkg only if x11 in DISTRO_FEATURES

  Jan Luebbe (4):
        softhsm: avoid unnecessary check for native sqlite binary
        softhsm: enable objectstore backend
        extract-cert: add recipe
        opensc: fix private key import

  Kai Kang (1):
        crda: remove recipe

  Khem Raj (39):
        rwmem: Update to latest
        pipewire: Split dymanic modules to target recipe alone
        upm: Fix build with gcc13
        openthread: Use __attribute__ ((unused)) instead of removing 't'
        wireshark: Add nghttp2 packageconfig
        rdma-core: Inherit python3targetconfig
        wireshark: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        dante: Add -P to preprocessor flags
        breakpad: Fix build with gcc13
        mongodb: Fix build with gcc13
        mongodb: Upgrade to 4.4.18
        mongodb: Pass MAXLINELENGTH to scons invocation
        perfetto: Disable ccache
        nodejs: Fix build with gcc13
        zeromq: Fix build with gcc13
        python3-greenlet: Fix build with gcc13
        perfetto: Upgrade to 31.0 release
        perfetto: Fix build with gcc13
        ntopng: Add hiredis to depends
        python3-grpcio: Fix build with gcc13
        tesseract: Fix build with gcc13
        lcdproc: Update to latest tip of trunk
        mongodb: Use bfd linker for x86/musl with gcc
        gegl: Depend on openmp when using clang
        pipewire: Do not split modules using PACKAGES_DYNAMIC for native case
        sysdig: Fix build with gcc13
        zfs: Update to 2.1.9
        python3-isort: Upgrade to isort 5.12.0
        minicoredumper: Upgrade to 2.0.2 release
        perfetto: Add missing dependencies.
        vulkan-cts: Rename patch to avoid problems on case insensitive filesytems
        python3-greenlet: Upgrade to 2.0.2
        cups-filters: Fix build with clang16/c++17
        cups-filters: Upgrade to 1.28.17 release
        ltrace: Fix build with clang16
        oprofile: Do not use std::bind2nd
        perfetto: Fix build on musl again

  Markus Volk (7):
        python3-pycups: add recipe
        blueman: add missing runtime dependency, add polkit rule
        system-config-printer: add recipe
        rtkit: add recipe
        xdg-desktop-portal: add runtime dependency on rtkit
        pipewire: update 0.3.64 -> 0.3.65
        xfdesktop: update 4.18.0 -> 4.18.1

  Martin Jansa (3):
        hunspell: move ispellaff2myspell script to separate package
        meta: remove True option to getVar calls (again)
        mctp: fix overrides syntax in SYSTEMD_AUTO_ENABLE:${PN}

  Randy MacLeod (1):
        python3-pillow: add ptest support

  Simone Weiss (1):
        minicoredumper: Add ptest

  Ulrich Ölmann (2):
        initramfs-{debug,kexecboot}-image: fix override syntax in comment
        kexecboot: update homepage

  Wang Mingyu (5):
        byacc: upgrade 20221229 -> 20230201
        ccid: upgrade 1.5.1 -> 1.5.2
        cglm: upgrade 0.8.7 -> 0.8.9
        cmark: upgrade 0.30.2 -> 0.30.3
        apache2: upgrade 2.4.54 -> 2.4.55

  Yi Zhao (2):
        samba: upgrade 4.17.4 -> 4.17.5
        frr: upgrade 8.4.1 -> 8.4.2

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idbe7ba3bb68f0858849f8abf80cc488f94920dda

6 files changed, 29 insertions, 31 deletions

diff --git a/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch b/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
index 7bf02ea536..6c4ed526bf 100644
--- a/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
+++ b/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
@@ -1,4 +1,4 @@
-From ff714d6461569d69b253089110ec659e4ebec248 Mon Sep 17 00:00:00 2001
+From 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 Mon Sep 17 00:00:00 2001
 From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
 Date: Tue, 2 Jul 2019 20:10:42 +0200
 Subject: [PATCH] Define FNM_EXTMATCH for musl
@@ -24,12 +24,13 @@ function); did you mean 'FNM_NOMATCH'?
 Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5]
 
 Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
+
 ---
  archcommon.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/archcommon.h b/archcommon.h
-index fe99950..f257f9d 100644
+index 818b0b6..ad9cd1a 100644
 --- a/archcommon.h
 +++ b/archcommon.h
 @@ -1,5 +1,9 @@
@@ -42,6 +43,3 @@ index fe99950..f257f9d 100644
  bool execable(const char *);
  
  #define iface_is_link() (!_iface_has(ifd->real_iface, ":."))
--- 
-2.17.1
-
diff --git a/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch b/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
index 57c8d04fd7..6e15a25224 100644
--- a/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
+++ b/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
@@ -1,10 +1,11 @@
-From 7ace0656bd325f9e7749f2cde641eddc057bc98a Mon Sep 17 00:00:00 2001
+From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 9 Jan 2020 15:38:06 +0100
 Subject: [PATCH] Makefile: do not use dpkg for determining OS type
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch b/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
index c751e4fab0..9ae24da51e 100644
--- a/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
+++ b/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
@@ -1,4 +1,4 @@
-From 98243deface88614e3f332c4a85d04a9abce55ff Mon Sep 17 00:00:00 2001
+From 782d8a869c266820d0f34974436f244f67afaea7 Mon Sep 17 00:00:00 2001
 From: Zqiang <qiang.zhang@windriver.com>
 Date: Mon, 19 Apr 2021 14:15:45 +0800
 Subject: [PATCH] ifupdown: skip wrong test case
@@ -10,23 +10,21 @@ and are skipped directly.
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Zqiang <qiang.zhang@windriver.com>
+
 ---
  tests/testbuild-linux | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/testbuild-linux b/tests/testbuild-linux
-index 1181ea0..5f148eb 100755
+index 2fa1b8b..2c69856 100755
 --- a/tests/testbuild-linux
 +++ b/tests/testbuild-linux
 @@ -3,7 +3,7 @@
  dir=tests/linux
  
  result=true
--for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do
-+for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+-for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
++for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
  	if [ -e $dir/testcase.$test ]; then
  		args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')"
  	else
--- 
-2.17.1
-
diff --git a/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
index d1c3d260ed..7b4b761e6a 100644
--- a/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
+++ b/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
@@ -1,7 +1,7 @@
-From 40257d65b338b6e2ed9d89d6fa7c7b8701a4c311 Mon Sep 17 00:00:00 2001
+From fc8e8d4cb19ff30e69aa1855332544f1017f974c Mon Sep 17 00:00:00 2001
 From: Paul Gortmaker <paul.gortmaker@windriver.com>
 Date: Wed, 6 Aug 2014 14:54:12 -0400
-Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch
+Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch
 
 In yocto we'll always be cross compiling, and we'll always
 be building on linux for linux (vs. *BSD, hurd, etc.)
@@ -13,13 +13,14 @@ like the loopback device not being configured/enabled.
 
 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 Upstream-Status: Pending
+
 ---
  defn2c.pl   | 6 +++---
  defn2man.pl | 6 +++---
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/defn2c.pl b/defn2c.pl
-index 8798dc2..f2551c7 100755
+index fa7a02e..bb4987d 100755
 --- a/defn2c.pl
 +++ b/defn2c.pl
 @@ -2,9 +2,9 @@
@@ -52,6 +53,3 @@ index 6ddcfdd..c9c4dd0 100755
  
  # declarations
  my $line;
--- 
-2.17.1
-
diff --git a/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
index ea88a9086a..fa6bb84df3 100644
--- a/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
+++ b/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
@@ -1,14 +1,19 @@
-Tweak tests of ifupdown to make it work with oe-core ptest framework.
+From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Mon, 3 Feb 2020 17:33:11 +0800
+Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest
+ framework.
 
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
 ---
  tests/testbuild-linux | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/tests/testbuild-linux b/tests/testbuild-linux
-index 5f148eb..d9b1698 100755
+index 2c69856..05f0703 100755
 --- a/tests/testbuild-linux
 +++ b/tests/testbuild-linux
 @@ -1,6 +1,7 @@
@@ -19,8 +24,8 @@ index 5f148eb..d9b1698 100755
 +dir=$curdir/linux
  
  result=true
- for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
-@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
+@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
          echo "Testcase $test: $args"
  
  	exitcode=0
@@ -29,7 +34,7 @@ index 5f148eb..d9b1698 100755
                  >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$?
  
          (echo "exit code: $exitcode";
-@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
           echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test
  
  	exitcode=0
@@ -38,7 +43,7 @@ index 5f148eb..d9b1698 100755
                 >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$?
  
          (echo "exit code: $exitcode";
-@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
           echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test
  
          if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then
@@ -50,5 +55,3 @@ index 5f148eb..d9b1698 100755
                  result=false
          fi
          echo "=========="
---
-2.17.1
diff --git a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
index 7096bc94d7..5dbd6193b8 100644
--- a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb
+++ b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
@@ -8,15 +8,15 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \
-           file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
            file://99_network \
+           file://run-ptest \
            file://0001-Define-FNM_EXTMATCH-for-musl.patch \
            file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \
-           file://run-ptest \
            file://0001-ifupdown-skip-wrong-test-case.patch \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \
+           file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
+           file://tweak-ptest-script.patch \
            "
-SRCREV = "be91dd267b4a8db502a6bbf5758563f7048b8078"
+SRCREV = "369d9d3c13a0c56ad09fd4f13b4a80eb9a94e270"
 
 S = "${WORKDIR}/git"