Skip to contentSkip to conversation

libcap2: add libpam to DEPENDS

PATCH In review Andreas Oberritter 4 participants 6 messages Jan 13, 2011 – Jan 14, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libcap2: add libpam to DEPENDS

* 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

CC Frans Meulenbroeks <[email protected]>
---
 recipes/libcap/libcap2_2.16.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/libcap/libcap2_2.16.bb +2 -2
index 97b03d5..be0788e 100644
@@ -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"
Signature · 1 line
1.7.2.3
Acked-by on v1 1/1
#1 lore raw
Quoted 37 lines · Andreas Oberritter

* 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

CC Frans Meulenbroeks <[email protected]>

---
 recipes/libcap/libcap2_2.16.bb |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/libcap/libcap2_2.16.bb +0 -0
index 97b03d5..be0788e 100644
@@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO

 PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"

recipes/libcap/libcap2_2.16.bb +2 -2
-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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#2 lore raw
In reply to Andreas Oberritter
Quoted 9 lines · Andreas Oberritter

* 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

Possible to use the pam DISTRO_FEATURE?

Quoted 19 lines
---
  recipes/libcap/libcap2_2.16.bb |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
recipes/libcap/libcap2_2.16.bb +2 -2
index 97b03d5..be0788e 100644
@@ -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"
Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
#3 lore raw

PATCH 1/1 libcap2: fix build with and without libpam

* 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

CC Frans Meulenbroeks <[email protected]>
CC Otavio Salvador <[email protected]>
CC Tom Rini <[email protected]>

---
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(-)
recipes/libcap/libcap2-2.16/make.patch +12 -3
index 3672f77..2d88ad9 100644
@@ -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
recipes/libcap/libcap2_2.16.bb +4 -2
index 97b03d5..33594de 100644
@@ -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/
Signature · 1 line
1.7.2.3
#4 lore raw

Re: [PATCH] libcap2: fix build with and without libpam

Quoted 40 lines · Andreas Oberritter

* 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

CC Frans Meulenbroeks <[email protected]>
CC Otavio Salvador <[email protected]>
CC Tom Rini <[email protected]>

---
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(-)
recipes/libcap/libcap2-2.16/make.patch +5 -3
index 3672f77..2d88ad9 100644
@@ -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)

recipes/libcap/libcap2-2.16/make.patch +0 -0
@@ -21,3 +23,10 @@
 
Quoted 6 lines

 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

Quoted 36 lines

+ 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

recipes/libcap/libcap2_2.16.bb +0 -0
index 97b03d5..33594de 100644
@@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO

 PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"

recipes/libcap/libcap2_2.16.bb +2 -2
-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"

recipes/libcap/libcap2_2.16.bb +0 -0
@@ -15,6 +15,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libca
 

 S = "${WORKDIR}/libcap-${PV}"

recipes/libcap/libcap2_2.16.bb +2 -0
+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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#5 lore raw

PATCH v3 1/1 libcap2: fix build with and without libpam

* 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

CC Frans Meulenbroeks <[email protected]>
CC Otavio Salvador <[email protected]>
CC Tom Rini <[email protected]>
CC Khem Raj <[email protected]>

---
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(-)
recipes/libcap/libcap2-2.16/make.patch +14 -4
index 3672f77..b8508e4 100644
@@ -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
recipes/libcap/libcap2_2.16.bb +4 -2
index 97b03d5..beb45f2 100644
@@ -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/
Signature · 1 line
1.7.2.3