From fb15ab37528937319201b7f47fc1c8af80906074 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 23 Oct 2019 18:20:18 -0700 Subject: Revert "libcap-ng:upgrade 0.7.9 -> 0.7.10" This reverts commit 1d5ab1936c9fdf5d2613562ab1ace920089de49b. --- .../libcap-ng/libcap-ng-python_0.7.10.bb | 29 ---------------------- .../libcap-ng/libcap-ng-python_0.7.9.bb | 29 ++++++++++++++++++++++ meta/recipes-support/libcap-ng/libcap-ng.inc | 6 ++--- meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb | 18 -------------- meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb | 18 ++++++++++++++ 5 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb create mode 100644 meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb create mode 100644 meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb deleted file mode 100644 index 43f76dc561..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.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-python_0.7.9.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb new file mode 100644 index 0000000000..43f76dc561 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.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.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index aec83896e4..739b91fd2e 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -11,7 +11,7 @@ SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ file://python.patch \ " -SRC_URI[md5sum] = "57dc267e2949cdecb651a929f9206572" -SRC_URI[sha256sum] = "a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf" +SRC_URI[md5sum] = "2398d695508fab9ce33668c53a89b0e9" +SRC_URI[sha256sum] = "4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328" -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native nativesdk" \ No newline at end of file diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb deleted file mode 100644 index a9a046571f..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb +++ /dev/null @@ -1,18 +0,0 @@ -require libcap-ng.inc - -inherit lib_package autotools - -EXTRA_OECONF += "--without-python --without-python3" -LDFLAGS_append_class-native = " -pthread" - -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.7.9.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb new file mode 100644 index 0000000000..a9a046571f --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb @@ -0,0 +1,18 @@ +require libcap-ng.inc + +inherit lib_package autotools + +EXTRA_OECONF += "--without-python --without-python3" +LDFLAGS_append_class-native = " -pthread" + +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