summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/mobile-broadband-provider-info
diff options
context:
space:
mode:
authorZhixiong Chi <zhixiong.chi@windriver.com>2018-08-13 00:04:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-14 11:36:31 +0100
commit4bd37c66f24e8d2b344307cde23050d7854a3094 (patch)
treede81c65df43fdc88ccf4eee8bb3cb28fd02a4026 /meta/recipes-connectivity/mobile-broadband-provider-info
parent70eb6be9b1c30d687c3f67a020680dcfab356f49 (diff)
downloadpoky-4bd37c66f24e8d2b344307cde23050d7854a3094.tar.gz
mobile-broadband-provider-info: fix .pc file conflict
Issue: LIN10-4485 Error: Transaction check error: file /usr/share/pkgconfig/mobile-broadband-provider-info.pc from install of \ lib32-mobile-broadband-provider-info-dev.core2_32 conflicts with file from package \ mobile-broadband-provider-info-dev.core2_64 (From OE-Core rev: fbb2df435140eafc3fe1ca7419398e3b5ef273c8) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/mobile-broadband-provider-info')
-rw-r--r--meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch17
-rw-r--r--meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb4
2 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch
new file mode 100644
index 0000000000..9e75b7bdc5
--- /dev/null
+++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch
@@ -0,0 +1,17 @@
1The mobile-broadband-provider-info.pc file is installed into a non-arch directory
2yet contains libdir which can vary depending on which multilib is configured.
3The .pc file does not require libdir so remove this to fix multilib builds.
4
5Upstream-Status: Pending
6Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
7Index: git/mobile-broadband-provider-info.pc.in
8===================================================================
9--- git.orig/mobile-broadband-provider-info.pc.in 2018-08-07 13:09:31.811364063 +0800
10+++ git/mobile-broadband-provider-info.pc.in 2018-08-10 17:49:25.645288320 +0800
11@@ -1,6 +1,5 @@
12 prefix=@prefix@
13 exec_prefix=@exec_prefix@
14-libdir=@libdir@
15 datarootdir = @datarootdir@
16 pkgdatadir=${datarootdir}/@PACKAGE@
17 includedir=@includedir@
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
index dbc578e2d8..7b64b25e89 100644
--- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
+++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
@@ -7,7 +7,9 @@ SRCREV = "befcbbc9867e742ac16415660b0b7521218a530c"
7PV = "20170310" 7PV = "20170310"
8PE = "1" 8PE = "1"
9 9
10SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info" 10SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info \
11 file://multilibfix.patch \
12"
11S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
12 14
13inherit autotools 15inherit autotools