* [PATCH] libcap2: add libpam to DEPENDS @ 2011-01-13 21:19 Andreas Oberritter 2011-01-13 21:25 ` Otavio Salvador 2011-01-13 21:29 ` Tom Rini 0 siblings, 2 replies; 6+ messages in thread From: Andreas Oberritter @ 2011-01-13 21:19 UTC (permalink / raw) To: openembedded-devel * Fixes the following compile error: pam_cap.c:19:34: error: security/pam_modules.h: No such file or directory pam_cap.c:20:34: error: security/_pam_macros.h: No such file or directory Signed-off-by: Andreas Oberritter <obi@opendreambox.org> CC: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> --- recipes/libcap/libcap2_2.16.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb index 97b03d5..be0788e 100644 --- a/recipes/libcap/libcap2_2.16.bb +++ b/recipes/libcap/libcap2_2.16.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO PRIORITY = "optional" SECTION = "libs" LICENSE = "GPL" -DEPENDS = "bison-native flex-native attr" -PR = "r2" +DEPENDS = "bison-native flex-native attr libpam" +PR = "r3" BUILD_CFLAGS += "-I${S}/libcap/include" CFLAGS += "-I${S}/libcap/include" -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] libcap2: add libpam to DEPENDS 2011-01-13 21:19 [PATCH] libcap2: add libpam to DEPENDS Andreas Oberritter @ 2011-01-13 21:25 ` Otavio Salvador 2011-01-13 21:29 ` Tom Rini 1 sibling, 0 replies; 6+ messages in thread From: Otavio Salvador @ 2011-01-13 21:25 UTC (permalink / raw) To: openembedded-devel Acked-by: Otavio Salvador <otavio@ossystems.com.br> On Thu, Jan 13, 2011 at 19:19, Andreas Oberritter <obi@opendreambox.org> wrote: > * Fixes the following compile error: > > pam_cap.c:19:34: error: security/pam_modules.h: No such file or > directory > pam_cap.c:20:34: error: security/_pam_macros.h: No such file or > directory > > Signed-off-by: Andreas Oberritter <obi@opendreambox.org> > CC: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> > --- > recipes/libcap/libcap2_2.16.bb | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb > index 97b03d5..be0788e 100644 > --- a/recipes/libcap/libcap2_2.16.bb > +++ b/recipes/libcap/libcap2_2.16.bb > @@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO > PRIORITY = "optional" > SECTION = "libs" > LICENSE = "GPL" > -DEPENDS = "bison-native flex-native attr" > -PR = "r2" > +DEPENDS = "bison-native flex-native attr libpam" > +PR = "r3" > > BUILD_CFLAGS += "-I${S}/libcap/include" > CFLAGS += "-I${S}/libcap/include" > -- > 1.7.2.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] libcap2: add libpam to DEPENDS 2011-01-13 21:19 [PATCH] libcap2: add libpam to DEPENDS Andreas Oberritter 2011-01-13 21:25 ` Otavio Salvador @ 2011-01-13 21:29 ` Tom Rini 2011-01-13 22:24 ` [PATCH] libcap2: fix build with and without libpam Andreas Oberritter 1 sibling, 1 reply; 6+ messages in thread From: Tom Rini @ 2011-01-13 21:29 UTC (permalink / raw) To: openembedded-devel On 01/13/2011 02:19 PM, Andreas Oberritter wrote: > * Fixes the following compile error: > > pam_cap.c:19:34: error: security/pam_modules.h: No such file or > directory > pam_cap.c:20:34: error: security/_pam_macros.h: No such file or > directory > > Signed-off-by: Andreas Oberritter<obi@opendreambox.org> > CC: Frans Meulenbroeks<fransmeulenbroeks@gmail.com> Possible to use the pam DISTRO_FEATURE? > --- > recipes/libcap/libcap2_2.16.bb | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb > index 97b03d5..be0788e 100644 > --- a/recipes/libcap/libcap2_2.16.bb > +++ b/recipes/libcap/libcap2_2.16.bb > @@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO > PRIORITY = "optional" > SECTION = "libs" > LICENSE = "GPL" > -DEPENDS = "bison-native flex-native attr" > -PR = "r2" > +DEPENDS = "bison-native flex-native attr libpam" > +PR = "r3" > > BUILD_CFLAGS += "-I${S}/libcap/include" > CFLAGS += "-I${S}/libcap/include" -- Tom Rini Mentor Graphics Corporation ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] libcap2: fix build with and without libpam 2011-01-13 21:29 ` Tom Rini @ 2011-01-13 22:24 ` Andreas Oberritter 2011-01-13 23:57 ` Khem Raj 0 siblings, 1 reply; 6+ messages in thread From: Andreas Oberritter @ 2011-01-13 22:24 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador * Add libpam to depends if DISTRO_FEATURES contains pam. * Fixes the following compile error, when libpam-dev is installed on the host, but not built for the target: pam_cap.c:19:34: error: security/pam_modules.h: No such file or directory pam_cap.c:20:34: error: security/_pam_macros.h: No such file or directory Signed-off-by: Andreas Oberritter <obi@opendreambox.org> CC: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> CC: Otavio Salvador <otavio@ossystems.com.br> CC: Tom Rini <tom_rini@mentor.com> --- v2: Updated patch to fix both the dependency problem and the compile error without libpam. recipes/libcap/libcap2-2.16/make.patch | 15 ++++++++++++--- recipes/libcap/libcap2_2.16.bb | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/recipes/libcap/libcap2-2.16/make.patch b/recipes/libcap/libcap2-2.16/make.patch index 3672f77..2d88ad9 100644 --- a/recipes/libcap/libcap2-2.16/make.patch +++ b/recipes/libcap/libcap2-2.16/make.patch @@ -1,6 +1,8 @@ ---- libcap-2.16/Make.Rules.orig 2009-03-07 18:50:23.000000000 +0100 -+++ libcap-2.16/Make.Rules 2009-03-07 18:50:44.000000000 +0100 -@@ -45,19 +45,12 @@ +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) @@ -21,3 +23,10 @@ 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 $(STAGING_INCDIR)/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 index 97b03d5..33594de 100644 --- a/recipes/libcap/libcap2_2.16.bb +++ b/recipes/libcap/libcap2_2.16.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO PRIORITY = "optional" SECTION = "libs" LICENSE = "GPL" -DEPENDS = "bison-native flex-native attr" -PR = "r2" +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" @@ -15,6 +15,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libca S = "${WORKDIR}/libcap-${PV}" +EXTRA_OEMAKE = "STAGING_INCDIR=${STAGING_INCDIR}" + do_install() { install -d ${D}${includedir}/sys install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/ -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] libcap2: fix build with and without libpam 2011-01-13 22:24 ` [PATCH] libcap2: fix build with and without libpam Andreas Oberritter @ 2011-01-13 23:57 ` Khem Raj 2011-01-14 1:41 ` [PATCH v3] " Andreas Oberritter 0 siblings, 1 reply; 6+ messages in thread From: Khem Raj @ 2011-01-13 23:57 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador On Thu, Jan 13, 2011 at 2:24 PM, Andreas Oberritter <obi@opendreambox.org> wrote: > * Add libpam to depends if DISTRO_FEATURES contains pam. > > * Fixes the following compile error, when libpam-dev is installed > on the host, but not built for the target: > > pam_cap.c:19:34: error: security/pam_modules.h: No such file or > directory > pam_cap.c:20:34: error: security/_pam_macros.h: No such file or > directory > > Signed-off-by: Andreas Oberritter <obi@opendreambox.org> > CC: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> > CC: Otavio Salvador <otavio@ossystems.com.br> > CC: Tom Rini <tom_rini@mentor.com> > --- > v2: Updated patch to fix both the dependency problem and > the compile error without libpam. > > recipes/libcap/libcap2-2.16/make.patch | 15 ++++++++++++--- > recipes/libcap/libcap2_2.16.bb | 6 ++++-- > 2 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/recipes/libcap/libcap2-2.16/make.patch b/recipes/libcap/libcap2-2.16/make.patch > index 3672f77..2d88ad9 100644 > --- a/recipes/libcap/libcap2-2.16/make.patch > +++ b/recipes/libcap/libcap2-2.16/make.patch > @@ -1,6 +1,8 @@ > ---- libcap-2.16/Make.Rules.orig 2009-03-07 18:50:23.000000000 +0100 > -+++ libcap-2.16/Make.Rules 2009-03-07 18:50:44.000000000 +0100 > -@@ -45,19 +45,12 @@ > +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) > > @@ -21,3 +23,10 @@ > > 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 $(STAGING_INCDIR)/security/pam_modules.h ]; then echo yes ; else echo no ; fi) can you use ${includedir} or something else ? STAGING_INCDIR is an OE variable we should avoid perpetuating it into sourcecode and limit it to metadata if possible > + 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 > index 97b03d5..33594de 100644 > --- a/recipes/libcap/libcap2_2.16.bb > +++ b/recipes/libcap/libcap2_2.16.bb > @@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO > PRIORITY = "optional" > SECTION = "libs" > LICENSE = "GPL" > -DEPENDS = "bison-native flex-native attr" > -PR = "r2" > +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" > @@ -15,6 +15,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libca > > S = "${WORKDIR}/libcap-${PV}" > > +EXTRA_OEMAKE = "STAGING_INCDIR=${STAGING_INCDIR}" > + > do_install() { > install -d ${D}${includedir}/sys > install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/ > -- > 1.7.2.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] libcap2: fix build with and without libpam 2011-01-13 23:57 ` Khem Raj @ 2011-01-14 1:41 ` Andreas Oberritter 0 siblings, 0 replies; 6+ messages in thread From: Andreas Oberritter @ 2011-01-14 1:41 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador * Add libpam to depends if DISTRO_FEATURES contains pam. * Fixes the following compile error, when libpam-dev is installed on the host, but not built for the target: pam_cap.c:19:34: error: security/pam_modules.h: No such file or directory pam_cap.c:20:34: error: security/_pam_macros.h: No such file or directory Signed-off-by: Andreas Oberritter <obi@opendreambox.org> CC: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> CC: Otavio Salvador <otavio@ossystems.com.br> CC: Tom Rini <tom_rini@mentor.com> CC: Khem Raj <raj.khem@gmail.com> --- v3: Use SYSTEM_HEADERS instead of STAGING_INCDIR. recipes/libcap/libcap2-2.16/make.patch | 18 ++++++++++++++---- recipes/libcap/libcap2_2.16.bb | 6 ++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/recipes/libcap/libcap2-2.16/make.patch b/recipes/libcap/libcap2-2.16/make.patch index 3672f77..b8508e4 100644 --- a/recipes/libcap/libcap2-2.16/make.patch +++ b/recipes/libcap/libcap2-2.16/make.patch @@ -1,6 +1,8 @@ ---- libcap-2.16/Make.Rules.orig 2009-03-07 18:50:23.000000000 +0100 -+++ libcap-2.16/Make.Rules 2009-03-07 18:50:44.000000000 +0100 -@@ -45,19 +45,12 @@ +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) @@ -19,5 +21,13 @@ -LD=$(CC) -Wl,-x -shared -LDFLAGS := #-g - SYSTEM_HEADERS = /usr/include +-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_2.16.bb b/recipes/libcap/libcap2_2.16.bb index 97b03d5..beb45f2 100644 --- a/recipes/libcap/libcap2_2.16.bb +++ b/recipes/libcap/libcap2_2.16.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO PRIORITY = "optional" SECTION = "libs" LICENSE = "GPL" -DEPENDS = "bison-native flex-native attr" -PR = "r2" +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" @@ -15,6 +15,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libca 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/ -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-14 1:42 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-01-13 21:19 [PATCH] libcap2: add libpam to DEPENDS Andreas Oberritter 2011-01-13 21:25 ` Otavio Salvador 2011-01-13 21:29 ` Tom Rini 2011-01-13 22:24 ` [PATCH] libcap2: fix build with and without libpam Andreas Oberritter 2011-01-13 23:57 ` Khem Raj 2011-01-14 1:41 ` [PATCH v3] " Andreas Oberritter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox