summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-02-17 18:47:49 -0800
committerPhilip Tricca <flihp@twobit.us>2016-02-27 05:36:54 +0000
commit5ff0e321aafcc662fb25ae6f1f7bbc3e59f99948 (patch)
treee0eb12e7d29ef49d02002754128bd5498a2a99c6
parentb2b3ea27e3e3ebcafda0972b999323d7683158cf (diff)
downloadmeta-selinux-5ff0e321aafcc662fb25ae6f1f7bbc3e59f99948.tar.gz
libsepol: fix libsepol.pc failed sanity test
ERROR: libsepol-2.4-r0 do_populate_sysroot: QA Issue: libsepol.pc failed sanity test (tmpdir) in path /path/to//sysroot-destdir//usr/lib/pkgconfig [pkgconfig] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Philip Tricca <flihp@twobit.us>
-rw-r--r--recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch28
-rw-r--r--recipes-security/selinux/libsepol_2.4.bb2
-rw-r--r--recipes-security/selinux/libsepol_git.bb2
3 files changed, 32 insertions, 0 deletions
diff --git a/recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch b/recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch
new file mode 100644
index 0000000..8a6e047
--- /dev/null
+++ b/recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch
@@ -0,0 +1,28 @@
1From 05907644755048f9335e05dc540f810bb580477f Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 18 Feb 2016 02:04:59 +0000
4Subject: [PATCH] src/Makefile: fix includedir in libsepol.pc
5
6Upstream-Status: Pending
7
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9---
10 src/Makefile | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/Makefile b/src/Makefile
14index db6c2ba..c03ee92 100644
15--- a/src/Makefile
16+++ b/src/Makefile
17@@ -43,7 +43,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP)
18 ln -sf $@ $(TARGET)
19
20 $(LIBPC): $(LIBPC).in ../VERSION
21- sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
22+ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@
23
24 $(LIBMAP): $(LIBMAP).in
25 ifneq ($(DISABLE_CIL),y)
26--
272.5.0
28
diff --git a/recipes-security/selinux/libsepol_2.4.bb b/recipes-security/selinux/libsepol_2.4.bb
index fa83e5f..ef835b3 100644
--- a/recipes-security/selinux/libsepol_2.4.bb
+++ b/recipes-security/selinux/libsepol_2.4.bb
@@ -5,3 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
5 5
6SRC_URI[md5sum] = "8a75d27acf17af1911797e6b12986b50" 6SRC_URI[md5sum] = "8a75d27acf17af1911797e6b12986b50"
7SRC_URI[sha256sum] = "299015d59932404c6b69d365fdecffe5c0e2f9c44e08b47286a4bfc02ee49659" 7SRC_URI[sha256sum] = "299015d59932404c6b69d365fdecffe5c0e2f9c44e08b47286a4bfc02ee49659"
8
9SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch"
diff --git a/recipes-security/selinux/libsepol_git.bb b/recipes-security/selinux/libsepol_git.bb
index 3f83c90..f36ac3b 100644
--- a/recipes-security/selinux/libsepol_git.bb
+++ b/recipes-security/selinux/libsepol_git.bb
@@ -5,3 +5,5 @@ include selinux_git.inc
5include ${BPN}.inc 5include ${BPN}.inc
6 6
7LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" 7LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
8
9SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch"