From 54c662d28a3b05c6f0172bdc4d4dfb13e9755101 Mon Sep 17 00:00:00 2001 From: zangrc Date: Fri, 27 Nov 2020 15:08:48 +0800 Subject: libcap-ng: upgrade 0.8 -> 0.8.1 Signed-off-by: Zang Ruochen Signed-off-by: Richard Purdie --- .../libcap-ng/libcap-ng-python_0.8.1.bb | 29 ++++++++++++++++++++++ .../libcap-ng/libcap-ng-python_0.8.bb | 29 ---------------------- meta/recipes-support/libcap-ng/libcap-ng.inc | 2 +- meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb | 17 +++++++++++++ meta/recipes-support/libcap-ng/libcap-ng_0.8.bb | 17 ------------- 5 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng-python_0.8.bb create mode 100644 meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng_0.8.bb diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb new file mode 100644 index 0000000000..43f76dc561 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb @@ -0,0 +1,29 @@ +require libcap-ng.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" + +SUMMARY .= " - python" + +inherit lib_package autotools python3native + +DEPENDS += "libcap-ng python3 swig-native" + +S = "${WORKDIR}/libcap-ng-${PV}" + +EXTRA_OECONF += "--with-python --with-python3" +EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" + +do_install_append() { + rm -rf ${D}${bindir} + rm -rf ${D}${libdir}/.debug + rm -f ${D}${libdir}/lib* + rm -rf ${D}${libdir}/pkgconfig + rm -rf ${D}${datadir} + rm -rf ${D}${includedir} +} + +# PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}" +FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" + diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.bb deleted file mode 100644 index 43f76dc561..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.bb +++ /dev/null @@ -1,29 +0,0 @@ -require libcap-ng.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" - -SUMMARY .= " - python" - -inherit lib_package autotools python3native - -DEPENDS += "libcap-ng python3 swig-native" - -S = "${WORKDIR}/libcap-ng-${PV}" - -EXTRA_OECONF += "--with-python --with-python3" -EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" - -do_install_append() { - rm -rf ${D}${bindir} - rm -rf ${D}${libdir}/.debug - rm -f ${D}${libdir}/lib* - rm -rf ${D}${libdir}/pkgconfig - rm -rf ${D}${datadir} - rm -rf ${D}${includedir} -} - -# PACKAGES = "${PN}" - -FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}" -FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" - diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index 3d25b4cbd9..a312b602ff 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -11,6 +11,6 @@ SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ file://python.patch \ " -SRC_URI[sha256sum] = "f14d23b60ae1465b032e4e8cbd4112006572c69a6017d55d5d3c6aad622a9e21" +SRC_URI[sha256sum] = "f06b17aaca029e245c9a26c698c6cc8a1cf42b58483d93e94ee02b478bdc1055" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb new file mode 100644 index 0000000000..6e6de45494 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb @@ -0,0 +1,17 @@ +require libcap-ng.inc + +inherit lib_package autotools + +EXTRA_OECONF += "--without-python --without-python3" + +BBCLASSEXTEND = "native nativesdk" + +do_install_append() { + # Moving libcap-ng to base_libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ + relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} + ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so + fi +} diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.bb deleted file mode 100644 index 6e6de45494..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.bb +++ /dev/null @@ -1,17 +0,0 @@ -require libcap-ng.inc - -inherit lib_package autotools - -EXTRA_OECONF += "--without-python --without-python3" - -BBCLASSEXTEND = "native nativesdk" - -do_install_append() { - # Moving libcap-ng to base_libdir - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ - relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} - ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so - fi -} -- cgit 1.2.3-korg