connman: disable 'alg-test' building

PATCH Applied Otavio Salvador 3 participants 6 messages Dec 17, 2011 – Dec 21, 2011 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Otavio Salvador

author

2011-12-17 11:44 UTC #1 lore raw

PATCH 1/1 connman: disable 'alg-test' building

'alg-test' requires 'linux/if_alg.h' header enforcing a dependency on linux-libc-headers 2.6.39 or newer.

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-connectivity/connman/connman.inc      |    8 ---
 .../connman/connman/disable_alg-test.patch         |   46 ++++++++++++++++++++
 meta/recipes-connectivity/connman/connman_0.78.bb  |    3 +-
 3 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch

meta/recipes-connectivity/connman/connman.inc +0 -8

index bb1b279..d1bf7cd 100644
@@ -49,14 +49,6 @@ USERADD_PARAM_${PN} = "--system --no-create-home \
 
 inherit autotools pkgconfig update-rc.d useradd
 
-# alg-test doesn't build, so disable that and test
-# for if_alg.h as this header is only in 2.6.39
-do_configure_prepend() {
-	sed -i 's:tools/alg-test ::g' Makefile.am
-	sed -i 's:AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,::g;
-	        s:AC_MSG_ERROR(User-space algorithm header files are required))::g' configure.ac
-}
-
 do_compile_append() {
 	sed -i -e s:deny:allow:g src/connman-dbus.conf
 }

meta/recipes-connectivity/connman/connman/disable_alg-test.patch new file +46 -0

46 lines not on this page · raw message

meta/recipes-connectivity/connman/connman_0.78.bb +2 -1

index 74c102b..c73cad9 100644
@@ -1,11 +1,12 @@
 require connman.inc
 
-PR = "r5"
+PR = "r6"
 
 # 0.78 tag
 SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"
 SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
             file://add_xuser_dbus_permission.patch \
             file://ethernet_default.patch \
+            file://disable_alg-test.patch \
             file://connman"
 S = "${WORKDIR}/git"

Signature · 1 line

1.7.2.5

Richard Purdie

Applied

2011-12-19 12:24 UTC #2 lore raw

Quoted 10 lines · Otavio Salvador

'alg-test' requires 'linux/if_alg.h' header enforcing a dependency on linux-libc-headers 2.6.39 or newer.
Signed-off-by Otavio Salvador <[email protected]>
---
 meta/recipes-connectivity/connman/connman.inc      |    8 ---
 .../connman/connman/disable_alg-test.patch         |   46 ++++++++++++++++++++
 meta/recipes-connectivity/connman/connman_0.78.bb  |    3 +-
 3 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch

Merged to master, thanks.

Richard

Darren Hart

2011-12-21 03:28 UTC #3 lore raw

In reply to Otavio Salvador

I just refreshed poky master with this patch included and now see the following building core-image-sato:

| checking for dbus_connection_can_send_type in -ldbus-1... yes
| checking for XTABLES... yes
| checking for GNUTLS... yes
| checking linux/if_alg.h usability... no
| checking linux/if_alg.h presence... no
| checking for linux/if_alg.h... no
| configure: error: User-space algorithm header files are required
| ERROR: oe_runconf failed

NOTE: package connman-0.78-r6: task do_configure: Failed

Reverting this patch allows the build to complete.

(I understand this is poky related and not oe-core, but as the context for this patch is here, I opted to continue the discussion here.)

--
Darren

Quoted 100 lines · Otavio Salvador

'alg-test' requires 'linux/if_alg.h' header enforcing a dependency on linux-libc-headers 2.6.39 or newer.

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-connectivity/connman/connman.inc      |    8 ---
 .../connman/connman/disable_alg-test.patch         |   46 ++++++++++++++++++++
 meta/recipes-connectivity/connman/connman_0.78.bb  |    3 +-
 3 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch

meta/recipes-connectivity/connman/connman.inc +0 -8

index bb1b279..d1bf7cd 100644
@@ -49,14 +49,6 @@ USERADD_PARAM_${PN} = "--system --no-create-home \
 
 inherit autotools pkgconfig update-rc.d useradd
 
-# alg-test doesn't build, so disable that and test
-# for if_alg.h as this header is only in 2.6.39
-do_configure_prepend() {
-	sed -i 's:tools/alg-test ::g' Makefile.am
-	sed -i 's:AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,::g;
-	        s:AC_MSG_ERROR(User-space algorithm header files are required))::g' configure.ac
-}
-
 do_compile_append() {
 	sed -i -e s:deny:allow:g src/connman-dbus.conf
 }

meta/recipes-connectivity/connman/connman/disable_alg-test.patch new file +46 -0

new file mode 100644
index 0000000..c231d75
@@ -0,0 +1,46 @@
+From b9a20c8eb61b600ced284646a1bea588fdd8a5ea Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <[email protected]>
+Date: Fri, 16 Dec 2011 19:31:59 -0200
+Subject: [PATCH] Disable building of alg-test
+
+alg-test utility depends on linux/if_alg.h header that is only
+available on kernels >= 2.6.39.
+
+Upstream Status: Inappropriate [configuration]
+
+Signed-off-by: Otavio Salvador <[email protected]>
+---
+ Makefile.am  |    2 +-
+ configure.ac |    3 ---
+ 2 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d5a76f9..d42a766 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -144,7 +144,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \
+ 			tools/dbus-test tools/polkit-test \
+ 			tools/iptables-test tools/tap-test tools/wpad-test \
+ 			tools/stats-tool tools/private-network-test \
+-			tools/alg-test unit/test-session
++			unit/test-session
+ 
+ tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
+ tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
+diff --git a/configure.ac b/configure.ac
+index f63fea8..67bfe85 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -437,9 +437,6 @@ if (test "${enable_tools}" = "yes"); then
+ 				AC_MSG_ERROR(GnuTLS library is required))
+ 	AC_SUBST(GNUTLS_CFLAGS)
+ 	AC_SUBST(GNUTLS_LIBS)
+-
+-	AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,
+-		AC_MSG_ERROR(User-space algorithm header files are required))
+ fi
+ AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
+ 
+-- 
+1.7.7.3
+

meta/recipes-connectivity/connman/connman_0.78.bb +2 -1

index 74c102b..c73cad9 100644
@@ -1,11 +1,12 @@
 require connman.inc
 
-PR = "r5"
+PR = "r6"
 
 # 0.78 tag
 SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"
 SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
             file://add_xuser_dbus_permission.patch \
             file://ethernet_default.patch \
+            file://disable_alg-test.patch \
             file://connman"
 S = "${WORKDIR}/git"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Otavio Salvador

author

2011-12-21 03:35 UTC #4 lore raw

Quoted 3 lines · Darren Hart

(I understand this is poky related and not oe-core, but as the context for this patch is here, I opted to continue the discussion here.)

It seems you haven't applied the patch as it shows the message that the patch clearly remove.

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

Darren Hart

2011-12-21 03:47 UTC #5 lore raw

Quoted 9 lines · Otavio Salvador

On Wed, Dec 21, 2011 at 01:21, Darren Hart <[email protected] <mailto:[email protected]>> wrote:
(I understand this is poky related and not oe-core, but as the context for this patch is here, I opted to continue the discussion here.)
It seems you haven't applied the patch as it shows the message that the patch clearly remove.

I did have the commit in my source tree, but something didn't trigger as a cleanall and rebuild of connman succeeded. The tree was a clean master, perhaps my sstate had a previous PR=r6 from our earlier testing or something like that. Strange.

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Otavio Salvador

author

2011-12-21 04:03 UTC #6 lore raw

Quoted 10 lines · Darren Hart

Quoted 4 lines · Otavio Salvador
On Wed, Dec 21, 2011 at 01:21, Darren Hart <[email protected] <mailto:[email protected]>> wrote:
(I understand this is poky related and not oe-core, but as the
context
Quoted 3 lines
for this patch is here, I opted to continue the discussion here.)

Quoted 7 lines

Quoted 2 lines
It seems you haven't applied the patch as it shows the message that the patch clearly remove.
I did have the commit in my source tree, but something didn't trigger as a cleanall and rebuild of connman succeeded. The tree was a clean master, perhaps my sstate had a previous PR=r6 from our earlier testing or something like that. Strange.

Ufa! EYOUOUGHTGETCOFFEE :P

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