diff options
-rw-r--r-- | meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch | 34 | ||||
-rw-r--r-- | meta/recipes-bsp/usbutils/usbutils_017.bb (renamed from meta/recipes-bsp/usbutils/usbutils_015.bb) | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch b/meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch new file mode 100644 index 0000000000..039dd5cd72 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch @@ -0,0 +1,34 @@ +From f558919e858453a31313a3df35906de2e036940c Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <festevam@denx.de> +Date: Thu, 4 Jan 2024 03:32:11 +0100 +Subject: [PATCH] usbutils.pc.in: Fix Cflags entry + +When updating the usbutils version in OpenEmbedded from 015 to 017, +the following QA error is seen: + +QA Issue: File /usr/lib/pkgconfig/usbutils.pc in package usbutils-dev contains reference to TMPDIR [buildpaths] + +As this causes reproducibility problem due to the host PC path being +leaked, it is treated as error. + +Fix it by using the standard Cflags entry. + +Upstream-Status: Submitted [https://github.com/gregkh/usbutils/pull/184/commits/3b3e5e1ebea7060bfa118d25a91b816dfa176b31] +Signed-off-by: Fabio Estevam <festevam@denx.de> +--- + usbutils.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usbutils.pc.in b/usbutils.pc.in +index e69778c3195c..0aa0005de951 100644 +--- a/usbutils.pc.in ++++ b/usbutils.pc.in +@@ -15,4 +15,4 @@ Requires: libusb-1.0 >= 1.0.14 libudev >= 196 + Conflicts: + Libs: -L${libdir} + Libs.private: @LIBUSB_LIBS@ @UDEV_LIBS@ +-Cflags: @CFLAGS@ @LIBUSB_CFLAGS@ @UDEV_CFLAGS@ ++Cflags: -I${includedir} +-- +2.34.1 + diff --git a/meta/recipes-bsp/usbutils/usbutils_015.bb b/meta/recipes-bsp/usbutils/usbutils_017.bb index a30037b693..a2e340ea4f 100644 --- a/meta/recipes-bsp/usbutils/usbutils_015.bb +++ b/meta/recipes-bsp/usbutils/usbutils_017.bb @@ -12,8 +12,9 @@ LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7226e442a172bcf25807246d7ef1eba DEPENDS = "libusb1 virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ + file://0001-usbutils.pc.in-Fix-Cflags-entry.patch \ " -SRC_URI[sha256sum] = "2b8140664578f39c3f6f0166a1b950f8655304e63e3d7f89899acb99bc5cb8e7" +SRC_URI[sha256sum] = "f704c4cb78a060db88b43aac6ebfd3d93c2c5cf1d6dd0e42936faaf00814ab00" inherit autotools pkgconfig update-alternatives |