From patchwork Mon Jul 13 00:44:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92365 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 159FAC4450A for ; Mon, 13 Jul 2026 00:45:16 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.1184.1783903506603155861 for ; Sun, 12 Jul 2026 17:45:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=LStCrt0i; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2ceaf8a1265so11147995ad.2 for ; Sun, 12 Jul 2026 17:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903506; x=1784508306; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=RqDlz71qpE+slElTV3MrZL/xXWa7hAfkYpJMlMUW7YE=; b=LStCrt0izHuIkp/a45vl2PwCvsLqtKemm+U5rAuhrgE+s1fsAIWsx+7zuVvAPyxEFu FXbluVQlPXCLbqKo/135xPKdOfwntBy7iNwK6dHKxdpplhAFN+k5PFcW6ms22Eihj2Q1 DpU40Mdnt17ToFx/MEFJmwqlzf1UzKX0lpHaUTLqNiZODiRDxKZlnwhNfVoQV4kLVhSI wnXZjZhFCvJ05NXXKELDf4bWPfUZwTVc00D35HS3hmQHPP0RdFf6U6N0LHPop5iu4zwA yWZIGTV+syKZ+6sYNJwDgk6Y5Fk6nxjZugabRomuBHe0UlvyaUCv5b/AeZt0comCfWQe bd2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903506; x=1784508306; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RqDlz71qpE+slElTV3MrZL/xXWa7hAfkYpJMlMUW7YE=; b=Zk/n8DA281ycBiujkH5nA3uIxLWpY5lPxuiQ4pHknqTGwvO4fDDherhoS4okTQ1kzr bsytq4oLWTF5j0pjIqICZVgHJXrceutC/RAd+F/85daZh0UuHzl/CrJQC6rZ1dAeEOF3 FoFtj1Aj3jbhUmyTyWekH1rGANtPRa6PThscFM0pnYOYvCjs8ONZCnhpMAjQeGPeV7Zx iggexWtUPBuAI/u1c2L06UgkKOWpLTGFAqQnPz0PvV0i3Zx5jNJ02LBaBEKTTTq4ttP7 n9cKysU0G9UsF3twFOneTqtT9ak6eRTZv4Cn9U49f9DrUVvmzoqDe54bsushXF5Uu7cZ FccA== X-Gm-Message-State: AOJu0Yxa20kq6XEV7uXA9NBvCV8/qnBp8ppZwTAcs8PClWJI9mtIu4p5 N3pPWWjnGUDnQtC/sejo1s7/t8M7nAKmQggCoqdSnoX1NcCEJWguy4dK29f+D5b107w= X-Gm-Gg: AfdE7clWgpeqk4JU1IS+poN488YFPTf5eWloyaI2mHTcj1hev9e8HqBwrhkQ6VP7a83 YNyU8m1SLNI2mNMXIRaf6nPE/QnfORULkt694D5qLI6uqTrZleA/jj9K7Kv4C7mamCyA+ES57OZ ms35my38I63YaWvE7LhIP5b1IO30fGIyNky2kZxP8nMUU8zEBQgx5Sw1ubRZDFkd2Jw1MFUlU9J hVZ4loJ8S6VFvV6NrI/caGKx/WZI8KqWZEjxZ4bWysttOsSIBsdZhq6YelaI3VTUoMhEx0sBuKj VJ3TfzFus2nFOEW5dBhtWK68LPmU+CMWlQl4LlyFtJjQNsPI/u6bCUgvApNBoGItcpJVw1Oxt7r XF6SS07E+2DRmGC+onBUvF/9ohZ8IWZfYK3oDyDuMnMwnTvfmp4MQUgEide5rGmPNVMe7V0Inna LAvYa5JwQkLiOn9UQqR/pLrJnUr8h8hwnl3dufsjuszHcnbLhqZDOOt+wmh2xP+vgLD3zSNKS09 6D5Jkq+tiezAU40srxG0+lduRUDM7JGa/msI3duJQbMyMW91Hh3oSLryck1UzVH5aTK7I4gNchk buyHuc1if0Cs29Y9KchhpUKGW7I7Gg== X-Received: by 2002:a17:903:46cb:b0:2c7:faae:ab15 with SMTP id d9443c01a7336-2ce9e7adb67mr78617265ad.10.1783903505909; Sun, 12 Jul 2026 17:45:05 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:04 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 1/8] python3-dbus-deviation: Drop all setup_requires to fix build failure Date: Sun, 12 Jul 2026 17:44:55 -0700 Message-ID: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128143 do_compile failed with: AttributeError: 'NoneType' object has no attribute 'lower' A non-empty setup_requires makes setuptools run fetch_build_eggs(), which enumerates every distribution in the native sysroot and calls packaging.utils.canonicalize_name(dist.name). Under the setuptools/ Python 3.14 in the sysroot one distribution exposes a None name, so canonicalize_name() crashes on None.lower() and aborts the build. Extend the existing patch to drop the whole setup_requires block instead of only setuptools_git. sphinx is only used by the build_sphinx command (not run during do_compile) and is already provided via DEPENDS, so removing it is safe and keeps setuptools out of the fetch_build_eggs() path. Signed-off-by: Khem Raj --- ...o-donwload-requierment-which-will-ca.patch | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-dbus-deviation/0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch b/meta-python/recipes-devtools/python/python3-dbus-deviation/0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch index b163db772c..7acb4493c8 100644 --- a/meta-python/recipes-devtools/python/python3-dbus-deviation/0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch +++ b/meta-python/recipes-devtools/python/python3-dbus-deviation/0001-Prevent-trying-to-donwload-requierment-which-will-ca.patch @@ -3,25 +3,34 @@ Subject: [PATCH] Prevent trying to donwload requierment which will cause 'NewConnectionError(': Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /simple/setuptools-git/ +Dropping all setup_requires entries also avoids setuptools' +fetch_build_eggs() code path, which enumerates every installed +distribution in the native sysroot and crashes with +"AttributeError: 'NoneType' object has no attribute 'lower'" when one of +them exposes a None name under newer setuptools/Python. sphinx is only +needed for the build_sphinx command (not run during do_compile) and is +provided via DEPENDS, so it is safe to remove here. + Upstream-Status: Inappropriate [oe specific] -Signed-off-by: Liu Yiding +Signed-off-by: Liu Yiding --- - setup.py | 1 - - 1 file changed, 1 deletion(-) + setup.py | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/setup.py b/setup.py index 245193f..d899e4c 100755 --- a/setup.py +++ b/setup.py -@@ -92,7 +92,6 @@ setuptools.setup( +@@ -92,8 +92,4 @@ setuptools.setup( exclude_package_data={'': ['.gitignore']}, zip_safe=True, - setup_requires=[ +- setup_requires=[ - 'setuptools_git >= 0.3', - 'sphinx', - ], +- 'sphinx', +- ], install_requires=['lxml'], --- + tests_require=[], +-- 2.43.0 From patchwork Mon Jul 13 00:44:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0586AC44509 for ; Mon, 13 Jul 2026 00:45:16 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.1185.1783903508093677183 for ; Sun, 12 Jul 2026 17:45:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=pzcD6A5O; spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-ca12086c06eso2145068a12.0 for ; Sun, 12 Jul 2026 17:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903507; x=1784508307; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=nslYEwzNh5KewciUEN44V+FyFLclHiTs+fKcPtrqIWk=; b=pzcD6A5OEYbaD4t2z0r2ijpCgX94LSb4hTnxAecJq0t3bvRdBmSh1Lcnfa7Z21b6+a N9cKzYIxMepG/X1+p8VXQLKIfolpQXzBg0oj7xC7p3A1jHP1F0+d+rM0aUyCk7NKgAm5 C6ZxYBAxGbscqwf+95vD/vDGZItmTquQpu/0jIlVOVmI7aO/Zg1ywKNvD88GcOLVnVTq bkJlE3yP0MpmBzYsQ7Yr99CWku0UwHAhBR5UHgLfi28IT3uO3SAK710Hj47aFEDsn1mL ral+WPaw9EXDUVnVoWvky5JQ6jkKUSjC2H3PZOkvkiGZkv7Em5a2t0mUiAy26o+jOZj/ XNZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903507; x=1784508307; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=nslYEwzNh5KewciUEN44V+FyFLclHiTs+fKcPtrqIWk=; b=AIc2vERZZrnuZCh3yLIbrH3AOya9NCWwPrRT7MMQycMo3bKUlS47956mgpF0hqmA7c ++mrDvXMUnwyKx8r3HMfDOR+jzIHCmBnJcoiG2bGPL3GB7HZYVeJUpAQ5eVrmk06oafx kRYxW5FUhV7PN7PvDCknimZPQVPBu2MctxMKF8wai/ZCDkhVZX2/Bsa0tGN8z+S6erHn vxAGVnQpWZvAbO99eSTfKBnjq5beBkfHj+DUwvE962c+OdTP27iadtqpNd6iAl+oSu9R gTqIpSwIdT3WtPU1q1FQf/schr8iktqK3aPZb7+xH6o98IXoRE/nNT0b5OxxgfFSe5Jv D8Qw== X-Gm-Message-State: AOJu0Yzmu7hco+i6Tt1x0JE1RTFm743TZ8ufFvaPjk9VfSB26oKcz5Y8 aDHonJFt19YsKnIA74N3oukGZSD/m1RxPUErtYBLtW+38GxnPInCeSUm8LIhVFQ2PI0= X-Gm-Gg: AfdE7clxSFIEk89r6+xYVL2MFcUiBy7SZFiOIq7MPKnphbRnp/niGE2ajuKrnPxiyDc dYJva1KrH3ylp5ijIw3wGeEIN1iQIfWazpobPFO65Uz4HvxDHgWVx78tD25B5bzEJtX41TrJoon K0qmJwYl8G8MkJw+fpPsW1UMQlkX5BKB2VrTDvM1oAAtwdiBiWQ7qgoqsOJ8EsQ13Qe2k3ZN/X0 nf6ooAElN30szY3gR7Sv9Y5CICjVxfYLhgqbgwFX3fAwBAIQPXU24ifWBW3JZyyk4tj1whN47UY EuGta9XokI2BUNrGMb/9o5g2AopGdf6umfwNqJUx9oqnxMy+mZNbjbVpnLCpnuP5FtDTooC/ATA GlG9YHDhytYeSTfLt8sNW5aePHbhDwOTDYWW1cbOYo1AI1lkbjLd7L8fQXznec4foymVvoI6xwb i8qoIOwyR2n7rrOhGohX0FW+3ERobtVJNVlDSZ4NGQtETlrzT1FBu27cTS1mTBBtpKucxGVL3bY x2TpKlhmvwJM8ZNGqsKLTBLiBmY6fahvKIiKxE31GwiAowvNQNx3gvVMy699kOuzMRxtYK62lnq N2dTgx7h/xivTp1np5yjG8dq4cwOXg== X-Received: by 2002:a05:6a21:7d02:b0:3c0:e552:f2d with SMTP id adf61e73a8af0-3c1104eb7d8mr7203682637.34.1783903507379; Sun, 12 Jul 2026 17:45:07 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:06 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/8] sysdig: Fix intermittent missing libsinsp/libscap headers on rebuild Date: Sun, 12 Jul 2026 17:44:56 -0700 Message-ID: <20260713004502.716970-2-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> References: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128144 do_compile could fail with many: fatal error: 'libsinsp/sinsp.h' file not found fatal error: 'sinsp.h' file not found fatal error: 'libscap/strl.h' file not found across all userspace/sysdig objects, even though the headers exist in the fetched falcosecurity-libs source. The add_library de-duplication patch guarded the libscap/libsinsp modules with a HAVE_LIBSCAP/HAVE_LIBSINSP flag set as CACHE INTERNAL. Because that value persists in CMakeCache, ninja's build-time regeneration rule (cmake --regenerate-during-build, which fires whenever a CMake input's timestamp changes between do_configure and do_compile) re-runs cmake with the flag already true. The libscap/libsinsp add_subdirectory() is then skipped, dropping the scap/sinsp targets and their PUBLIC include directories, so target_link_libraries(sysdig sinsp) degrades to a bare -lsinsp with no header propagation. Guard on target existence (if(NOT TARGET scap|sinsp)) instead. Target existence is global within a single cmake run -- so it still prevents the duplicate add_library -- but is not persisted across runs, so the modules are correctly re-processed on every regeneration. Verified: a build-time cmake regeneration now keeps the libsinsp/libscap object rules and falcosecurity-libs include paths in build.ninja, and a full clean build plus a post-touch recompile both succeed. Signed-off-by: Khem Raj --- ...-duplicate-operations-of-add_library.patch | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Avoid-duplicate-operations-of-add_library.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Avoid-duplicate-operations-of-add_library.patch index b8ca7dd38b..ec9ca46269 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-Avoid-duplicate-operations-of-add_library.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-Avoid-duplicate-operations-of-add_library.patch @@ -9,36 +9,48 @@ To fix following configure error | add_library cannot create target "scap_error" because another target with | the same name already exists. The existing target is a static library +Guard the libscap/libsinsp modules on the existence of the "scap"/"sinsp" +targets rather than on a cached HAVE_LIBSCAP/HAVE_LIBSINSP flag. A cached +flag persists into the CMakeCache, so when Ninja re-runs CMake during the +build (the "cmake --regenerate-during-build" RERUN rule fires whenever a +CMake input's timestamp changes) the guard is already true and the +add_subdirectory() for libscap/libsinsp is skipped. That drops the scap/ +sinsp targets and their PUBLIC include directories, and the userspace/ +sysdig targets then fail to compile with "'libsinsp/sinsp.h' file not +found". Target existence is global within a single CMake run (so it still +prevents the duplicate add_library) but is not persisted across runs, so +the modules are re-processed on every regeneration. + Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Liu Yiding --- - cmake/modules/libscap.cmake | 2 +- - cmake/modules/libsinsp.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + cmake/modules/libscap.cmake | 3 +-- + cmake/modules/libsinsp.cmake | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake -index b41b12ff3..1753598e9 100644 --- a/cmake/modules/libscap.cmake +++ b/cmake/modules/libscap.cmake -@@ -14,7 +14,7 @@ +@@ -13,8 +13,7 @@ + # the License. # - if(NOT HAVE_LIBSCAP) +-if(NOT HAVE_LIBSCAP) - set(HAVE_LIBSCAP On) -+ set(HAVE_LIBSCAP On CACHE INTERNAL "Flag to indicate libscap has been processed") ++if(NOT TARGET scap) if(NOT LIBS_DIR) get_filename_component(LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE) diff --git a/cmake/modules/libsinsp.cmake b/cmake/modules/libsinsp.cmake -index ff336e27f..0fdd2d4a9 100644 --- a/cmake/modules/libsinsp.cmake +++ b/cmake/modules/libsinsp.cmake -@@ -14,7 +14,7 @@ +@@ -13,8 +13,7 @@ + # the License. # - if(NOT HAVE_LIBSINSP) +-if(NOT HAVE_LIBSINSP) - set(HAVE_LIBSINSP On) -+ set(HAVE_LIBSINSP On CACHE INTERNAL "Flag to indicate libsinsp has been processed") ++if(NOT TARGET sinsp) if(NOT LIBS_DIR) get_filename_component(LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE) From patchwork Mon Jul 13 00:44:57 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92364 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB6FDC44508 for ; Mon, 13 Jul 2026 00:45:15 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.1209.1783903509646254611 for ; Sun, 12 Jul 2026 17:45:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=NoAW8RKv; spf=pass (domain: gmail.com, ip: 209.85.215.174, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-c9c26a5fb98so1498341a12.0 for ; Sun, 12 Jul 2026 17:45:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903509; x=1784508309; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=6gdpTKYDGWkpZo7LwAVR7yGgxmEhd6vKt3oy8Wm/Fv8=; b=NoAW8RKvERHq/yb5caCiCNRKya+i/Dfym4PHj6ExPbvk5uB7/nZtzjYaxJUn+pw1uA 3YYaHyfDJ6VdneoJ1US+AJ55frshYP1uDPl+wfWeyGpcgbgbRCH73C64AMrIcRSIko4F auOOHeREYdGMc1b4UTBTcJLK1Gj0RRpxUXqA17rf99upeapoGVUCLWuSVTn+kYk21hVb Mskz+kfLI8MV4cwQGrDUhz+/mayTtcMHkqtJXnOv7v2CagUpefCriJreSMNn/wdJdazu 76Ohqvh7kHnn7XJO8gW1jI5RLLcMdx+vxdaA0oAJrfX8lmhGKPJyIyau7O6sOEWBRuhu 7P3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903509; x=1784508309; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=6gdpTKYDGWkpZo7LwAVR7yGgxmEhd6vKt3oy8Wm/Fv8=; b=RuXBkBubOstxrE6myd0FBGPvl6VllF8TxBn9JgzZAfAPF+2wCDa9Svrc0wlUE9gTLH e7at1iuwS05elQSZorsOMeGWwCxeR6KT4zDYIzv8phTzZM93XXTiw6+/SxB4pgBWYHO+ xBOyCP/FQE0YM9g15KhpoqPMoz9yvd8aqM17Go3ZTAtV4iY8MIZsUYWqFcz58ymQlhBt 3Wn2e2Y0IdLyOBP+/uFeZB5RTa3NByiAFM4DxiS9JihEHX9IwzrVxubWxBH+6H+Eho1u LvBoVORnNhM2+myPlD6RKNpA/eW2xZcS8xGIBhMPwtgaY6M98R5NmOIBYvew+7cLKPDs GAbQ== X-Gm-Message-State: AOJu0YydDYxDxYBkCXFOWItGdgxAXqcPNdlFPkB2EOyytoWwHfGZ79o6 +IRCjIYAMIy865yyeF7ICP24cBQjGO9otOrB45rXbTscvXx6QmW4ZJhGL6WRif4vI3Q= X-Gm-Gg: AfdE7ckajpi/9A1/IlWyfYwlUCQ8sRUL0QFhKDy7Or3oq3jW0lVpgOSY7BfLdkqVcJx Se1P8Km91Ktardqe/+ow/DxWUF1+KV14BeETdGRf36zQGiW92dqYB06bNga/7tGXkw2Q+DPiWcM wMRhCHc9v02+CwWWgqq4CMu2NwWCqvSMceg8ZueZx0KyZpmkwlpjiGcOY6sr+K6A1m+PQbbrCmH XBgBsxrOHMAy7L1DBfQiCPZWKjI6NUk8O00CPYyDs/nxw6GXTMRX/i83BDD33I/KhKCBzlVBOkM m4IF0VIkawB33ytCKqVOOfyUz/5PoDlchWDcWrX4wO63VfhymKlat5UOn5jo9JIrNa5BqnfvP7l 5yyTYl/6dSdyJgsxqzgPK5qJ1822Ce2uoY4aUrMdozxNy1/fBxh6iYOrkvGRlIDUGvevUHQdiFd u6U2Jn/Ig52u4Qzx96Hnfz1JJaV6iElQNqye3NL/00C2SA09t3w0Q9OT22B3STPFwyNCyio21ng HH8Pxju4g7p39TyOKy/dePIUsj8fXtA+FeBh3wr2Xe8OJ0/O36/h2S6JLE7mbiZS836KeQfUpav p5SwlHcZYZpeYcAluAqaEhc8mz4IXcOZX2RHaYeM X-Received: by 2002:a05:6300:2189:b0:3bf:8a0e:dd99 with SMTP id adf61e73a8af0-3c0f0990bcfmr12420781637.17.1783903508907; Sun, 12 Jul 2026 17:45:08 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:07 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/8] bpftrace: link test data source binary without host runtime Date: Sun, 12 Jul 2026 17:44:57 -0700 Message-ID: <20260713004502.716970-3-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> References: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128145 The build host HOME directory check recently added to OE-Core's buildpaths QA test flags the ptest gtest binary: WARNING: bpftrace-0.25.1-r0 do_package_qa: QA Issue: File /usr/lib/bpftrace/ptest/tests/bpftrace_test in package bpftrace-ptest contains a reference to the build host HOME directory. [buildpaths] WARNING: bpftrace-0.25.1-r0 do_package_qa: QA Issue: File /usr/lib/bpftrace/ptest/tests/.debug/bpftrace_test in package bpftrace-dbg contains a reference to the build host HOME directory. [buildpaths] cmake/BuildBPF.cmake links the intermediate DWARF carrier binary data_source_exe with the plain build host gcc, which bakes the host dynamic loader's absolute path into the PT_INTERP segment. With a distro gcc that is an innocuous /lib64/ld-linux-x86-64.so.2, but when the host toolchain is a buildtools-extended/SDK gcc installed under the build user's home directory (as on the autobuilder workers), it is a $HOME-prefixed path like /srv/pokybuild/.../buildtools/sysroots/x86_64-pokysdk-linux/lib/ld-linux-x86-64.so.2 The executable is then embedded byte-for-byte into bpftrace_test via embed()/xxd (tests/data/CMakeLists.txt), so the path ends up in the test binary's .rodata, triggering the bpftrace-ptest warning. And because cmake/Embed.tmpl declares the embedded blob as a constexpr array, gcc additionally copies its contents into .debug_info as DW_AT_const_value, which is how the same string survives objcopy --only-keep-debug into the split debug file, triggering the bpftrace-dbg warning. This is the same embedding mechanism that previously leaked TMPDIR paths, fixed for the compile step by the DEBUG_PREFIX_MAP patch; the link step was still leaking. The tests only write this binary to a temp file and use it as a uprobe target (tests/dwarf_common.h), parsing its DWARF and symbols; it is never executed. So link it with -nostdlib -no-pie -Wl,--entry=0: no interpreter, no host crt objects, no dynamic segment, and thus nothing host-specific in the embedded blob. Function symbols, DWARF type information and the pahole -J BTF encoding step are unaffected, and the field_analyser_dwarf ptests still pass. Because the object is now linked -nostdlib it must not reference the libc stack-protector runtime. Host gcc toolchains that default to -fstack-protector-strong (e.g. Debian/Ubuntu and the Yocto autobuilder workers) otherwise leave an undefined reference and the link fails: ld: data_source.o: in function `main': data_source.c:212: undefined reference to `__stack_chk_fail' collect2: error: ld returned 1 exit status Compile the object and link the binary with -fno-stack-protector; the canary is irrelevant to a DWARF/BTF carrier that is never run. Signed-off-by: Khem Raj --- ...make-link-data-source-binary-without.patch | 78 +++++++++++++++++++ .../bpftrace/bpftrace_0.25.1.bb | 1 + 2 files changed, 79 insertions(+) create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch new file mode 100644 index 0000000000..7a69d0f8c1 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch @@ -0,0 +1,78 @@ +From: Khem Raj +Date: Thu, 2 Jul 2026 15:30:00 -0700 +Subject: [PATCH] cmake/BuildBPF.cmake: link data source binary without host + runtime + +The `bpf()` helper links the intermediate DWARF carrier binary +(data_source_exe) with the plain host gcc: + + ${GCC} -g -o data_source_exe data_source.o + +and the resulting executable is then embedded byte-for-byte into +bpftrace_test via embed()/xxd (tests/data/CMakeLists.txt). Linking it as +a regular dynamic executable bakes host-toolchain artifacts into it: + + * PT_INTERP: the absolute path of the host toolchain's dynamic + loader. With a vendored/SDK toolchain (e.g. Yocto + buildtools-extended installed under the build user's home) this is + an absolute build-host path such as + /srv/pokybuild/.../buildtools/sysroots/x86_64-pokysdk-linux/lib/ld-linux-x86-64.so.2 + * crt startup objects (crt1.o, crti.o, crtbegin.o) including whatever + debug info the host libc was built with. + +Since the embedded blob carries these strings into the packaged test +binary, the build is not reproducible across hosts and leaks build host +paths, flagged by OE's buildpaths QA check: + + WARNING: bpftrace-0.25.1-r0 do_package_qa: QA Issue: File + /usr/lib/bpftrace/ptest/tests/bpftrace_test in package bpftrace-ptest + contains a reference to the build host HOME directory. [buildpaths] + +The binary only serves as a DWARF/BTF container: the tests write it to +a temp file and use it as a uprobe target (tests/dwarf_common.h), which +parses debug info and symbols but never executes it. So link it with +-nostdlib -no-pie: no interpreter, no dynamic segment, no host crt +code. -Wl,--entry=0 silences the "cannot find entry symbol _start" +warning. All function symbols, DWARF type information and the +pahole -J BTF encoding step are unaffected. + +Because the object is now linked -nostdlib, it must not emit references +to the libc stack-protector runtime. Host gcc toolchains that default to +-fstack-protector-strong (e.g. Debian/Ubuntu, the Yocto autobuilders) +otherwise leave an undefined reference and the link fails: + + ld: data_source.o: in function `main': + data_source.c:212: undefined reference to `__stack_chk_fail' + collect2: error: ld returned 1 exit status + +Compile the object (and link the binary) with -fno-stack-protector; the +canary is irrelevant to a DWARF/BTF carrier that is never run. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + cmake/BuildBPF.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/BuildBPF.cmake b/cmake/BuildBPF.cmake +index cb8cd68..8aa059f 100644 +--- a/cmake/BuildBPF.cmake ++++ b/cmake/BuildBPF.cmake +@@ -90,7 +90,7 @@ function(bpf NAME) + OUTPUT ${ARG_OBJECT} + DEPENDS ${ARG_SOURCE} ${ARG_DEPENDS} + # See above: fresh compilation and the use of `gcc`. +- COMMAND ${GCC} -Wno-attributes -g -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} ++ COMMAND ${GCC} -Wno-attributes -fno-stack-protector -g -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} + COMMAND cmake -E env LLVM_OBJCOPY=${LLVM_OBJCOPY} ${PAHOLE} -J ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} + VERBATIM + ) +@@ -107,7 +107,7 @@ function(bpf NAME) + add_custom_command( + OUTPUT ${ARG_BINARY} + DEPENDS ${ARG_SOURCE} ${NAME}_gen_object +- COMMAND ${GCC} -g -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_BINARY} ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} ++ COMMAND ${GCC} -g -fno-stack-protector -nostdlib -no-pie -Wl,--entry=0 -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_BINARY} ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} + COMMAND cmake -E env LLVM_OBJCOPY=${LLVM_OBJCOPY} ${PAHOLE} -J ${CMAKE_CURRENT_BINARY_DIR}/${ARG_BINARY} + VERBATIM + ) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb index 62e0c17f9d..7daf02ba1c 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.25.x;protocol=http file://run-ptest \ file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ file://0001-cmake-BuildBPF.cmake-introduce-DEBUG_PREFIX_MAP.patch \ + file://0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch \ " SRCREV = "e491811e5d648288c01f42ce087967b271f504a0" From patchwork Mon Jul 13 00:44:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92363 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8A68C44506 for ; Mon, 13 Jul 2026 00:45:15 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.1210.1783903510847488828 for ; Sun, 12 Jul 2026 17:45:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=gD+hgWOA; spf=pass (domain: gmail.com, ip: 209.85.215.179, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-ca2fad0ae38so1909280a12.3 for ; Sun, 12 Jul 2026 17:45:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903510; x=1784508310; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FfsuynBHS/ClgndzU28nRc3+nWj7GReSYjw/+iP/a9s=; b=gD+hgWOAFZf18Rwe131GIiCcxHRRJVuk1Cze1M2t3bDu4z8CAfm0EEPj+dHyrSpcRI 5dksHsOHEOewroKodtj9/GPHM3H3aplvjbTsKFNycrDa7YftVqBRoH1SHhsGsPd+256w s8ZEgqoe5VDW+4P0qQxtboZ3gT38ekCGEUljO6EA51syCjZwlWMxVz7MrX0Amebb92yq kmIvHQsbwEWcjacSq4db09XHkaCExrJop7w0tqBzwnBX3haU7GRQ418QT4z4+Fn5csrm Q3jvGH69R+XMe1VWK4bwP513wyLGJzVrtS2QfwqnHkSSTCTMHLoY+oNzJW9HR3yhU3f2 1Bcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903510; x=1784508310; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=FfsuynBHS/ClgndzU28nRc3+nWj7GReSYjw/+iP/a9s=; b=YYP1aPsURE2OWveWveFCKxkG9ULjIqMdGRYL89EMafEYLa7CHeNRYFNLUIA2jmNb2z zre4OA514umRPRbyaDMLUYmqU1AIlMdCmWAvI3EaoE66pFQBWLuxAgMJiGpfhEDXf9Us o4ddHvdD21TNm/ctUi1PEWtJ5bClyyXOrq/lF4ubmOw2K9ypLkcMKKQ91Hbwbf+YVEoE oN5GGYhsJlBEm/OEBiMNVraeej8ZIfnn6KLuboFMeVlHdCHOrs5hdZXxaV8LeRDAkZ0W KWQjt5FJfhVH/GHhArmS7GvrmtjOGbFauX8FKEamlAyiqdOh44JCnGKdWsGTfGWCGVSG 1pKg== X-Gm-Message-State: AOJu0YzfH0elkLAkAUewhZdRDLIXMj275YgcZ7RwVzKmvTMTKkAzRh0l asjRvNW15ods8jk5CDpVas15+YbrjOxHYkJmZ9ott8slqyqJiDng1xdcJl9Qh5vDxzk= X-Gm-Gg: AfdE7ckC2YPwgLqrezxgVDnIPZPy9LO5Uz8wvva+X/GUDDEMNyhuUrX+vRvOEbqf/mU JvDOsluoptpMYJt9MakXejz87dJNgYt9x15XRZ/aLoBd5xWvtItycCNJlZQ3BpjfWeZRnvovdol h1vdnyYycvT0/olft5DGJGdIe8/WweS2uhdnCfldzZl65enn0a5PnAHYnfLn5uJTNFv8UXBBOsD S2HQ/lO9GCKMke34rKvvFwg1XUXVtuhF0R7HHYhOrKZaia8lHdIrRmhysBPhh2f3iKBeO5bdm62 5kkzmirnlnceW4zzpHgngkmslrKmvdNfuD57ezR6HTpPzQYKbx6w9nhJV7bskwVt/PDXvZpXYdA GkhIibYKTRu8XLj5Jd2XW4Z4+9V6bG90BUhqrg7byzBFlv4pcYasAWoem2NsaxnuPJXsJfZ7IRW vBWBtbClQs6kTiE0kIGsdERQwqqm7fM6SQ557bRp6YWuPlsUe2MS7Oncf4HP9jfTDhk/tZDWJE0 vQnVPqJxCwViiuknJ4tSRcQ5Zf1R9DFaQWpT0qJX4LRTzqtjqIdCAuGxD6+bUF6C2AclTYsvkxL 8TAoambe6Jf1x8EjLypPWc7bDL6kpg== X-Received: by 2002:a05:6a21:7a43:b0:3c0:9c19:65b4 with SMTP id adf61e73a8af0-3c110a7b347mr7905179637.76.1783903510040; Sun, 12 Jul 2026 17:45:10 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:09 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , "Claude Opus 4.8 (1M context)" Subject: [meta-oe][PATCH 4/8] sysdig: Use LuaJIT headers to match the linked LuaJIT library Date: Sun, 12 Jul 2026 17:44:58 -0700 Message-ID: <20260713004502.716970-4-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> References: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128146 csysdig fails to link when stock Lua is also present in the sysroot: ld.lld: error: undefined symbol: luaL_openselectedlibs >>> referenced by chisel.cpp:1190 ld.lld: error: undefined symbol: lua_pcallk ld.lld: error: undefined symbol: lua_setglobal sysdig's chisel code does #include "lua.h" and links against LuaJIT (lua${JIT}), but the recipe-sysroot also carries stock Lua headers (openembedded-core lua installs lua.h into ${includedir}). Those headers win the include search over ${includedir}/luajit-2.1, so the chisel objects are compiled against stock Lua while the binary links libluajit-5.1.so. In Lua >= 5.4.4 luaL_openlibs is a macro for luaL_openselectedlibs and lua_setglobal/lua_pcallk are real symbols, none of which LuaJIT (a Lua 5.1 ABI) provides, hence the undefined references. -DLUA_INCLUDE_DIR does not help: sysdig's luajit.cmake only consults it in its stock-Lua fallback, not when it finds LuaJIT. Prepend ${STAGING_INCDIR}/luajit-2.1 to CFLAGS/CXXFLAGS. These land in CMAKE_CXX_FLAGS, which precede CMake's generated -I includes, so LuaJIT's lua.h is found first and matches the linked library. Co-Authored-By: Claude Opus 4.8 (1M context) Signed-off-by: Khem Raj --- meta-oe/recipes-extended/sysdig/sysdig_0.39.0.bb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.39.0.bb b/meta-oe/recipes-extended/sysdig/sysdig_0.39.0.bb index 6d754b9bd0..bea66ad17c 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_0.39.0.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_0.39.0.bb @@ -62,9 +62,18 @@ EXTRA_OECMAKE = "\ -DCREATE_TEST_TARGETS=OFF \ " +# sysdig's chisel code does #include "lua.h". The recipe-sysroot also carries +# stock Lua headers (openembedded-core lua installs lua.h into ${includedir}), +# which are ABI-incompatible with the LuaJIT library sysdig links against: in +# Lua >= 5.4.4 luaL_openlibs is a macro for luaL_openselectedlibs and +# lua_setglobal/lua_pcallk are real symbols, none of which LuaJIT provides. +# sysdig's luajit.cmake only honours LUA_INCLUDE_DIR in its stock-Lua fallback, +# not when it finds LuaJIT, and the LuaJIT include dir does not win the search +# order, so lua.h resolves to the stock header and the link fails. Put the +# LuaJIT include dir first so its lua.h is used and matches the linked library. #Add include dir to find driver_config.h -CXXFLAGS:append = " -I${WORKDIR}/driver_Make/driver/src" -CFLAGS:append = " -I${WORKDIR}/driver_Make/driver/src" +CXXFLAGS:append = " -I${STAGING_INCDIR}/luajit-2.1 -I${WORKDIR}/driver_Make/driver/src" +CFLAGS:append = " -I${STAGING_INCDIR}/luajit-2.1 -I${WORKDIR}/driver_Make/driver/src" #To fix do_package QA Issue do_compile:append() { From patchwork Mon Jul 13 00:44:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92368 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4774C44507 for ; Mon, 13 Jul 2026 00:45:15 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.1186.1783903512409545662 for ; Sun, 12 Jul 2026 17:45:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=RIm0XdL5; spf=pass (domain: gmail.com, ip: 209.85.215.182, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-c999f162c9aso1366670a12.3 for ; Sun, 12 Jul 2026 17:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903512; x=1784508312; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=AQf1CAUNAtnIVfjLPx88qIGR+2f318ab9r/g6rSng0g=; b=RIm0XdL5tdnfCaSnJRZBcvwUMgO8kb84z8ad58CaUEMh/juyMWnm/8T+sq/4EDvDJO CfCkw4CCMMvCWYYipA8PpW6K1O2tZcA5ipZM4qDg0L1KGW1ARxEPMawh7ED5MdVQSVOB Cd5n4SxdINRHd98/gaZBk4E6sTk6qZkdIC7cKJ5JTPX5q158GqbcquR9ItHDz+POgKL6 HPYBfQemYvnAatA66r3sGK2zAXYum9J0FBtKYwfsTYtRHz7YDKSl75DTwtAAZ9O8Xq80 XGM3TO5pspUkpH9GFiRwcmJPJYAZb7q3bgEpmaAD3vspmV/+23nLfpWUZSU5gziwr1Hw nqlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903512; x=1784508312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=AQf1CAUNAtnIVfjLPx88qIGR+2f318ab9r/g6rSng0g=; b=ZXFthqDH9OR341etL7dHjxFRJLmhEyf9w8DlmeA7A3wW43dVMSYWvreVtiJ9/77540 xIRMcwRrgsB3VK3L6nVUW2ekj3OrX5xSRUlwzYwVdZ5VgE5AVdJeMCE5jrBMRrHGXuEx th7vJy9VEwry7x+Jc5+MF7ueivjjaYjTQ/MU5RVCcIqvOUKh6+2SwnOn/WIf9jWVkyg5 ZWuKWsSqtCrkKUp/g8nhSCEqOUOcdEOZ+ol3Y8xKvWrKmEe5y3GjRvciQ+/8Ilu9AUrG 8DngYU4KwTi6ou5nUIRhR3b+lZIprVKQzIIZ2C5K8uh36oBEcTeonWBBs+jZGKMtSSpA iofw== X-Gm-Message-State: AOJu0Yzq5HaVXjoDwDBMzgJqd2EtstZvE6dYNeVFj4g7f8qch3Y1ZGO1 KUC5nEtRynaMzJvX2bUptUgtXBiDVX2+ffzOWWcjaxFxcXCWJ0JvA7WFHTk3T3LZLYA= X-Gm-Gg: AfdE7ckzOnQLuMnQ5NFqwvsC+YVUXy0lrezLSxOhAU5VjzrSaJKSJzr41reevw6bmXs JaSOzUtFgLyj4L/MH4I0Fopylk6lkEI/YsvK934ypgP1qMVlRo9HU9H0E0E5NwhJ6O2w4MEqVp4 gs9b/ObEnlO4cNz2DbGSWI+RvhKGPCRlDEpNjYAdAmvQJYHIjxgNR/NIiz9vHuUd3n4zWD20qq/ R+ni9o3TP9KJQYB2gkN3R0qeSPxbnzRau+KBY/DSyk+z0qg4Csr++vmmvK+Nw4VdOBiaVK3xqm2 y4GW62Ep6Sxuo3WE3sL7CQ4fDz+tOf7U5dGaP7y/VmIeb0iG8ffbNQUSHbdjFog90Sfj+xmlloV V5PjCz35iPJWCyEolNsUcIdXaGyhp8r0fP6cyXVSLvofPpA7W/e5wa+LboVyfOoVIR1p/eUohri Pn9V15Tx0g7+VTHWVkc7YFIhGfr3PFVUl9oaX3Fngglcom6KhKHYaePH1CU0EhmyZsFNCFf3e1J lxaD2xaiz5jXjam3VXpfuhPH/PAPxwicpnXn9cQDT5uDn/JTjG28RV53t6jEpMdxz3VStf837Cx TpORD2RbgG8EJ7ZO4aawot9t5u2sww== X-Received: by 2002:a05:6300:91:b0:3bf:9e25:1a17 with SMTP id adf61e73a8af0-3c110a0f8d3mr7030590637.12.1783903511583; Sun, 12 Jul 2026 17:45:11 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:11 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 5/8] gerbera: fix build against fmt 12.2.0 Date: Sun, 12 Jul 2026 17:44:59 -0700 Message-ID: <20260713004502.716970-5-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> References: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128147 fmt 12.2.0 turns into a shim that only pulls in , which no longer declares fmt::format() and no longer drags in transitively. gerbera 3.0.0 relied on both, so do_compile fails first with: src/exceptions.cc:37:31: error: no member named 'format' in namespace 'fmt' and, once that is addressed, with a second wave of: src/util/thread_runner.h:194:68: error: no member named 'strerror' in namespace 'std' src/content/inotify/mt_inotify.cc:163:13: error: no member named 'memcpy' in namespace 'std' src/util/url_utils.cc:144:24: error: no member named 'strchr' in namespace 'std' Add two backport patches: * 0001 switches the central headers exceptions.h and search_handler.h from to (upstream commit 9507706136fd). * 0002 adds an explicit #include to every translation unit that uses std::strerror/std::memcpy/std::strchr (based on upstream commit 7caa9ae9ebf5, extended to cover all affected files in this release). Neither fix is in any released gerbera tag (both are master-only), so a version bump would not help; backporting is the least invasive option. Signed-off-by: Khem Raj --- ...-against-fmt-12-include-fmt-format.h.patch | 53 +++++ ...-cstring-for-std-strerror-std-memcpy.patch | 204 ++++++++++++++++++ .../gerbera/gerbera_3.0.0.bb | 5 +- 3 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-build-against-fmt-12-include-fmt-format.h.patch create mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera/0002-include-cstring-for-std-strerror-std-memcpy.patch diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-build-against-fmt-12-include-fmt-format.h.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-build-against-fmt-12-include-fmt-format.h.patch new file mode 100644 index 0000000000..eaaf7869e5 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-build-against-fmt-12-include-fmt-format.h.patch @@ -0,0 +1,53 @@ +From 9507706136fd0000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 8 Jul 2026 00:00:00 +0000 +Subject: [PATCH] fix build against fmt 12: include fmt/format.h + +Since fmt 11, is a thin shim that only pulls in +and no longer declares fmt::format() unless FMT_DEPRECATED_HEAVY_CORE is +defined. fmt 12.2.0 finishes the job and the build fails with: + + src/exceptions.cc:37:31: error: no member named 'format' in namespace 'fmt' + : std::runtime_error(fmt::format("{}: Error: {}", message, userMessage)) + +Include in the central headers that expose fmt::format() +to the rest of the tree (exceptions.h via throw_std_runtime_error, and +search_handler.h) so all consumers see the declaration again. + +Backport of gerbera commit 9507706136fd. + +Upstream-Status: Backport [https://github.com/gerbera/gerbera/commit/9507706136fd] +Signed-off-by: Khem Raj +--- + src/exceptions.h | 2 +- + src/database/search_handler.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/exceptions.h b/src/exceptions.h +index 1111111..2222222 100644 +--- a/src/exceptions.h ++++ b/src/exceptions.h +@@ -34,7 +34,7 @@ + #ifndef __EXCEPTIONS_H__ + #define __EXCEPTIONS_H__ + +-#include ++#include + #include + #include + +diff --git a/src/database/search_handler.h b/src/database/search_handler.h +index 3333333..4444444 100644 +--- a/src/database/search_handler.h ++++ b/src/database/search_handler.h +@@ -32,7 +32,7 @@ + #include "util/tools.h" + + #include +-#include ++#include + #include + #include + #include +-- +2.43.0 diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0002-include-cstring-for-std-strerror-std-memcpy.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0002-include-cstring-for-std-strerror-std-memcpy.patch new file mode 100644 index 0000000000..14742f4727 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0002-include-cstring-for-std-strerror-std-memcpy.patch @@ -0,0 +1,204 @@ +From 7caa9ae9ebf50000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 8 Jul 2026 00:00:01 +0000 +Subject: [PATCH] include for std::strerror / std::memcpy / std::strchr + +Several translation units use std::strerror(), std::memcpy() and +std::strchr() but relied on being pulled in transitively +through (and other headers). With fmt 12 the fmt headers no +longer drag in , so the build fails with: + + src/util/thread_runner.h:194:68: error: no member named 'strerror' in namespace 'std' + src/content/inotify/mt_inotify.cc:163:13: error: no member named 'memcpy' in namespace 'std' + src/util/url_utils.cc:144:24: error: no member named 'strchr' in namespace 'std' + +Include explicitly in every file that uses these functions. + +Based on upstream gerbera commit 7caa9ae9ebf5, extended to cover all +affected translation units in this release. + +Upstream-Status: Backport [https://github.com/gerbera/gerbera/commit/7caa9ae9ebf5] +Signed-off-by: Khem Raj +--- +--- a/src/main.cc ++++ b/src/main.cc +@@ -40,6 +40,7 @@ + #define GRB_LOG_FAC GrbLogFacility::server + + #include "config/config_definition.h" ++#include + #include "config/config_manager.h" + #include "config/config_val.h" + #include "config/grb_runtime.h" +--- a/src/database/sqlite3/sqlite_database.cc ++++ b/src/database/sqlite3/sqlite_database.cc +@@ -33,6 +33,7 @@ + #define GRB_LOG_FAC GrbLogFacility::sqlite3 + + #include "sqlite_database.h" // API ++#include + + #include "cds/cds_enums.h" + #include "config/config.h" +--- a/src/database/postgres/postgres_database.cc ++++ b/src/database/postgres/postgres_database.cc +@@ -25,6 +25,7 @@ + + #ifdef HAVE_PGSQL + #include "postgres_database.h" // API ++#include + + #include "cds/cds_enums.h" + #include "config/config.h" +--- a/src/iohandler/mem_io_handler.cc ++++ b/src/iohandler/mem_io_handler.cc +@@ -33,6 +33,7 @@ + #define GRB_LOG_FAC GrbLogFacility::iohandler + + #include "mem_io_handler.h" // API ++#include + + #include "exceptions.h" + +--- a/src/iohandler/process_io_handler.cc ++++ b/src/iohandler/process_io_handler.cc +@@ -33,6 +33,7 @@ + #define GRB_LOG_FAC GrbLogFacility::iohandler + + #include "process_io_handler.h" // API ++#include + + #include "content/content.h" + #include "exceptions.h" +--- a/src/iohandler/curl_io_handler.cc ++++ b/src/iohandler/curl_io_handler.cc +@@ -34,6 +34,7 @@ + + #ifdef HAVE_CURL + #include "curl_io_handler.h" // API ++#include + + #include "config/config.h" + #include "exceptions.h" +--- a/src/config/grb_runtime.cc ++++ b/src/config/grb_runtime.cc +@@ -22,6 +22,7 @@ + #define GRB_LOG_FAC GrbLogFacility::server + + #include "grb_runtime.h" // API ++#include + + #include "config/config.h" + #include "config/config_definition.h" +--- a/src/util/grb_net.cc ++++ b/src/util/grb_net.cc +@@ -21,6 +21,7 @@ + /// @file util/grb_net.cc + #define GRB_LOG_FAC GrbLogFacility::clients + #include "grb_net.h" // API ++#include + + #include "exceptions.h" + #include "logger.h" +--- a/src/util/grb_fs.cc ++++ b/src/util/grb_fs.cc +@@ -21,6 +21,7 @@ + /// @file util/grb_fs.cc + #define GRB_LOG_FAC GrbLogFacility::content + #include "grb_fs.h" // API ++#include + + #include "exceptions.h" + #include "util/logger.h" +--- a/src/config/setup/config_setup_path.cc ++++ b/src/config/setup/config_setup_path.cc +@@ -25,6 +25,7 @@ + #define GRB_LOG_FAC GrbLogFacility::config + + #include "config_setup_path.h" // API ++#include + + #include "config/config_definition.h" + #include "config/config_options.h" +--- a/src/util/thread_executor.cc ++++ b/src/util/thread_executor.cc +@@ -32,6 +32,7 @@ + /// @file util/thread_executor.cc + + #include "thread_executor.h" // API ++#include + + #include "util/logger.h" + +--- a/src/util/thread_runner.h ++++ b/src/util/thread_runner.h +@@ -28,6 +28,7 @@ + + #include "config/config.h" + #include "thread_executor.h" ++#include + #include "util/logger.h" + + #include +--- a/src/util/string_converter.cc ++++ b/src/util/string_converter.cc +@@ -32,6 +32,7 @@ + /// @file util/string_converter.cc + #define GRB_LOG_FAC GrbLogFacility::util + #include "string_converter.h" // API ++#include + + #include "common.h" + #include "config/config.h" +--- a/src/content/inotify/mt_inotify.cc ++++ b/src/content/inotify/mt_inotify.cc +@@ -41,6 +41,7 @@ + + #ifdef HAVE_INOTIFY + #include "mt_inotify.h" ++#include + + #include "exceptions.h" + #include "util/logger.h" +--- a/src/metadata/metacontent_handler.cc ++++ b/src/metadata/metacontent_handler.cc +@@ -25,6 +25,7 @@ + #define GRB_LOG_FAC GrbLogFacility::metadata + + #include "metacontent_handler.h" // API ++#include + + #include "cds/cds_item.h" + #include "cds/cds_objects.h" +--- a/src/transcoding/transcode_ext_handler.cc ++++ b/src/transcoding/transcode_ext_handler.cc +@@ -33,6 +33,7 @@ + #define GRB_LOG_FAC GrbLogFacility::transcoding + + #include "transcode_ext_handler.h" // API ++#include + + #include "cds/cds_objects.h" + #include "config/config.h" +--- a/src/util/tools.cc ++++ b/src/util/tools.cc +@@ -32,6 +32,7 @@ + /// @file util/tools.cc + #define GRB_LOG_FAC GrbLogFacility::content + #include "tools.h" // API ++#include + + #include "config/config.h" + #include "contrib/md5.h" +--- a/src/util/url_utils.cc ++++ b/src/util/url_utils.cc +@@ -22,6 +22,7 @@ + /// @file util/url_utils.cc + #define GRB_LOG_FAC GrbLogFacility::content + #include "url_utils.h" // API ++#include + + #include "exceptions.h" + +-- +2.43.0 diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.0.0.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.0.0.bb index fdbd91f9b0..a08c31d0c2 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.0.0.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.0.0.bb @@ -3,7 +3,10 @@ Description = "Gerbera is a UPnP media server which allows you to stream your di LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" -SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master;tag=v${PV}" +SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master;tag=v${PV} \ + file://0001-fix-build-against-fmt-12-include-fmt-format.h.patch \ + file://0002-include-cstring-for-std-strerror-std-memcpy.patch \ + " SRCREV = "7846f3dd5d0f848a60d0c3146c3b7290881a8992" From patchwork Mon Jul 13 00:45:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92362 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AACEBC43458 for ; Mon, 13 Jul 2026 00:45:15 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.1187.1783903514347234858 for ; Sun, 12 Jul 2026 17:45:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=nCKpKOCn; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2c7cfa17fedso36664835ad.3 for ; Sun, 12 Jul 2026 17:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903514; x=1784508314; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C9kGdehbCRjFaoT03zDJZ9IeqteOvkBXunnIrTvXhMM=; b=nCKpKOCnyu4EQSgjtPhSM8zsMZcV7pBokNSBsFdzPktbSJEwI8+nGpDlzRv3Zq3nX3 0xptA87ebetSEntC2nYBWA0FSiHsSRAluUTDC4SR855ao5xs/x+E+Ojv3F2ixzpH4MnS LeobRzEK63KL2MvYmA0YxVdNOSPqIwGwPdNH3nOwxvPZ205mGEoxQy485yyxszvfUOsv 6C9MWGc+al5i/L5nYDTIQbaI6jBFGA+kk+N6cmy0oBwwy2jwJRgyPaSfBIg2yuB5+SvV f0lWhpml9LsLfueuNHgFwOADhhSKWmbgmwYvu13qN7DIqZt2nOVkVNeOVv/cKTJjfWOC Xvnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903514; x=1784508314; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=C9kGdehbCRjFaoT03zDJZ9IeqteOvkBXunnIrTvXhMM=; b=ro3WN4ZjBb8ZXuseQOMurKq1eP2pFBVpZDvInwEVXiAW1foxKe3XhWD1PqZ1b7hwaD YiQKEIe5/NWJwPhtmVbZzf2psBrTZzFfu7kXfA+tT6KTZSxDvffhSJWBPvNM5IlY1RWp rYcMzvErIY0jhWmbXgX+48l/VS2t/wFUaCGEqq3GmYKNlkKZH99YjQMMg8MGbpDj5jMU 0XCakXDXVmX8Z+Rfi4rCTN0JYRD+CfQ0D+PzWH0Hx8P/Tw40n3QUiTvBpluQD0bcbJan 1NloWHFdZoq6DttgC6ZzWPqFaPLEcY2fmZukoza05pDW6g+iFRgubuJddcvO2utFbDrB vumA== X-Gm-Message-State: AOJu0Ywz+QgA2dnwr+gi6Djb0Vohg43OgQkqb9mdBFaX09JeQsVNRwAt anCxsLOLYHIrVg1tnwcpVY11UDyDJHlV63O4Ecyoihx8f3rsDx4cacoWiRRhTBiqZXY= X-Gm-Gg: AfdE7cmUAJtIHcANScGggOQ+BvgkeXg6hcdGCYB/FA4I+QUhcs3yXsr+ZUnFpadBox6 EBblG7sgDFHWuPoBgqjPVx2gszvnajULW44yHcOHfzmIKb/cX+RlKXkyCn6gbcg0DBmLNc67G8T 7JGJs8+1lQKheoFC6n8DA9KZXXDEk5rUZlACP0y6Qol4hwlKTYvWWAdEHMiSw25/pgRcLC1IUPE PoToQufBlbmj/sJA2S7GOyandDstCCCTXlCOPhQ+WF8hnKEIQSDG3y1Yqo/Lf8o/RLFCmqURRPM VgvFnvybyTF42eqKTjlalEHoOMaU5TB72YkNvjNTfHdTc7gBKluwZSpGVJoMBtOS1Ol1VhcYGpv RmGiK2EOyKfF+4zODzRktttO3kGuKGiy8jDZ5m/vkWW7RAdPc1a4oCwOpvkk6HMHOFYif5/cFrm hqi2BPUihyDXCJHixfUUsvbzZNFdKqV74TTGSweBpmy9qRATKkwslC/D/dLvvE7t71U7TpVQkDq n6I6ICo8AP11MKVWgLcHm8eb6eDeaQxFD5yZK6ViKvXq//uYCZAp6GLHuWOIbk2s9leEaad9Oze CF0936ovGke9zUW4EvEnPbAMwov7zA== X-Received: by 2002:a05:6a20:2d09:b0:3bf:49c8:f7b with SMTP id adf61e73a8af0-3c1100003e7mr7935550637.13.1783903513675; Sun, 12 Jul 2026 17:45:13 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:12 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 6/8] librav1e: fix nasm-native dependency override for x86-64 Date: Sun, 12 Jul 2026 17:45:00 -0700 Message-ID: <20260713004502.716970-6-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> References: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128148 The DEPENDS append used the raw TARGET_ARCH value "x86_64" as an override: DEPENDS:append:x86_64 = " nasm-native" but OVERRIDES is built from TRANSLATED_TARGET_ARCH, which replaces "_" with "-", so the effective override token is "x86-64". The "x86_64" form never matches and nasm-native is never pulled in, so do_compile fails on x86-64 with: error: Unable to run nasm: No such file or directory (os error 2) Use the correct "x86-64" token (matching the INHIBIT_PACKAGE_DEBUG_SPLIT line right below it) and also add the "x86" variant for 32-bit x86 targets, mirroring dav1d. Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/rav1e/librav1e_p20250902.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/rav1e/librav1e_p20250902.bb b/meta-multimedia/recipes-multimedia/rav1e/librav1e_p20250902.bb index 80ac5d9268..4c03c9417d 100644 --- a/meta-multimedia/recipes-multimedia/rav1e/librav1e_p20250902.bb +++ b/meta-multimedia/recipes-multimedia/rav1e/librav1e_p20250902.bb @@ -7,7 +7,8 @@ inherit cargo_c pkgconfig cargo-update-recipe-crates require ${PN}-crates.inc -DEPENDS:append:x86_64 = " nasm-native" +DEPENDS:append:x86 = " nasm-native" +DEPENDS:append:x86-64 = " nasm-native" SRC_URI += "git://github.com/xiph/rav1e.git;protocol=https;nobranch=1;tag=${PV}" SRCREV = "a2f01b3e233f531c28a20b4c29fb5c9e5d29fa6d" From patchwork Mon Jul 13 00:45:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92366 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27081C4450C for ; Mon, 13 Jul 2026 00:45:16 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.1212.1783903515737480319 for ; Sun, 12 Jul 2026 17:45:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=lO5xN7gP; spf=pass (domain: gmail.com, ip: 209.85.215.180, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-ca957432c7fso1791311a12.1 for ; Sun, 12 Jul 2026 17:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903515; x=1784508315; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C4yX7Nuozxd+fKDI1PlYYkgthVkwZn3vbHpy5pDAt4E=; b=lO5xN7gPT5EjrniFa9G4doLKQ9JLQ89Xh5I9gt++qL/iCEgSju7HUb5I+nQyI9LeEW 4k2tjo8qwCkO2XkTIkM5NXwo0ElRW1ph0wMhG7in0NJLMd7g1ZRiWKQOppgHepkWaqmu Ya/zTtJG2ntcD62ZAXd+tObBRVu4e8Bhyb7lWWGef3xfyfatU0QI/LdhoBU7hD77YpM6 OatXZKkLKAMHCT8lqJWd3yIK0jcITUsPtcZN0jrSXijY4HOqb4umhT3NfIAZnKsWDLiw pY+uXSOIXvHkb3eKjvL7f7sv6zK0B4DkQy6sn/yNkRd9Apj6VaS6THddPAluE6DAhU5d Fc/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903515; x=1784508315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=C4yX7Nuozxd+fKDI1PlYYkgthVkwZn3vbHpy5pDAt4E=; b=i8Za1pyYpl3wMA/HSPSMOYh4MdQKDuNPl6om2Y+8teH4ix9VYoe1rRZQHu1awHVNum YT6L1eUOFt3ifJO/uKdTGnZBcFma2/QkMpXiRw7G6pgMDRLvg1qBD5WrfzJNW+Zdz/Hj YoPgFOLnWCyk3Ws7rDXdV67kqyCZ6AP5USXLV8IF9vRElMmBrWM/QC2rRLIZf8MBdU1D W1N4zWvuXSktm6KsBjXAfCQo8DeHU5GMjgScd9UWBs2B+ejFpBuQifhwTjiRPf+xw7E3 BOQrViVTtOyrdSWIaV6bld2S+Xumb1feplQXDFHlj8Sf6uS5g71Rtx5fLphC1fVul09N owtQ== X-Gm-Message-State: AOJu0YyOlMGHcJYKp1E1ufvKN4W3Ohvy6tzFd6hVdGWAWz+mUqB0HfbQ VV8uR3xDNIX5egs7422lHrVVjiYE3PWPA7GRQJwBbWZiqfmMLmOGn7oUdnzGrbQsMVg= X-Gm-Gg: AfdE7cm0KnKUEFYI1qtyIaZJcbfSyrxowBEc8lArQNw4sDmzw04rCuJ3xbMq75i2xCT zhI4b8xRaeVwG0jTFvw/gMwBbZSIonPSxMxqjeUeykvRJN+G3RlGYb0KUoayIFaYQPYFLrEnlW/ HNJz8arc4/Cl7wYwwShEk2/TckqnT2BkLgmpgUx3gIdBiykSwwK2fVIHqnOyq4aZy1BKv+rT1zJ nSYFofLXTPKiEUtGO5y67AqdNLpQ+aFy+/FJwjzDi3gAFsGGVii7gs0ljtRlK2IKmZQYYcp5W4c HoWT4xbl2iMBcX5ail1fpcEKUeRM9JDBdjpYLt0MblZjBIq+fW2hJu727wbN3Uku00JV/HiJ9+z FHD0JZ+yyNMe4tZMVvjr+mxaqBjkBUpt2VZpSXG/OcmLuHGn98PA08JzqAhGMoWAHTvBiNRIGAW yy1LtDUtu84J8dR74lC3ybN1DAeKjFCya+70UJt9F1eb5ZXzPGNZnu+YtJarvafg8LP0xaamWS4 MBDrTN42t/+NQPzyfvVbuQLTZHt+pJYyVzC3Y+YwcPJgF2c3s0m2bS/UpncAuWK0hVDJuVTnmY7 3aPe3A07y910BiaRRpVg+M4emtZwCg== X-Received: by 2002:a05:6a21:113:b0:3aa:c93b:625b with SMTP id adf61e73a8af0-3c110762fd4mr7527692637.3.1783903514992; Sun, 12 Jul 2026 17:45:14 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:14 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 7/8] bpftrace: fix patch context so -fno-stack-protector applies to test object Date: Sun, 12 Jul 2026 17:45:01 -0700 Message-ID: <20260713004502.716970-7-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> References: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128149 The 0003 patch that links the data_source test carrier binary without the host runtime also adds -fno-stack-protector to the object compile line, needed because host gcc toolchains default to -fstack-protector-strong and the -nostdlib link then fails with: data_source.c:212: undefined reference to `__stack_chk_fail' However patch 0001 (DEBUG_PREFIX_MAP) runs first in SRC_URI and rewrites the same compile line to insert ${DEBUG_PREFIX_MAP_LIST}, so 0003's first hunk no longer matched the tree and the -fno-stack-protector flag was silently dropped from the object compile (it only landed on the link line). Rebase 0003's first hunk onto the post-0001 context so the flag is applied where it is needed. Signed-off-by: Khem Raj --- ...cmake-BuildBPF.cmake-link-data-source-binary-without.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch index 7a69d0f8c1..695f709d6b 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0003-cmake-BuildBPF.cmake-link-data-source-binary-without.patch @@ -62,8 +62,8 @@ index cb8cd68..8aa059f 100644 OUTPUT ${ARG_OBJECT} DEPENDS ${ARG_SOURCE} ${ARG_DEPENDS} # See above: fresh compilation and the use of `gcc`. -- COMMAND ${GCC} -Wno-attributes -g -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} -+ COMMAND ${GCC} -Wno-attributes -fno-stack-protector -g -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} +- COMMAND ${GCC} -Wno-attributes -g ${DEBUG_PREFIX_MAP_LIST} -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} ++ COMMAND ${GCC} -Wno-attributes -fno-stack-protector -g ${DEBUG_PREFIX_MAP_LIST} -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} COMMAND cmake -E env LLVM_OBJCOPY=${LLVM_OBJCOPY} ${PAHOLE} -J ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} VERBATIM ) From patchwork Mon Jul 13 00:45:02 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 92369 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18067C43458 for ; Mon, 13 Jul 2026 00:45:26 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.1213.1783903517147767441 for ; Sun, 12 Jul 2026 17:45:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=NvVFyA8/; spf=pass (domain: gmail.com, ip: 209.85.215.169, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c95d0a54ea5so1764784a12.0 for ; Sun, 12 Jul 2026 17:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783903516; x=1784508316; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4v0zQmiByjhZ6dIHqEN3HKVcLkVtiAYjEyH6cCeF2Rk=; b=NvVFyA8/OYj+BgVzgOEHwY1DNtytvekz+MG9BAG1Tz+wEHuitadYgqhcr8+D/gTFcy jEVtHn6GTY4Bcd9gDx7T/isstc/2f8Atxupgm/08UjbHGXNynN0nTpNSMyuHjijeRMuQ w1u0m+eH3KDHUoPvE1ZI3TCLSfuf/AQQpMSZVVp9a0ERa0vpmjjaJQJhLKggViJ+7Qmt Dr2x4786tzQyY0Hnbp3tvKVUELkfyekQo6Z/UrZemZZISZ7VDy57HOuCp0gtuX2X/13C MvAaWk/e9k6oW+XKUjmOZlkMDBbWNhsUI8nRfeySdGBuA+lPjmwWB3u5HNDcPdI4R9Ga Kywg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783903516; x=1784508316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4v0zQmiByjhZ6dIHqEN3HKVcLkVtiAYjEyH6cCeF2Rk=; b=EwCeAIYuusDm6Xhx1vrohu6M5pf+EuW2ChV6Nyku0w2KvZFBewC3ba3PPscxERqzl8 q4NIv9Ly/rvolPTxHGrIfdDX/oK57levOAkpe+yWCNeK+shXXbStEknWWdIaahxv2Umt QQT9fspcCfj5e30J2g8FyZJYUnjFzIZ+dMkaaT41YmngerWE/L5qZgT+uUbku0vQ+18y wevoMznU6PGQacZVerfe8e1TAhx2SWsfgbERrBom8xLdVW8m/1SHy+pRlpXF8ZuIdwWi Q3eA1msv82AWo2kF3y41Yu2mxeaNh+Gy2fQYIW/TPWlbX7SGKl9KNes1pYfPC/IhBtcl 4nig== X-Gm-Message-State: AOJu0YyUv9JAl9vgzg2h3fzE5+zlzLsmX/AfZJe6Znc5yCaGHcxvz36x D/9nPGEURL9QaJ9yiKJ6DE6heKf8SHCgzq9IWVt4Gbbz1cDVY5WRfsLV2fSAYoIqGQM= X-Gm-Gg: AfdE7cnbczDgY95MZZ5VQBz6p28IlN0tyzfzGHe8Ar/njYVqSxu2oweZ6jDPQxRNk1B svgxGdEthzpdlZM+UMqFQvLXPMaqZmwILfCs33j0sZNT2A3VO6cOhhugr5kTRRnYEUu3nlnRaGz npobkwmCLnV5npiPOpqcrVDJDFO5VaU4t5lGE4UixdkFCXV2dbXm3/xS8UDmYxG77xx57LcWoUG S157V4ugjWnBeyTJvBoQdqhhRjpkQDk6hblurISrByzral2R9toi0oUoOZxh+JF5CLUDFTQ7sLD Up2um2HBIK72vgXzrBB1MLS/MfMgoFHYVQx9Y7xt6VwsNbRPnTMmlQwescB3Xhp1K2W1AvLppE0 pSraOMy5/UzOjreMT0RMOWFyVpmInsqFM+ACY+MoMe68gYFL/EXsXyjRi4JwDVAOIZYWh31ZAvl SuP/PvJXI/9jtajjgJS+3vT0xz+dF789fax02/C/MHxsiIOAFYf16FmQuZTkRz3MP+0/laRBUUX tmhSCFnaR4LT4p7j5YsByeMP74wagW9Dj9Oyu3b42Q5eNzt9zd68/TtzF5ymU2hgLPtLbtFqvxQ vxnQPAi0flkEngU7DiDaykJ5RIQt5w== X-Received: by 2002:a05:6a21:6e95:b0:3b4:5c70:ca3e with SMTP id adf61e73a8af0-3c110a65fdcmr7427330637.25.1783903516384; Sun, 12 Jul 2026 17:45:16 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm71206990c88.7.2026.07.12.17.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 17:45:15 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 8/8] mpd: fix build against fmt 12.2.0 Date: Sun, 12 Jul 2026 17:45:02 -0700 Message-ID: <20260713004502.716970-8-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> References: <20260713004502.716970-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Jul 2026 00:45:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128150 Since fmt 12.2.0, is a shim that only includes , which does not declare fmt::format(). Building mpd 0.24.9 against it fails with: src/net/ToString.cxx:80:16: error: no member named 'format' in namespace 'fmt' src/lib/avahi/Publisher.cxx:37:9: error: no member named 'format' in namespace 'fmt' Add a patch that includes directly in the files that call fmt::format(). This mirrors the upstream fix (MPD commits 88d5b5248d71 and 109c26258b9d), extended to the files present in the 0.24.9 release that call fmt::format() but were not covered by those commits. Signed-off-by: Khem Raj --- ...port-use-fmt-format.h-not-fmt-core.h.patch | 208 ++++++++++++++++++ .../recipes-multimedia/musicpd/mpd_0.24.9.bb | 1 + 2 files changed, 209 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-libfmt-12.2.0-support-use-fmt-format.h-not-fmt-core.h.patch diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-libfmt-12.2.0-support-use-fmt-format.h-not-fmt-core.h.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-libfmt-12.2.0-support-use-fmt-format.h-not-fmt-core.h.patch new file mode 100644 index 0000000000..cf5da582c8 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-libfmt-12.2.0-support-use-fmt-format.h-not-fmt-core.h.patch @@ -0,0 +1,208 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 8 Jul 2026 00:00:00 +0000 +Subject: [PATCH] libfmt 12.2.0 support: use fmt/format.h not fmt/core.h + +Since libfmt 12.2.0, is a shim that only includes +, which does not declare fmt::format(). Building against it +fails with: + + src/net/ToString.cxx:80:16: error: no member named 'format' in namespace 'fmt' + src/lib/avahi/Publisher.cxx:37:9: error: no member named 'format' in namespace 'fmt' + +Include directly in the files that call fmt::format(). +This mirrors the upstream fix (MPD commits 88d5b5248d71 and 109c26258b9d) +extended to the files present in this release that call fmt::format(). + +Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/88d5b5248d71] +Signed-off-by: Khem Raj +--- +--- a/src/client/New.cxx ++++ b/src/client/New.cxx +@@ -17,7 +17,7 @@ + #include "Log.hxx" + #include "Version.h" + +-#include ++#include + + #include + +--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx ++++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx +@@ -24,7 +24,7 @@ + #include "util/StringSplit.hxx" + #include "config/Block.hxx" + +-#include ++#include + + #include + #include +--- a/src/db/update/Playlist.cxx ++++ b/src/db/update/Playlist.cxx +@@ -20,7 +20,7 @@ + #include "fs/Traits.hxx" + #include "Log.hxx" + +-#include ++#include + + inline void + UpdateWalk::UpdatePlaylistFile(Directory &directory, +--- a/src/input/plugins/AlsaInputPlugin.cxx ++++ b/src/input/plugins/AlsaInputPlugin.cxx +@@ -27,7 +27,7 @@ + + #include + +-#include ++#include + + #include + +--- a/src/input/plugins/QobuzClient.cxx ++++ b/src/input/plugins/QobuzClient.cxx +@@ -4,7 +4,7 @@ + #include "QobuzClient.hxx" + #include "lib/crypto/MD5.hxx" + +-#include ++#include + + #include + #include +--- a/src/input/plugins/QobuzLoginRequest.cxx ++++ b/src/input/plugins/QobuzLoginRequest.cxx +@@ -6,7 +6,7 @@ + #include "QobuzSession.hxx" + #include "lib/curl/Form.hxx" + +-#include ++#include + #include + + #include +--- a/src/input/plugins/QobuzTrackRequest.cxx ++++ b/src/input/plugins/QobuzTrackRequest.cxx +@@ -5,7 +5,7 @@ + #include "QobuzErrorParser.hxx" + #include "QobuzClient.hxx" + +-#include ++#include + #include + + using std::string_view_literals::operator""sv; +--- a/src/lib/avahi/Publisher.cxx ++++ b/src/lib/avahi/Publisher.cxx +@@ -13,7 +13,7 @@ + #include + #include + +-#include ++#include + + #include + +--- a/src/lib/nfs/FileReader.cxx ++++ b/src/lib/nfs/FileReader.cxx +@@ -10,7 +10,7 @@ + + #include // for struct nfs_stat_64 + +-#include ++#include + + #include + #include +--- a/src/output/Init.cxx ++++ b/src/output/Init.cxx +@@ -24,7 +24,7 @@ + #include "util/StringAPI.hxx" + #include "Log.hxx" + +-#include ++#include + + #include + #include +--- a/src/output/plugins/httpd/HttpdClient.cxx ++++ b/src/output/plugins/httpd/HttpdClient.cxx +@@ -13,7 +13,7 @@ + #include "util/StringSplit.hxx" + #include "Log.hxx" + +-#include ++#include + + #include + +--- a/src/output/plugins/httpd/IcyMetaDataServer.cxx ++++ b/src/output/plugins/httpd/IcyMetaDataServer.cxx +@@ -5,7 +5,7 @@ + #include "tag/Tag.hxx" + #include "util/TruncateString.hxx" + +-#include ++#include + + #include + +--- a/src/song/AddedSinceSongFilter.cxx ++++ b/src/song/AddedSinceSongFilter.cxx +@@ -6,7 +6,7 @@ + #include "time/ISO8601.hxx" + #include "util/StringBuffer.hxx" + +-#include ++#include + + using std::string_view_literals::operator""sv; + +--- a/src/song/AudioFormatSongFilter.cxx ++++ b/src/song/AudioFormatSongFilter.cxx +@@ -5,7 +5,7 @@ + #include "LightSong.hxx" + #include "util/StringBuffer.hxx" + +-#include ++#include + + using std::string_view_literals::operator""sv; + +--- a/src/song/ModifiedSinceSongFilter.cxx ++++ b/src/song/ModifiedSinceSongFilter.cxx +@@ -6,7 +6,7 @@ + #include "time/ISO8601.hxx" + #include "util/StringBuffer.hxx" + +-#include ++#include + + using std::string_view_literals::operator""sv; + +--- a/src/storage/plugins/NfsStorage.cxx ++++ b/src/storage/plugins/NfsStorage.cxx +@@ -28,7 +28,7 @@ + #include + } + +-#include ++#include + + #include + #include +--- a/src/net/ToString.cxx ++++ b/src/net/ToString.cxx +@@ -6,7 +6,7 @@ + #include "SocketAddress.hxx" + #include "IPv4Address.hxx" + +-#include ++#include + + #include + #include +-- +2.43.0 diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb index 0c3d672949..b4d6604b21 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb @@ -20,6 +20,7 @@ DEPENDS += " \ SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https;tag=v${PV} \ file://mpd.conf.in \ + file://0001-libfmt-12.2.0-support-use-fmt-format.h-not-fmt-core.h.patch \ " SRCREV = "7a9afa059e95668c912f779219ee8fe1e44dd2aa"