From c72d4806485a5ae2e569ac7fa525951689e932d9 Mon Sep 17 00:00:00 2001 From: alichinese Date: Mon, 27 Oct 2025 16:41:52 +0800 Subject: [PATCH 1/3] libusb-compat: eliminate patch warnings * eliminate patch warnings Signed-off-by: alichinese --- .../0001-usb.h-Include-sys-types.h-1.patch | 25 +++++++++++++++++++ .../libusb/libusb-compat_%.bbappend | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/files/0001-usb.h-Include-sys-types.h-1.patch diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/files/0001-usb.h-Include-sys-types.h-1.patch b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/files/0001-usb.h-Include-sys-types.h-1.patch new file mode 100644 index 00000000000..51ae89f82f3 --- /dev/null +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/files/0001-usb.h-Include-sys-types.h-1.patch @@ -0,0 +1,25 @@ +From 374555aa3d6ae4c8f054814f1f8088a98f83ec85 Mon Sep 17 00:00:00 2001 +From: alichinese +Date: Mon, 27 Oct 2025 16:35:41 +0800 +Subject: [PATCH] usb.h-Include-sys-types.h + +--- + libusb/usb.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libusb/usb.h b/libusb/usb.h +index ea62543..4f1752d 100644 +--- a/libusb/usb.h ++++ b/libusb/usb.h +@@ -51,6 +51,8 @@ typedef unsigned __int32 uint32_t; + #include + #endif + ++#include ++ + /* + * USB spec information + * +-- +2.34.1 + diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend index f6dc99fb478..1df080ff394 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend @@ -1,10 +1,14 @@ OPENEULER_LOCAL_NAME = "libusb" PV = "0.1.8" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" SRC_URI:prepend = "file://${BP}.tar.bz2 \ file://0000-Link-with-znodelete-to-disallow-unloading.patch \ + file://0001-usb.h-Include-sys-types.h-1.patch \ " +SRC_URI:remove = "file://0001-usb.h-Include-sys-types.h.patch" + SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" S = "${WORKDIR}/${BP}" -- Gitee From edcf3c55bda97a1a2a720204da050187fb4b22b9 Mon Sep 17 00:00:00 2001 From: alichinese Date: Mon, 27 Oct 2025 17:31:47 +0800 Subject: [PATCH 2/3] libtinyxml: update the libtinyxml version * apply CVE-2023-34194 patch * drop 2-fix-devel-package-error patch because upstream bb file had applied it Signed-off-by: alichinese --- .oebuild/manifest.yaml | 2 +- .../recipes-support/libtinyxml/libtinyxml_%.bbappend | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 984c9d0ce03..6b0018d31bf 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -1766,7 +1766,7 @@ manifest_list: version: 297fdfe6f5060f5a466236e2749ac8a8dd40aca0 tinyxml: remote_url: https://gitee.com/src-openeuler/tinyxml.git - version: 5b0746bade11738bd00d51632199d5360f8162a7 + version: 7a73e8d94d5d60229982eb5121874ea9bedb05ab tinyxml-vendor: remote_url: https://gitee.com/src-openeuler/tinyxml_vendor.git version: da15b9fe3cb4eeb4027222341d5aa09ac923020d diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml/libtinyxml_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml/libtinyxml_%.bbappend index f82c806c761..936f30e70b0 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml/libtinyxml_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml/libtinyxml_%.bbappend @@ -7,7 +7,9 @@ OPENEULER_LOCAL_NAME = "tinyxml" S = "${WORKDIR}/tinyxml" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" + SRC_URI += "file://tinyxml_2_6_2.tar.gz \ file://CVE-2021-42260.patch \ - file://2-fix-devel-package-error.patch \ + file://CVE-2023-34194.patch \ " -- Gitee From 2463dd2ef665ce52c3b4b7520dfc64011d5fc2af Mon Sep 17 00:00:00 2001 From: alichinese Date: Mon, 27 Oct 2025 19:24:28 +0800 Subject: [PATCH 3/3] yaml-cpp-vendor: eliminate the patch warnings * eliminate the patch warnings Signed-off-by: alichinese --- .../yaml-cpp-vendor/yaml-cpp-vendor_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-openeuler/dynamic-layers/ros2-layer/recipes-bbappends/yaml-cpp-vendor/yaml-cpp-vendor_%.bbappend diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-bbappends/yaml-cpp-vendor/yaml-cpp-vendor_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-bbappends/yaml-cpp-vendor/yaml-cpp-vendor_%.bbappend new file mode 100644 index 00000000000..7c5b73e4bf4 --- /dev/null +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-bbappends/yaml-cpp-vendor/yaml-cpp-vendor_%.bbappend @@ -0,0 +1,3 @@ +# remove patch because the patch will create CMakeLists.txt, however, +# the source code already has CMakeLists.txt, so we need to remove the patch +SRC_URI:remove = "file://0001-Use-platform-yaml-cpp.patch" -- Gitee