diff options
2 files changed, 3 insertions, 23 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 deleted file mode 100644 index 7e97e8ec35..0000000000 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | The mobile-broadband-provider-info.pc file is installed into a non-arch directory | ||
| 2 | yet contains libdir which can vary depending on which multilib is configured. | ||
| 3 | The .pc file does not require libdir so remove this to fix multilib builds. | ||
| 4 | |||
| 5 | Upstream-Status: Backport [8109fcd3c7299fae859fb891ff416927581a9955] | ||
| 6 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
| 7 | |||
| 8 | Index: git/mobile-broadband-provider-info.pc.in | ||
| 9 | =================================================================== | ||
| 10 | --- git.orig/mobile-broadband-provider-info.pc.in 2018-08-07 13:09:31.811364063 +0800 | ||
| 11 | +++ git/mobile-broadband-provider-info.pc.in 2018-08-10 17:49:25.645288320 +0800 | ||
| 12 | @@ -1,6 +1,5 @@ | ||
| 13 | prefix=@prefix@ | ||
| 14 | exec_prefix=@exec_prefix@ | ||
| 15 | -libdir=@libdir@ | ||
| 16 | datarootdir = @datarootdir@ | ||
| 17 | pkgdatadir=${datarootdir}/@PACKAGE@ | ||
| 18 | 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 7f1dd78c14..77adcebbae 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 | |||
| @@ -3,13 +3,11 @@ HOMEPAGE = "http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProvider | |||
| 3 | SECTION = "network" | 3 | SECTION = "network" |
| 4 | LICENSE = "PD" | 4 | LICENSE = "PD" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" |
| 6 | SRCREV = "befcbbc9867e742ac16415660b0b7521218a530c" | 6 | SRCREV = "c7def60ba50d9cc30a90f69f89d7e82243501e86" |
| 7 | PV = "20170310" | 7 | PV = "20190116" |
| 8 | PE = "1" | 8 | PE = "1" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https \ | 10 | SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https" |
| 11 | file://multilibfix.patch \ | ||
| 12 | " | ||
| 13 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 14 | 12 | ||
| 15 | inherit autotools | 13 | inherit autotools |
