Fix compilation with newer kernel headers: | .../tmp/sysroots/.../usr/include/asm/sigcontext.h:28:2: error: | expected specifier-qualifier-list before '__u64' | .../tmp/sysroots/.../usr/include/asm/sigcontext.h:191:2: error: | expected specifier-qualifier-list before '__u64' | make[1]: *** [capsh.o] Error 1
Signed-off-by: Otavio Salvador <[email protected]> --- recipes/libcap/libcap2-2.16/make.patch | 33 -------------------------------- recipes/libcap/libcap2/make.patch | 30 +++++++++++++++++++++++++++++ recipes/libcap/libcap2_2.16.bb | 28 --------------------------- recipes/libcap/libcap2_2.20.bb | 28 +++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 61 deletions(-) delete mode 100644 recipes/libcap/libcap2-2.16/make.patch create mode 100644 recipes/libcap/libcap2/make.patch delete mode 100644 recipes/libcap/libcap2_2.16.bb create mode 100644 recipes/libcap/libcap2_2.20.bb diff --git a/recipes/libcap/libcap2-2.16/make.patch b/recipes/libcap/libcap2-2.16/make.patch deleted file mode 100644 index b8508e4..0000000 --- a/recipes/libcap/libcap2-2.16/make.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: libcap-2.16/Make.Rules -=================================================================== ---- libcap-2.16.orig/Make.Rules 2008-12-04 08:03:30.000000000 +0100 -+++ libcap-2.16/Make.Rules 2011-01-13 22:51:04.568844000 +0100 -@@ -45,25 +45,18 @@ - KERNEL_HEADERS := $(topdir)/libcap/include - IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) - --CC := gcc --CFLAGS := -O2 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) $(IPATH) --AR := ar --RANLIB := ranlib -+LD=$(CC) -Wl,-x -shared - DEBUG = -g #-DDEBUG - WARNINGS=-fPIC -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) $(IPATH) --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/recipes/libcap/libcap2/make.patch b/recipes/libcap/libcap2/make.patch new file mode 100644 index 0000000..57a2cae --- /dev/null +++ b/recipes/libcap/libcap2/make.patch @@ -0,0 +1,30 @@ +--- 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/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb deleted file mode 100644 index beb45f2..0000000 --- a/recipes/libcap/libcap2_2.16.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities." -PRIORITY = "optional" -SECTION = "libs" -LICENSE = "GPL" -DEPENDS = "bison-native flex-native attr ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -PR = "r3" - -BUILD_CFLAGS += "-I${S}/libcap/include" -CFLAGS += "-I${S}/libcap/include" -LDFLAGS =+ "-L../libcap" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \ - file://make.patch \ - " - -S = "${WORKDIR}/libcap-${PV}" - -EXTRA_OEMAKE = "SYSTEM_HEADERS=${STAGING_INCDIR}" - -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} -} - -SRC_URI[md5sum] = "6e2c9d0f3c3118e41cd07288ba9577ce" -SRC_URI[sha256sum] = "9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f" diff --git a/recipes/libcap/libcap2_2.20.bb b/recipes/libcap/libcap2_2.20.bb new file mode 100644 index 0000000..8f7dc3b --- /dev/null +++ b/recipes/libcap/libcap2_2.20.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities." +PRIORITY = "optional" +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "bison-native flex-native attr ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +PR = "r0" + +BUILD_CFLAGS += "-I${S}/libcap/include" +CFLAGS += "-I${S}/libcap/include" +LDFLAGS =+ "-L../libcap" + +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}" + +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} +} -- 1.7.2.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
