Merge inc file into bb file. Signed-off-by: Yi Zhao <[email protected]> --- .../selinux/libselinux-python_3.1.bb | 26 ------------------- ...ux-python.inc => libselinux-python_3.2.bb} | 25 ++++++++++++------ 2 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 recipes-security/selinux/libselinux-python_3.1.bb rename recipes-security/selinux/{libselinux-python.inc => libselinux-python_3.2.bb} (61%)
diff --git a/recipes-security/selinux/libselinux-python_3.1.bb b/recipes-security/selinux/libselinux-python_3.1.bb deleted file mode 100644 index 854eca9..0000000 --- a/recipes-security/selinux/libselinux-python_3.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SELINUX_RELEASE = "20200710" - -SRC_URI = "https://github.com/SELinuxProject/selinux/releases/download/${SELINUX_RELEASE}/libselinux-${PV}.tar.gz"; - -require ${BPN}.inc - -inherit python3targetconfig - -LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" - -SRC_URI[md5sum] = "693680c021feb69a4b258b0370021461" -SRC_URI[sha256sum] = "ea5dcbb4d859e3f999c26a13c630da2f16dff9462e3cc8cb7b458ac157d112e7" - -SRC_URI += "\ - file://libselinux-make-O_CLOEXEC-optional.patch \ - file://libselinux-make-SOCK_CLOEXEC-optional.patch \ - file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ - file://0001-Makefile-fix-python-modules-install-path-for-multili.patch \ - file://0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch \ - " - -SRC_URI_append_libc-musl = " \ - file://0001-libselinux-do-not-define-gettid-for-musl.patch \ - " - -S = "${WORKDIR}/libselinux-${PV}" diff --git a/recipes-security/selinux/libselinux-python.inc b/recipes-security/selinux/libselinux-python_3.2.bb similarity index 61% rename from recipes-security/selinux/libselinux-python.inc rename to recipes-security/selinux/libselinux-python_3.2.bb index 7149d94..b741449 100644 --- a/recipes-security/selinux/libselinux-python.inc +++ b/recipes-security/selinux/libselinux-python_3.2.bb @@ -4,11 +4,20 @@ process and file security contexts and to obtain security policy \ decisions. Required for any applications that use the SELinux API." SECTION = "base" LICENSE = "PD" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" -FILESEXTRAPATHS_prepend := "${THISDIR}/libselinux:" +require selinux_common.inc inherit python3native python3targetconfig +FILESEXTRAPATHS_prepend := "${THISDIR}/libselinux:" +SRC_URI += "\ + file://0001-Makefile-fix-python-modules-install-path-for-multili.patch \ + file://0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch \ + " + +S = "${WORKDIR}/git/libselinux" + DEPENDS += "python3 swig-native libpcre libsepol" RDEPENDS_${PN} += "libselinux python3-core python3-shell" @@ -18,8 +27,8 @@ def get_policyconfigarch(d): p = re.compile('i.86') target = p.sub('i386',target) return "ARCH=%s" % (target) -EXTRA_OEMAKE += "${@get_policyconfigarch(d)}" +EXTRA_OEMAKE += "${@get_policyconfigarch(d)}" EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre' LIBSEPOLA='${STAGING_LIBDIR}/libsepol.a'" EXTRA_OEMAKE_append_libc-musl = " FTS_LDLIBS=-lfts" @@ -28,14 +37,14 @@ INSANE_SKIP_${PN} = "dev-so" do_compile() { oe_runmake pywrap -j1 \ - PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ - PYINC='-I${STAGING_INCDIR}/${PYLIBVER}' \ - PYLIBS='-L${STAGING_LIBDIR}/${PYLIBVER} -l${PYLIBVER}' + PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ + PYINC='-I${STAGING_INCDIR}/${PYLIBVER}' \ + PYLIBS='-L${STAGING_LIBDIR}/${PYLIBVER} -l${PYLIBVER}' } do_install() { oe_runmake install-pywrap \ - DESTDIR=${D} \ - PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ - PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' + DESTDIR=${D} \ + PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ + PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' } -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#52693): https://lists.yoctoproject.org/g/yocto/message/52693 Mute This Topic: https://lists.yoctoproject.org/mt/81298592/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
