[PATCH 1/2] mobile-broadband-provider-info: update patch status

[PATCH 1/2] mobile-broadband-provider-info: update patch status

[Ross Burton]

I pushed this upstream, so mark the patch as such.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../mobile-broadband-provider-info/multilibfix.patch                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 9e75b7bdc5e..7e97e8ec356 100644
--- 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
@@ -2,8 +2,9 @@ The mobile-broadband-provider-info.pc file is installed into a non-arch director
 yet contains libdir which can vary depending on which multilib is configured.
 The .pc file does not require libdir so remove this to fix multilib builds.
 
-Upstream-Status: Pending
+Upstream-Status: Backport [8109fcd3c7299fae859fb891ff416927581a9955]
 Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+
 Index: git/mobile-broadband-provider-info.pc.in
 ===================================================================
 --- git.orig/mobile-broadband-provider-info.pc.in	2018-08-07 13:09:31.811364063 +0800
-- 
2.11.0

[PATCH 2/2] libbsd: drop obsolete patch

[Ross Burton]

This was only needed with old pkg-config, but we have 0.29.2 so this can be
dropped.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...overlay.pc.in-Set-Cflags-to-use-I-instead.patch | 33 ----------------------
 meta/recipes-support/libbsd/libbsd_0.9.1.bb        |  1 -
 2 files changed, 34 deletions(-)
 delete mode 100644 meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch

diff --git a/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch b/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch
deleted file mode 100644
index 7e3a5b3be4b..00000000000
--- a/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b6972f1c29ebf073cbe19a4a669ee093259792a0 Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Mon, 30 Jan 2017 12:00:33 -0200
-Subject: [PATCH] src/libbsd-overlay.pc.in: Set Cflags to use -I instead of
- -isystem
-Organization: O.S. Systems Software LTDA.
-
-pkg-config currently only handles -I and -L correctly, but misses
--isystem, so we need to do this workaround to fix this issue.
-
-There's a open bug in:
-https://bugzilla.freedesktop.org/show_bug.cgi?id=99516
-
-Upstream-Status: Pending
-
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- src/libbsd-overlay.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libbsd-overlay.pc.in b/src/libbsd-overlay.pc.in
-index ac8bf89..65dc3ae 100644
---- a/src/libbsd-overlay.pc.in
-+++ b/src/libbsd-overlay.pc.in
-@@ -8,4 +8,4 @@ Description: Utility functions from BSD systems (overlay)
- Version: @VERSION@
- URL: https://libbsd.freedesktop.org/
- Libs: -L${libdir} -lbsd
--Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY
-+Cflags: -I${includedir}/bsd -DLIBBSD_OVERLAY
--- 
-2.11.0
-
diff --git a/meta/recipes-support/libbsd/libbsd_0.9.1.bb b/meta/recipes-support/libbsd/libbsd_0.9.1.bb
index 2a1cd645352..2b75cdf9563 100644
--- a/meta/recipes-support/libbsd/libbsd_0.9.1.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.9.1.bb
@@ -33,7 +33,6 @@ SECTION = "libs"
 
 SRC_URI = " \
     http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
-    file://0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch \
     file://0001-flopen-Add-missing-fcntl.h-include.patch \
 "
 
-- 
2.11.0