From patchwork Thu Nov 10 15:02:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 15297 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3939C4332F for ; Thu, 10 Nov 2022 15:02:31 +0000 (UTC) Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by mx.groups.io with SMTP id smtpd.web09.8578.1668092549509207507 for ; Thu, 10 Nov 2022 07:02:29 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.82, mailfrom: f_l_k@t-online.de) Received: from fwd78.dcpf.telekom.de (fwd78.aul.t-online.de [10.223.144.104]) by mailout05.t-online.de (Postfix) with SMTP id DE2A818E44 for ; Thu, 10 Nov 2022 16:02:26 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.45.241]) by fwd78.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ot94U-12VtPF0; Thu, 10 Nov 2022 16:02:26 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv2] hwdata: add patch to use sysroot prefix for pkgdatadir Date: Thu, 10 Nov 2022 16:02:16 +0100 Message-Id: <20221110150216.5309-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1668092546-79BAA9DD-2D5EB74C/0/0 CLEAN NORMAL X-TOI-MSGID: f04c8bb1-6e2d-4ba7-9e86-991b4b275e15 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Nov 2022 15:02:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/99550 This patch has been submitted upstream here: https://github.com/vcrhonek/hwdata/pull/19/commits/d3325fd72bd45ba74e709b4083521104193b224e Signed-off-by: Markus Volk --- ...-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 +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 + +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