diff options
Diffstat (limited to 'meta/recipes-bsp/usbutils')
-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_013.bb | 30 | ||||
-rw-r--r-- | meta/recipes-bsp/usbutils/usbutils_017.bb | 33 |
3 files changed, 67 insertions, 30 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 @@ | |||
1 | From f558919e858453a31313a3df35906de2e036940c Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Estevam <festevam@denx.de> | ||
3 | Date: Thu, 4 Jan 2024 03:32:11 +0100 | ||
4 | Subject: [PATCH] usbutils.pc.in: Fix Cflags entry | ||
5 | |||
6 | When updating the usbutils version in OpenEmbedded from 015 to 017, | ||
7 | the following QA error is seen: | ||
8 | |||
9 | QA Issue: File /usr/lib/pkgconfig/usbutils.pc in package usbutils-dev contains reference to TMPDIR [buildpaths] | ||
10 | |||
11 | As this causes reproducibility problem due to the host PC path being | ||
12 | leaked, it is treated as error. | ||
13 | |||
14 | Fix it by using the standard Cflags entry. | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/gregkh/usbutils/pull/184/commits/3b3e5e1ebea7060bfa118d25a91b816dfa176b31] | ||
17 | Signed-off-by: Fabio Estevam <festevam@denx.de> | ||
18 | --- | ||
19 | usbutils.pc.in | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/usbutils.pc.in b/usbutils.pc.in | ||
23 | index e69778c3195c..0aa0005de951 100644 | ||
24 | --- a/usbutils.pc.in | ||
25 | +++ b/usbutils.pc.in | ||
26 | @@ -15,4 +15,4 @@ Requires: libusb-1.0 >= 1.0.14 libudev >= 196 | ||
27 | Conflicts: | ||
28 | Libs: -L${libdir} | ||
29 | Libs.private: @LIBUSB_LIBS@ @UDEV_LIBS@ | ||
30 | -Cflags: @CFLAGS@ @LIBUSB_CFLAGS@ @UDEV_CFLAGS@ | ||
31 | +Cflags: -I${includedir} | ||
32 | -- | ||
33 | 2.34.1 | ||
34 | |||
diff --git a/meta/recipes-bsp/usbutils/usbutils_013.bb b/meta/recipes-bsp/usbutils/usbutils_013.bb deleted file mode 100644 index 51f909b795..0000000000 --- a/meta/recipes-bsp/usbutils/usbutils_013.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SUMMARY = "Host side USB console utilities" | ||
2 | DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected to the USB bus." | ||
3 | HOMEPAGE = "http://www.linux-usb.org" | ||
4 | SECTION = "base" | ||
5 | |||
6 | LICENSE = "GPLv2+ & (GPLv2 | GPLv3)" | ||
7 | # License files went missing in 010, when 011 is released add LICENSES/* back | ||
8 | LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7d4861d978ff5ba7cb2b319ed1d4afe3 \ | ||
9 | file://lsusb.py.in;beginline=2;endline=2;md5=194d6a0226bf90f4f683e8968878b6cd" | ||
10 | |||
11 | DEPENDS = "libusb1 virtual/libiconv udev" | ||
12 | |||
13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ | ||
14 | " | ||
15 | SRC_URI[sha256sum] = "efdfd5403dbdd7412de6bb897d5fbaae65ef3eb4332032c0e1f216216618e9a9" | ||
16 | |||
17 | inherit autotools pkgconfig update-alternatives | ||
18 | |||
19 | ALTERNATIVE_${PN} = "lsusb" | ||
20 | ALTERNATIVE_PRIORITY = "100" | ||
21 | |||
22 | # The binaries are mostly GPLv2+ apart from lsusb.py which is GPLv2 or v3. | ||
23 | LICENSE_${PN} = "GPLv2+" | ||
24 | LICENSE_${PN}-python = "GPLv2 | GPLv3" | ||
25 | |||
26 | RRECOMMENDS_${PN} = "udev-hwdb" | ||
27 | |||
28 | PACKAGE_BEFORE_PN =+ "${PN}-python" | ||
29 | FILES_${PN}-python += "${bindir}/lsusb.py" | ||
30 | RDEPENDS_${PN}-python = "python3-core" | ||
diff --git a/meta/recipes-bsp/usbutils/usbutils_017.bb b/meta/recipes-bsp/usbutils/usbutils_017.bb new file mode 100644 index 0000000000..a2e340ea4f --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils_017.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Host side USB console utilities" | ||
2 | DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected to the USB bus." | ||
3 | HOMEPAGE = "http://www.linux-usb.org" | ||
4 | SECTION = "base" | ||
5 | |||
6 | LICENSE = "GPL-2.0-or-later & (GPL-2.0-only | GPL-3.0-only)" | ||
7 | # License files went missing in 010, when 011 is released add LICENSES/* back | ||
8 | LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7226e442a172bcf25807246d7ef1eba1 \ | ||
9 | file://lsusb.py.in;beginline=2;endline=2;md5=c443ada211d701156e42ea36d41625b3 \ | ||
10 | " | ||
11 | |||
12 | DEPENDS = "libusb1 virtual/libiconv udev" | ||
13 | |||
14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ | ||
15 | file://0001-usbutils.pc.in-Fix-Cflags-entry.patch \ | ||
16 | " | ||
17 | SRC_URI[sha256sum] = "f704c4cb78a060db88b43aac6ebfd3d93c2c5cf1d6dd0e42936faaf00814ab00" | ||
18 | |||
19 | inherit autotools pkgconfig update-alternatives | ||
20 | |||
21 | ALTERNATIVE:${PN} = "lsusb" | ||
22 | ALTERNATIVE_PRIORITY = "100" | ||
23 | |||
24 | # The binaries are mostly GPL-2.0-or-later apart from lsusb.py which is | ||
25 | # GPL-2.0-only or GPL-3.0-only. | ||
26 | LICENSE:${PN} = "GPL-2.0-or-later" | ||
27 | LICENSE:${PN}-python = "GPL-2.0-only | GPL-3.0-only" | ||
28 | |||
29 | RRECOMMENDS:${PN} = "udev-hwdb" | ||
30 | |||
31 | PACKAGE_BEFORE_PN =+ "${PN}-python" | ||
32 | FILES:${PN}-python += "${bindir}/lsusb.py" | ||
33 | RDEPENDS:${PN}-python = "python3-core" | ||