summaryrefslogtreecommitdiffstats
path: root/recipes-security/selinux/libsemanage
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-09-05 08:18:15 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2018-09-07 16:13:57 -0400
commit883a6d9c6569b27482aee6cf4a3788b0625a811c (patch)
treee923606963f520bb97ddc3dd3de3f308dad94eb5 /recipes-security/selinux/libsemanage
parenta42c6cde1eefc08b5afdbbab24c3d52164f0e5de (diff)
downloadmeta-selinux-883a6d9c6569b27482aee6cf4a3788b0625a811c.tar.gz
libsemanage: uprev to 2.8 (20180524)
Rebase patch: 0001-src-Makefile-fix-includedir-in-libselinux.pc.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'recipes-security/selinux/libsemanage')
-rw-r--r--recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch20
1 files changed, 11 insertions, 9 deletions
diff --git a/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch b/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
index 3d1e110..73613d3 100644
--- a/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
+++ b/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
@@ -1,4 +1,4 @@
1From 992d02fe0d08361529a5d158119c02521786798f Mon Sep 17 00:00:00 2001 1From e773c0952b06370d81e9b113f9b0b3388e323e52 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 18 Feb 2016 02:39:16 +0000 3Date: Thu, 18 Feb 2016 02:39:16 +0000
4Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc 4Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc
@@ -6,21 +6,23 @@ Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9 9Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
10--- 10---
11 src/Makefile | 2 +- 11 src/Makefile | 1 +
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+)
13 13
14diff --git a/src/Makefile b/src/Makefile 14diff --git a/src/Makefile b/src/Makefile
15index e8831ab..d3d4644 100644 15index dea751e..4af4568 100644
16--- a/src/Makefile 16--- a/src/Makefile
17+++ b/src/Makefile 17+++ b/src/Makefile
18@@ -103,7 +103,7 @@ $(LIBSO): $(LOBJS) 18@@ -93,6 +93,7 @@ $(LIBSO): $(LOBJS)
19 ln -sf $@ $(TARGET)
20 19
21 $(LIBPC): $(LIBPC).in ../VERSION 20 $(LIBPC): $(LIBPC).in ../VERSION
22- sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ 21 sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
23+ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ 22+ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:' < $< > $@
24 23
25 semanageswig_python_exception.i: ../include/semanage/semanage.h 24 semanageswig_python_exception.i: ../include/semanage/semanage.h
26 bash -e exception.sh > $@ || (rm -f $@ ; false) 25 bash -e exception.sh > $@ || (rm -f $@ ; false)
26--
272.7.4
28