| Submitter | Otavio Salvador |
|---|---|
| Date | Dec. 9, 2011, 8:01 p.m. |
| Message ID | <1323460893-30873-1-git-send-email-otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/16621/ |
| State | Accepted |
| Commit | db692fd5706eab9bfd94c115591d1411cf8e196e |
| Headers | show |
Comments
On Fri, Dec 9, 2011 at 12:01 PM, Otavio Salvador <otavio@ossystems.com.br> wrote: > +# 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 > +} > + may be you can cache that in site files instead of this.
On Fri, Dec 9, 2011 at 18:14, Khem Raj <raj.khem@gmail.com> wrote: > On Fri, Dec 9, 2011 at 12:01 PM, Otavio Salvador > <otavio@ossystems.com.br> wrote: > > +# 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 > > +} > > + > > may be you can cache that in site files instead of this. > I'm willing to try to drop this in a next patch but I'd prefer this to get in before and get connman in a working shape again before focusing on improvements for it.
On Fri, Dec 9, 2011 at 12:19 PM, Otavio Salvador <otavio@ossystems.com.br> wrote: > On Fri, Dec 9, 2011 at 18:14, Khem Raj <raj.khem@gmail.com> wrote: >> >> On Fri, Dec 9, 2011 at 12:01 PM, Otavio Salvador >> <otavio@ossystems.com.br> wrote: >> > +# 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 >> > +} >> > + >> >> may be you can cache that in site files instead of this. > > > I'm willing to try to drop this in a next patch but I'd prefer this to get > in before and get connman in a working shape again before focusing on > improvements for it. your patch is already available for who are in hurry.
On Fri, Dec 9, 2011 at 18:23, Khem Raj <raj.khem@gmail.com> wrote: > > I'm willing to try to drop this in a next patch but I'd prefer this to > get > > in before and get connman in a working shape again before focusing on > > improvements for it. > > your patch is already available for who are in hurry. The problem is that fails to build for some people (it works for me) and thus I would prefer it to be in a working state before doing more cleanups. This was being done on meta-oe so connman works fine and we are using it here with this change. As I said I will fix it soon.
On Fri, 2011-12-09 at 20:01 +0000, Otavio Salvador wrote: > Disable building of 'alg-test' and checking for if_alg.h header. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > meta/recipes-connectivity/connman/connman.inc | 8 ++++++++ > meta/recipes-connectivity/connman/connman_0.78.bb | 2 +- > 2 files changed, 9 insertions(+), 1 deletions(-) Merged to master, thanks. Longer term I think we need to check into this failure more but for now it will get people's builds working again which is good. Richard
Patch
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index d695fee..503bf1c 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -49,6 +49,14 @@ 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 } diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb index 5ea2bb7..378bd9d 100644 --- a/meta/recipes-connectivity/connman/connman_0.78.bb +++ b/meta/recipes-connectivity/connman/connman_0.78.bb @@ -1,6 +1,6 @@ require connman.inc -PR = "r2" +PR = "r3" # 0.78 tag SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"
Disable building of 'alg-test' and checking for if_alg.h header. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta/recipes-connectivity/connman/connman.inc | 8 ++++++++ meta/recipes-connectivity/connman/connman_0.78.bb | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-)