summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2017-09-04 22:59:40 -0700
committerMark Hatle <mark.hatle@windriver.com>2017-09-13 19:48:28 -0500
commit375dfa620195209b4263e0529edc00e771b8eb18 (patch)
tree7e23e6f66988561a48df9b2bb6bd4ec605385287
parent3aafa96bb3182a7fa7513fb687988f69d7f9b12a (diff)
downloadmeta-selinux-375dfa620195209b4263e0529edc00e771b8eb18.tar.gz
libselinux: uprev to 2.7 (20170804)
Specify LIBSEPOLA to fix build error: make[1]: *** No rule to make target `/usr/lib/libsepol.a', needed by `python-2.7audit2why.so'. Stop. Add python-importlib to RDEPENDS_${PN}-python. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Update libselinux_git.bb Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--recipes-security/selinux/libselinux.inc3
-rw-r--r--recipes-security/selinux/libselinux_2.7.bb (renamed from recipes-security/selinux/libselinux_2.6.bb)6
-rw-r--r--recipes-security/selinux/libselinux_git.bb3
3 files changed, 6 insertions, 6 deletions
diff --git a/recipes-security/selinux/libselinux.inc b/recipes-security/selinux/libselinux.inc
index ad00d10..bd5ce8d 100644
--- a/recipes-security/selinux/libselinux.inc
+++ b/recipes-security/selinux/libselinux.inc
@@ -8,6 +8,7 @@ LICENSE = "PD"
8inherit lib_package pythonnative 8inherit lib_package pythonnative
9 9
10DEPENDS += "libsepol python libpcre swig-native" 10DEPENDS += "libsepol python libpcre swig-native"
11RDEPENDS_${PN}-python += "python-importlib"
11 12
12PACKAGES += "${PN}-python" 13PACKAGES += "${PN}-python"
13FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" 14FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
@@ -21,7 +22,7 @@ def get_policyconfigarch(d):
21 return "ARCH=%s" % (target) 22 return "ARCH=%s" % (target)
22EXTRA_OEMAKE += "${@get_policyconfigarch(d)}" 23EXTRA_OEMAKE += "${@get_policyconfigarch(d)}"
23 24
24EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre'" 25EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre' LIBSEPOLA='${STAGING_LIBDIR}/libsepol.a'"
25 26
26do_compile_append() { 27do_compile_append() {
27 oe_runmake pywrap -j1 \ 28 oe_runmake pywrap -j1 \
diff --git a/recipes-security/selinux/libselinux_2.6.bb b/recipes-security/selinux/libselinux_2.7.bb
index b9ad231..e0d01fc 100644
--- a/recipes-security/selinux/libselinux_2.6.bb
+++ b/recipes-security/selinux/libselinux_2.7.bb
@@ -1,10 +1,10 @@
1include selinux_20161014.inc 1include selinux_20170804.inc
2include ${BPN}.inc 2include ${BPN}.inc
3 3
4LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
5 5
6SRC_URI[md5sum] = "0e066ba6d6e590ba4b53eed64905d901" 6SRC_URI[md5sum] = "1d48ee4e9fadd76794d70c806b69ba7d"
7SRC_URI[sha256sum] = "4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a" 7SRC_URI[sha256sum] = "d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57"
8 8
9SRC_URI += "\ 9SRC_URI += "\
10 file://libselinux-drop-Wno-unused-but-set-variable.patch \ 10 file://libselinux-drop-Wno-unused-but-set-variable.patch \
diff --git a/recipes-security/selinux/libselinux_git.bb b/recipes-security/selinux/libselinux_git.bb
index d2e4a32..a43b184 100644
--- a/recipes-security/selinux/libselinux_git.bb
+++ b/recipes-security/selinux/libselinux_git.bb
@@ -1,5 +1,4 @@
1PR = "r99" 1PV = "2.7+git${SRCPV}"
2PV = "2.2+git${SRCPV}"
3 2
4include selinux_git.inc 3include selinux_git.inc
5include ${BPN}.inc 4include ${BPN}.inc