From: Wang Mingyu <[email protected]> 0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch removed since it's included in 0.365
Signed-off-by: Wang Mingyu <[email protected]> --- ...-sysroot-prefix-for-pkgdatadir-varia.patch | 30 ------------------- .../{hwdata_0.364.bb => hwdata_0.365.bb} | 7 ++--- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch rename meta-oe/recipes-support/hwdata/{hwdata_0.364.bb => hwdata_0.365.bb} (70%) diff --git a/meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch b/meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch deleted file mode 100644 index d51d8d00a..000000000 --- a/meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f5311fb8519c6360333934537abeb64198e2c212 Mon Sep 17 00:00:00 2001 -From: Markus Volk <[email protected]> -Date: Wed, 9 Nov 2022 18:37:41 +0100 -Subject: [PATCH] hwdata.pc.in: use sysroot prefix for pkgdatadir variable - -The pc_sysroot is automatically added to cflags and libs but not -to 'pkg-config --variable'. This matches what wayland-protocols does. - -Signed-off-by: Markus Volk <[email protected]> - -Upstream-Status: Backport [https://github.com/vcrhonek/hwdata/pull/19/commits/d3325fd72bd45ba74e709b4083521104193b224e] ---- - hwdata.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hwdata.pc.in b/hwdata.pc.in -index 8dd73b6..c5791d3 100644 ---- a/hwdata.pc.in -+++ b/hwdata.pc.in -@@ -1,6 +1,6 @@ - prefix=@prefix@ - datadir=@datadir@ --pkgdatadir=@pkgdatadir@ -+pkgdatadir=${pc_sysrootdir}@pkgdatadir@ - - Name: @NAME@ - Description: Hardware identification and configuration data --- -2.34.1 - diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.364.bb b/meta-oe/recipes-support/hwdata/hwdata_0.365.bb similarity index 70% rename from meta-oe/recipes-support/hwdata/hwdata_0.364.bb rename to meta-oe/recipes-support/hwdata/hwdata_0.365.bb index b61f68f86..d37b73af2 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_0.364.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.365.bb @@ -5,11 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "3ac83cecf56f299e7390e5afeab2808632719243" -SRC_URI = " \ - git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https \ - file://0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch \ -" +SRCREV = "803068db92b8bb249014f1c947b91b452f539f5f" +SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100038): https://lists.openembedded.org/g/openembedded-devel/message/100038 Mute This Topic: https://lists.openembedded.org/mt/95616848/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
