[oe-commits] Koen Kooi : libcap2: drop, it's in oe-core already

[git version control]

Module: meta-openembedded.git
Branch: master
Commit: 15a5642b2a4df41dc0adf9d250cd5085eaf1d69b
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=15a5642b2a4df41dc0adf9d250cd5085eaf1d69b

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue Jun 28 14:51:58 2011 +0200

libcap2: drop, it's in oe-core already

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/recipes-core/libcap/libcap2/make.patch |   30 ------------------------
 meta-oe/recipes-core/libcap/libcap2_2.20.bb    |   29 -----------------------
 2 files changed, 0 insertions(+), 59 deletions(-)

diff --git a/meta-oe/recipes-core/libcap/libcap2/make.patch b/meta-oe/recipes-core/libcap/libcap2/make.patch
deleted file mode 100644
index 57a2cae..0000000
--- a/meta-oe/recipes-core/libcap/libcap2/make.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -47,25 +47,18 @@
- KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
- 
--CC := gcc
--CFLAGS := -O2
--BUILD_CC := $(CC)
--BUILD_CFLAGS := $(CFLAGS) $(IPATH)
--AR := ar
--RANLIB := ranlib
- DEBUG = -g #-DDEBUG
- WARNINGS=-Wall -Wwrite-strings \
-         -Wpointer-arith -Wcast-qual -Wcast-align \
-         -Wstrict-prototypes -Wmissing-prototypes \
-         -Wnested-externs -Winline -Wshadow
- LD=$(CC) -Wl,-x -shared
--LDFLAGS := #-g
- 
--SYSTEM_HEADERS = /usr/include
-+SYSTEM_HEADERS ?= /usr/include
- INCS=$(topdir)/libcap/include/sys/capability.h
- LDFLAGS += -L$(topdir)/libcap
- CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
--PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
-+PAM_CAP := $(shell if [ -f $(SYSTEM_HEADERS)/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
- INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
- DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
- LIBATTR := yes
diff --git a/meta-oe/recipes-core/libcap/libcap2_2.20.bb b/meta-oe/recipes-core/libcap/libcap2_2.20.bb
deleted file mode 100644
index ec124e6..0000000
--- a/meta-oe/recipes-core/libcap/libcap2_2.20.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities."
-PRIORITY = "optional"
-SECTION = "libs"
-LICENSE = "GPLv1"
-LIC_FILES_CHKSUM = "file://License;md5=731de803c1ccbcb05a9b3523279c8d7f"
-
-DEPENDS = "bison-native flex-native attr ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \
-	   file://make.patch \
-	"
-
-SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
-SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"
-
-S = "${WORKDIR}/libcap-${PV}"
-
-EXTRA_OEMAKE = "SYSTEM_HEADERS=${STAGING_INCDIR}"
-
-BUILD_CFLAGS += "-I${S}/libcap/include"
-CFLAGS += "-I${S}/libcap/include"
-LDFLAGS =+ "-L../libcap"
-
-do_install() {
-	install -d ${D}${includedir}/sys
-	install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/
-	install -d ${D}${libdir}
-	oe_libinstall -s -C libcap libcap ${D}${libdir}
-}