diff options
| -rw-r--r-- | meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/hwdata/hwdata_0.365.bb (renamed from meta-oe/recipes-support/hwdata/hwdata_0.364.bb) | 7 |
2 files changed, 2 insertions, 35 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 deleted file mode 100644 index d51d8d00a6..0000000000 --- a/meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From f5311fb8519c6360333934537abeb64198e2c212 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Wed, 9 Nov 2022 18:37:41 +0100 | ||
| 4 | Subject: [PATCH] hwdata.pc.in: use sysroot prefix for pkgdatadir variable | ||
| 5 | |||
| 6 | The pc_sysroot is automatically added to cflags and libs but not | ||
| 7 | to 'pkg-config --variable'. This matches what wayland-protocols does. | ||
| 8 | |||
| 9 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 10 | |||
| 11 | Upstream-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 | |||
| 16 | diff --git a/hwdata.pc.in b/hwdata.pc.in | ||
| 17 | index 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 | -- | ||
| 29 | 2.34.1 | ||
| 30 | |||
diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.364.bb b/meta-oe/recipes-support/hwdata/hwdata_0.365.bb index b61f68f867..d37b73af28 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" | |||
| 5 | LICENSE = "GPL-2.0-or-later | XFree86-1.0" | 5 | LICENSE = "GPL-2.0-or-later | XFree86-1.0" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" |
| 7 | 7 | ||
| 8 | SRCREV = "3ac83cecf56f299e7390e5afeab2808632719243" | 8 | SRCREV = "803068db92b8bb249014f1c947b91b452f539f5f" |
| 9 | SRC_URI = " \ | 9 | SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" |
| 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 | 10 | ||
| 14 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 15 | 12 | ||
