summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-02-17 18:47:50 -0800
committerPhilip Tricca <flihp@twobit.us>2016-02-27 05:36:54 +0000
commit29ef8dbc8f24185681dbc38545a79384aa89a32d (patch)
tree78ed71f1f4c90dcfc4c2de74d4786e4baf1b19a4
parent5ff0e321aafcc662fb25ae6f1f7bbc3e59f99948 (diff)
downloadmeta-selinux-29ef8dbc8f24185681dbc38545a79384aa89a32d.tar.gz
libselinux: fix libselinux.pc failed sanity test
ERROR: libselinux-2.4-r0 do_populate_sysroot: QA Issue: libselinux.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/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch28
-rw-r--r--recipes-security/selinux/libselinux_2.4.bb1
-rw-r--r--recipes-security/selinux/libselinux_git.bb1
3 files changed, 30 insertions, 0 deletions
diff --git a/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch b/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
new file mode 100644
index 0000000..72b97df
--- /dev/null
+++ b/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
@@ -0,0 +1,28 @@
1From 63d2c02a4dfa5ccd5d62a9f80b6a50cbb9946fbb Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 18 Feb 2016 02:39:16 +0000
4Subject: [PATCH] src/Makefile: fix includedir in libselinux.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 1920029..06d291d 100644
15--- a/src/Makefile
16+++ b/src/Makefile
17@@ -115,7 +115,7 @@ $(LIBSO): $(LOBJS)
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 selinuxswig_python_exception.i: ../include/selinux/selinux.h
25 bash exception.sh > $@
26--
272.5.0
28
diff --git a/recipes-security/selinux/libselinux_2.4.bb b/recipes-security/selinux/libselinux_2.4.bb
index e084df2..ac80bdd 100644
--- a/recipes-security/selinux/libselinux_2.4.bb
+++ b/recipes-security/selinux/libselinux_2.4.bb
@@ -12,4 +12,5 @@ SRC_URI += "\
12 file://libselinux-make-SOCK_CLOEXEC-optional.patch \ 12 file://libselinux-make-SOCK_CLOEXEC-optional.patch \
13 file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ 13 file://libselinux-define-FD_CLOEXEC-as-necessary.patch \
14 file://libselinux-get-pywrap-depends-on-selinux.py.patch \ 14 file://libselinux-get-pywrap-depends-on-selinux.py.patch \
15 file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \
15 " 16 "
diff --git a/recipes-security/selinux/libselinux_git.bb b/recipes-security/selinux/libselinux_git.bb
index 4efab86..1cd4dde 100644
--- a/recipes-security/selinux/libselinux_git.bb
+++ b/recipes-security/selinux/libselinux_git.bb
@@ -12,4 +12,5 @@ SRC_URI += "\
12 file://libselinux-make-SOCK_CLOEXEC-optional.patch \ 12 file://libselinux-make-SOCK_CLOEXEC-optional.patch \
13 file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ 13 file://libselinux-define-FD_CLOEXEC-as-necessary.patch \
14 file://libselinux-get-pywrap-depends-on-selinux.py.patch \ 14 file://libselinux-get-pywrap-depends-on-selinux.py.patch \
15 file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \
15 " 16 "