diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2015-08-21 01:38:59 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-24 23:47:06 +0100 |
commit | 8754a006caaa5234313927506782bb2d0df32f04 (patch) | |
tree | d61f16da3c76b3e09c5130a9e848ed32306a3e9c /meta | |
parent | 20c6c72ad37df8c2bac118c93705874870dff6b3 (diff) | |
download | poky-8754a006caaa5234313927506782bb2d0df32f04.tar.gz |
libcap-ng: add package 0.7.7
Pull package from meta-oe to oe-core:
meta-oe commit: bce4dba5546480c8e43c6442959ac7d0a4ef32f6
The libcap-ng library is intended to make programming with posix
capabilities much easier than the traditional libcap library.
It's not a replacement to libcap, it provides different library
(libcap-ng.so) while packages explicitly look for libcap.so. It
could be used by qemu, util-linux, libvirt, audit ...
With adding it to oe-core, the copies from following layers could
be removed:
* meta-oe, meta-selinux, meta-security-framework ...
(From OE-Core rev: ad509d7644803ff9386affefe2ec1a3664027074)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng/python.patch | 58 | ||||
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb | 39 |
2 files changed, 97 insertions, 0 deletions
diff --git a/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch new file mode 100644 index 0000000000..59591eb469 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng/python.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From b01bb2694f66cd981e6d61523433dc3eb5ed32f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | ||
3 | Date: Sat, 18 Jul 2015 23:03:30 +0900 | ||
4 | Subject: [PATCH] configure.ac - Avoid an incorrect check for python. | ||
5 | Makefile.am - avoid hard coded host include paths. | ||
6 | |||
7 | Upstream-Status: pending | ||
8 | |||
9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
10 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | ||
11 | --- | ||
12 | bindings/python/Makefile.am | 3 ++- | ||
13 | configure.ac | 15 ++------------- | ||
14 | 2 files changed, 4 insertions(+), 14 deletions(-) | ||
15 | |||
16 | diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am | ||
17 | index 82b9bb8..f9fe7a8 100644 | ||
18 | --- a/bindings/python/Makefile.am | ||
19 | +++ b/bindings/python/Makefile.am | ||
20 | @@ -23,7 +23,8 @@ SUBDIRS = test | ||
21 | CONFIG_CLEAN_FILES = *.loT *.rej *.orig | ||
22 | AM_CFLAGS = -fPIC -DPIC | ||
23 | PYLIBVER ?= python$(PYTHON_VERSION) | ||
24 | -AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ | ||
25 | +PYINC ?= /usr/include/$(PYLIBVER) | ||
26 | +AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) | ||
27 | LIBS = $(top_builddir)/src/libcap-ng.la | ||
28 | SWIG_FLAGS = -python | ||
29 | SWIG_INCLUDES = ${AM_CPPFLAGS} | ||
30 | diff --git a/configure.ac b/configure.ac | ||
31 | index 1d777d5..9d90f64 100644 | ||
32 | --- a/configure.ac | ||
33 | +++ b/configure.ac | ||
34 | @@ -123,19 +123,8 @@ if test x$use_python = xno ; then | ||
35 | else | ||
36 | AC_MSG_RESULT(testing) | ||
37 | AM_PATH_PYTHON | ||
38 | -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` | ||
39 | -if test -f ${PYINCLUDEDIR}/Python.h ; then | ||
40 | - python_found="yes" | ||
41 | - AC_SUBST(PYINCLUDEDIR) | ||
42 | - AC_MSG_NOTICE(Python bindings will be built) | ||
43 | -else | ||
44 | - python_found="no" | ||
45 | - if test x$use_python = xyes ; then | ||
46 | - AC_MSG_ERROR([Python explicitly required and python headers found]) | ||
47 | - else | ||
48 | - AC_MSG_WARN("Python headers not found - python bindings will not be made") | ||
49 | - fi | ||
50 | -fi | ||
51 | +python_found="yes" | ||
52 | +AC_MSG_NOTICE(Python bindings will be built) | ||
53 | fi | ||
54 | AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") | ||
55 | |||
56 | -- | ||
57 | 1.8.4.2 | ||
58 | |||
diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb new file mode 100644 index 0000000000..a31d5dc437 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | SUMMARY = "An alternate posix capabilities library" | ||
2 | DESCRIPTION = "The libcap-ng library is intended to make programming \ | ||
3 | with POSIX capabilities much easier than the traditional libcap library." | ||
4 | HOMEPAGE = "http://freecode.com/projects/libcap-ng" | ||
5 | SECTION = "base" | ||
6 | LICENSE = "GPLv2+ & LGPLv2.1+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
8 | file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" | ||
9 | |||
10 | SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ | ||
11 | file://python.patch" | ||
12 | |||
13 | inherit lib_package autotools pythonnative | ||
14 | |||
15 | SRC_URI[md5sum] = "3d7d126b29e2869a0257c17c8b0d9b2e" | ||
16 | SRC_URI[sha256sum] = "615549ce39b333f6b78baee0c0b4ef18bc726c6bf1cca123dfd89dd963f6d06b" | ||
17 | |||
18 | DEPENDS += "swig-native python" | ||
19 | |||
20 | EXTRA_OECONF += "--without-python3" | ||
21 | |||
22 | EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" | ||
23 | |||
24 | PACKAGES += "${PN}-python" | ||
25 | |||
26 | FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" | ||
27 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" | ||
28 | |||
29 | BBCLASSEXTEND = "native" | ||
30 | |||
31 | do_install_append() { | ||
32 | # Moving libcap-ng to base_libdir | ||
33 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then | ||
34 | mkdir -p ${D}/${base_libdir}/ | ||
35 | mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ | ||
36 | relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} | ||
37 | ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so | ||
38 | fi | ||
39 | } | ||