CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsemanage: uprev to 2.8 (20180524)

Browse Source 
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>
This commit is contained in:
Yi Zhao 2018-09-05 08:18:15 +08:00 committed by Joe MacDonald
parent a42c6cde1e
commit 883a6d9c65
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recipes-security/selinux/libsemanage.inc
View File

@ -32,18 +32,10 @@ do_compile_append() {
PYTHONLIBDIR='${PYLIB}'
}
do_install() {
oe_runmake install \
DESTDIR="${D}" \
PREFIX="${D}/${prefix}" \
INCLUDEDIR="${D}/${includedir}" \
LIBDIR="${D}/${libdir}" \
SHLIBDIR="${D}/${libdir}"
do_install_append() {
oe_runmake install-pywrap swigify \
DESTDIR=${D} \
PYCEXT='.so' \
PYSITEDIR='${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
PYTHONLIBDIR='${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
PYLIBVER='python${PYTHON_BASEVERSION}' \
PYLIBDIR='${D}/${libdir}/$(PYLIBVER)'

20
recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
View File

@ -1,4 +1,4 @@
From 992d02fe0d08361529a5d158119c02521786798f Mon Sep 17 00:00:00 2001
From e773c0952b06370d81e9b113f9b0b3388e323e52 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@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.yang@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@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 e8831ab..d3d4644 100644
index dea751e..4af4568 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -103,7 +103,7 @@ $(LIBSO): $(LOBJS)
ln -sf $@ $(TARGET)
@@ -93,6 +93,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):' < $< > $@
+ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:' < $< > $@
semanageswig_python_exception.i: ../include/semanage/semanage.h
bash -e exception.sh > $@ || (rm -f $@ ; false)
--
2.7.4

6
recipes-security/selinux/libsemanage_2.7.bb → recipes-security/selinux/libsemanage_2.8.bb
View File

@ -1,10 +1,10 @@
include selinux_20170804.inc
include selinux_20180524.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
SRC_URI[md5sum] = "a6b5c451fbe45ff9e3e0e65f2db0ae1d"
SRC_URI[sha256sum] = "07e9477714ce6a4557a1fe924ea4cb06501b62d0fa0e3c0dc32a2cf47cb8d476"
SRC_URI[md5sum] = "62ed7bb2ede677a735f2750751677a4f"
SRC_URI[sha256sum] = "1c0de8d2c51e5460926c21e371105c84a39087dfd8f8e9f0cc1d017e4cbea8e2"
SRC_URI += "\
file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \