summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2022-11-11 18:49:49 +0100
committerKhem Raj <raj.khem@gmail.com>2022-11-11 11:45:32 -0800
commit1e625fbfc5fcd5aebd086df725ddc3d29e46b10e (patch)
treeb5fd7ae3b5ecef4689792473297c808865ffc961
parent25c38607014f2d325884ad003c96237906aefa48 (diff)
downloadmeta-openembedded-1e625fbfc5fcd5aebd086df725ddc3d29e46b10e.tar.gz
hwdata: add patch to use sysroot prefix for pkgdatadir
Add backport patch https://github.com/vcrhonek/hwdata/pull/19/commits/d3325fd72bd45ba74e709b4083521104193b224e Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch30
-rw-r--r--meta-oe/recipes-support/hwdata/hwdata_0.364.bb6
2 files changed, 35 insertions, 1 deletions
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
new file mode 100644
index 0000000000..d51d8d00a6
--- /dev/null
+++ b/meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch
@@ -0,0 +1,30 @@
1From f5311fb8519c6360333934537abeb64198e2c212 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Wed, 9 Nov 2022 18:37:41 +0100
4Subject: [PATCH] hwdata.pc.in: use sysroot prefix for pkgdatadir variable
5
6The pc_sysroot is automatically added to cflags and libs but not
7to 'pkg-config --variable'. This matches what wayland-protocols does.
8
9Signed-off-by: Markus Volk <f_l_k@t-online.de>
10
11Upstream-Status: Backport [https://github.com/vcrhonek/hwdata/pull/19/commits/d3325fd72bd45ba74e709b4083521104193b224e]
12---
13 hwdata.pc.in | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/hwdata.pc.in b/hwdata.pc.in
17index 8dd73b6..c5791d3 100644
18--- a/hwdata.pc.in
19+++ b/hwdata.pc.in
20@@ -1,6 +1,6 @@
21 prefix=@prefix@
22 datadir=@datadir@
23-pkgdatadir=@pkgdatadir@
24+pkgdatadir=${pc_sysrootdir}@pkgdatadir@
25
26 Name: @NAME@
27 Description: Hardware identification and configuration data
28--
292.34.1
30
diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.364.bb b/meta-oe/recipes-support/hwdata/hwdata_0.364.bb
index 6499db24f3..b61f68f867 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_0.364.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_0.364.bb
@@ -6,7 +6,11 @@ LICENSE = "GPL-2.0-or-later | XFree86-1.0"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
7 7
8SRCREV = "3ac83cecf56f299e7390e5afeab2808632719243" 8SRCREV = "3ac83cecf56f299e7390e5afeab2808632719243"
9SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" 9SRC_URI = " \
10 git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https \
11 file://0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch \
12"
13
10S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
11 15
12inherit allarch 16inherit allarch