From 375dfa620195209b4263e0529edc00e771b8eb18 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Mon, 4 Sep 2017 22:59:40 -0700 Subject: 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 Update libselinux_git.bb Signed-off-by: Mark Hatle --- recipes-security/selinux/libselinux.inc | 3 ++- recipes-security/selinux/libselinux_2.6.bb | 15 --------------- recipes-security/selinux/libselinux_2.7.bb | 15 +++++++++++++++ recipes-security/selinux/libselinux_git.bb | 3 +-- 4 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 recipes-security/selinux/libselinux_2.6.bb create mode 100644 recipes-security/selinux/libselinux_2.7.bb 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" inherit lib_package pythonnative DEPENDS += "libsepol python libpcre swig-native" +RDEPENDS_${PN}-python += "python-importlib" PACKAGES += "${PN}-python" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" @@ -21,7 +22,7 @@ def get_policyconfigarch(d): return "ARCH=%s" % (target) EXTRA_OEMAKE += "${@get_policyconfigarch(d)}" -EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre'" +EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre' LIBSEPOLA='${STAGING_LIBDIR}/libsepol.a'" do_compile_append() { oe_runmake pywrap -j1 \ diff --git a/recipes-security/selinux/libselinux_2.6.bb b/recipes-security/selinux/libselinux_2.6.bb deleted file mode 100644 index b9ad231..0000000 --- a/recipes-security/selinux/libselinux_2.6.bb +++ /dev/null @@ -1,15 +0,0 @@ -include selinux_20161014.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" - -SRC_URI[md5sum] = "0e066ba6d6e590ba4b53eed64905d901" -SRC_URI[sha256sum] = "4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a" - -SRC_URI += "\ - file://libselinux-drop-Wno-unused-but-set-variable.patch \ - file://libselinux-make-O_CLOEXEC-optional.patch \ - file://libselinux-make-SOCK_CLOEXEC-optional.patch \ - file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ - file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \ - " diff --git a/recipes-security/selinux/libselinux_2.7.bb b/recipes-security/selinux/libselinux_2.7.bb new file mode 100644 index 0000000..e0d01fc --- /dev/null +++ b/recipes-security/selinux/libselinux_2.7.bb @@ -0,0 +1,15 @@ +include selinux_20170804.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" + +SRC_URI[md5sum] = "1d48ee4e9fadd76794d70c806b69ba7d" +SRC_URI[sha256sum] = "d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57" + +SRC_URI += "\ + file://libselinux-drop-Wno-unused-but-set-variable.patch \ + file://libselinux-make-O_CLOEXEC-optional.patch \ + file://libselinux-make-SOCK_CLOEXEC-optional.patch \ + file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ + file://0001-src-Makefile-fix-includedir-in-libselinux.pc.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 @@ -PR = "r99" -PV = "2.2+git${SRCPV}" +PV = "2.7+git${SRCPV}" include selinux_git.inc include ${BPN}.inc -- cgit v1.2.3-54-g00ecf