diff options
3 files changed, 16 insertions, 15 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 index 8a6e047..987fdab 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 05907644755048f9335e05dc540f810bb580477f Mon Sep 17 00:00:00 2001 | 1 | From 074dbf2f104d1a6ea1aa048600f44f9701c70a60 Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Thu, 18 Feb 2016 02:04:59 +0000 | 3 | Date: Thu, 18 Feb 2016 02:04:59 +0000 |
4 | Subject: [PATCH] src/Makefile: fix includedir in libsepol.pc | 4 | Subject: [PATCH] src/Makefile: fix includedir in libsepol.pc |
@@ -6,23 +6,24 @@ Subject: [PATCH] src/Makefile: fix includedir in libsepol.pc | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
9 | --- | 10 | --- |
10 | src/Makefile | 2 +- | 11 | src/Makefile | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 13 | ||
13 | diff --git a/src/Makefile b/src/Makefile | 14 | diff --git a/src/Makefile b/src/Makefile |
14 | index db6c2ba..c03ee92 100644 | 15 | index ccb7023..2bb6290 100644 |
15 | --- a/src/Makefile | 16 | --- a/src/Makefile |
16 | +++ b/src/Makefile | 17 | +++ b/src/Makefile |
17 | @@ -43,7 +43,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP) | 18 | @@ -51,7 +51,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP) |
18 | ln -sf $@ $(TARGET) | 19 | ln -sf $@ $(TARGET) |
19 | 20 | ||
20 | $(LIBPC): $(LIBPC).in ../VERSION | 21 | $(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@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ |
22 | + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ | 23 | + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:' < $< > $@ |
23 | 24 | ||
24 | $(LIBMAP): $(LIBMAP).in | 25 | $(LIBMAP): $(LIBMAP).in |
25 | ifneq ($(DISABLE_CIL),y) | 26 | ifneq ($(DISABLE_CIL),y) |
26 | -- | 27 | -- |
27 | 2.5.0 | 28 | 2.7.4 |
28 | 29 | ||
diff --git a/recipes-security/selinux/libsepol_2.7.bb b/recipes-security/selinux/libsepol_2.7.bb deleted file mode 100644 index f38f7ba..0000000 --- a/recipes-security/selinux/libsepol_2.7.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | include selinux_20170804.inc | ||
2 | include ${BPN}.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
5 | |||
6 | SRC_URI[md5sum] = "9424b93fd6efd853b9360f29265c5aa3" | ||
7 | SRC_URI[sha256sum] = "d69d3bd8ec901a3bd5adf2be2fb47fb1a685ed73066ab482e7e505371a48f9e7" | ||
8 | |||
9 | SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch" | ||
diff --git a/recipes-security/selinux/libsepol_2.8.bb b/recipes-security/selinux/libsepol_2.8.bb new file mode 100644 index 0000000..d1f905b --- /dev/null +++ b/recipes-security/selinux/libsepol_2.8.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | include selinux_20180524.inc | ||
2 | include ${BPN}.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
5 | |||
6 | SRC_URI[md5sum] = "c19aa9dde1e78d1c2bd3109579e4d484" | ||
7 | SRC_URI[sha256sum] = "3ad6916a8352bef0bad49acc8037a5f5b48c56f94e4cb4e1959ca475fa9d24d6" | ||
8 | |||
9 | SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch" | ||