Rebase patch: 0001-src-Makefile-fix-includedir-in-libselinux.pc.patch Signed-off-by: Yi Zhao <yi.z...@windriver.com> --- recipes-security/selinux/libselinux.inc | 2 +- ...rc-Makefile-fix-includedir-in-libselinux.pc.patch | 20 +++++++++++--------- .../selinux/{libselinux_2.7.bb => libselinux_2.8.bb} | 6 +++--- 3 files changed, 15 insertions(+), 13 deletions(-) rename recipes-security/selinux/{libselinux_2.7.bb => libselinux_2.8.bb} (72%)
diff --git a/recipes-security/selinux/libselinux.inc b/recipes-security/selinux/libselinux.inc index 51d0875..17c29f9 100644 --- a/recipes-security/selinux/libselinux.inc +++ b/recipes-security/selinux/libselinux.inc @@ -33,7 +33,7 @@ do_compile_append() { do_install_append() { oe_runmake install-pywrap swigify \ - PYSITEDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages + PYTHONLIBDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages rm -rf ${D}${base_sbindir} } 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 index 725141f..46cfaaf 100644 --- 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 @@ -1,4 +1,4 @@ -From 3f633e310851cb029cb4f38d9e11a3aaef8d1099 Mon Sep 17 00:00:00 2001 +From 37f3299e8f5c468fe692f36356c2c35f968b6aee Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.y...@windriver.com> Date: Thu, 18 Feb 2016 02:39:16 +0000 Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc @@ -6,21 +6,23 @@ Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.y...@windriver.com> - +Signed-off-by: Yi Zhao <yi.z...@windriver.com> --- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/Makefile | 1 + + 1 file changed, 1 insertion(+) diff --git a/src/Makefile b/src/Makefile -index a89c0f7..f304032 100644 +index 977b5c8..92a4289 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -148,7 +148,7 @@ $(LIBSO): $(LOBJS) - ln -sf $@ $(TARGET) +@@ -156,6 +156,7 @@ $(LIBSO): $(LOBJS) $(LIBPC): $(LIBPC).in ../VERSION -- sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ -+ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):; s:@PCRE_MODULE@:$(PCRE_MODULE):' < $< > $@ ++ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:; s:@PCRE_MODULE@:$(PCRE_MODULE):' < $< > $@ selinuxswig_python_exception.i: ../include/selinux/selinux.h bash -e exception.sh > $@ || (rm -f $@ ; false) +-- +2.7.4 + diff --git a/recipes-security/selinux/libselinux_2.7.bb b/recipes-security/selinux/libselinux_2.8.bb similarity index 72% rename from recipes-security/selinux/libselinux_2.7.bb rename to recipes-security/selinux/libselinux_2.8.bb index e0d01fc..5de4607 100644 --- a/recipes-security/selinux/libselinux_2.7.bb +++ b/recipes-security/selinux/libselinux_2.8.bb @@ -1,10 +1,10 @@ -include selinux_20170804.inc +include selinux_20180524.inc include ${BPN}.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" -SRC_URI[md5sum] = "1d48ee4e9fadd76794d70c806b69ba7d" -SRC_URI[sha256sum] = "d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57" +SRC_URI[md5sum] = "56057e60192b21122c1aede8ff723ca2" +SRC_URI[sha256sum] = "31db96ec7643ce10912b3c3f98506a08a9116dcfe151855fd349c3fda96187e1" SRC_URI += "\ file://libselinux-drop-Wno-unused-but-set-variable.patch \ -- 2.7.4 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto