All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Volk <f_l_k@t-online.de>
To: openembedded-devel@lists.openembedded.org
Cc: Markus Volk <f_l_k@t-online.de>
Subject: [meta-oe][PATCHv2] hwdata: add patch to use sysroot prefix for pkgdatadir
Date: Thu, 10 Nov 2022 16:02:16 +0100	[thread overview]
Message-ID: <20221110150216.5309-1-f_l_k@t-online.de> (raw)

This patch has been submitted upstream here:
https://github.com/vcrhonek/hwdata/pull/19/commits/d3325fd72bd45ba74e709b4083521104193b224e

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...-sysroot-prefix-for-pkgdatadir-varia.patch | 31 +++++++++++++++++++
 .../recipes-support/hwdata/hwdata_0.364.bb    |  6 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch

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 000000000..2ee63bc32
--- /dev/null
+++ b/meta-oe/recipes-support/hwdata/hwdata/0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch
@@ -0,0 +1,31 @@
+From f5311fb8519c6360333934537abeb64198e2c212 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+
+Patch-Status: Submitted
+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.364.bb
index 4abfb4346..4161a2bfe 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"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
 
 SRCREV = "3ac83cecf56f299e7390e5afeab2808632719243"
-SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
+SRC_URI = " \
+    git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https \
+    file://0001-hwdata.pc.in-use-sysroot-prefix-for-pkgdatadir-varia.patch \
+"
+
 S = "${WORKDIR}/git"
 
 inherit allarch
-- 
2.34.1



                 reply	other threads:[~2022-11-10 15:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221110150216.5309-1-f_l_k@t-online.de \
    --to=f_l_k@t-online.de \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.