Received: from mail-bw0-f47.google.com ([209.85.214.47]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Q2UHl-0000dC-Gu for openembedded-devel@lists.openembedded.org; Wed, 23 Mar 2011 21:04:05 +0100 Received: by bwz10 with SMTP id 10so6846461bwz.6 for ; Wed, 23 Mar 2011 13:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=4QLuPvk5WhpwGbe+yQvtNJFb3mIrWD+Ogi1XxkcsquU=; b=hzLjCXHIoooGM6KGpahRB52622COkamARUYtpM21G0EHIuDKCtyuqn9DrfCwsb+Yel dYQ1oOysuHHThYjoTkz7aqI0CIncmJF+hXcrMdOnojCNmj1x4fvPKhxWM+sq6rRKjjSO l9/qbhP+KFEu9CcJVzfWqSByUovXifZvqAW0k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=C4ISPdj38fdrSPluuCXNj3bY5ofklXlcIhJVtQoCzW00/7U15mbQjmL3oGHWv7nrPn YTMeRUzoLuxHG83cTJJfAXATlll8FOsTChEOFhwaA+gJkgTID4cI/dKScHI3TRhcOu2R P5O4/CMZK+C8KpVESH3PCLFztMZEBPDXwmQeE= Received: by 10.204.22.202 with SMTP id o10mr6784173bkb.70.1300910534055; Wed, 23 Mar 2011 13:02:14 -0700 (PDT) Received: from localhost (161-24.13.24.78.awnet.cz [78.24.13.161]) by mx.google.com with ESMTPS id l1sm6201348bkl.13.2011.03.23.13.02.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2011 13:02:13 -0700 (PDT) Date: Wed, 23 Mar 2011 21:02:06 +0100 From: Martin Jansa To: openembedded-devel@lists.openembedded.org Message-ID: <20110323200206.GL3418@jama.jama.net> References: <20110323162552.GH3418@jama.jama.net> <1300899470-10514-1-git-send-email-Martin.Jansa@gmail.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [PATCH 1/2] libnl-1.1: rename to libnl1 and build only static lib X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2011 20:04:05 -0000 X-Groupsio-MsgNum: 30565 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oOpJzULQ70+PGW7h" Content-Disposition: inline --oOpJzULQ70+PGW7h Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 23, 2011 at 08:49:06PM +0100, Koen Kooi wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 >=20 > Can you regenerate this on top of .dev? I couldn't get it to apply, even > after renaming files -> libnl-1.1 Did you try to apply it on top of that 12patch series? Or you can apply top 14 from http://gitorious.org/~jama/angstrom/jama-shr-experimental/ Cheers, > On 23-03-11 17:57, Martin Jansa wrote: > > * static lib is enough to build nm and shouldn't conflict with libnl2 > > * this makes special case from libnl1 instead libnl2 > >=20 > > Signed-off-by: Martin Jansa > > --- > > .../libnl-1.1/dont-link-libnl-from-sysroot.patch | 26 ------- > > recipes/libnl/libnl-1.1/fix-includes.patch | 13 --- > > recipes/libnl/libnl-1.1/local-includes.patch | 12 --- > > recipes/libnl/libnl-1.1/netlink-local-fix.patch | 12 --- > > recipes/libnl/libnl-1.1/respect-ldflags.patch | 12 --- > > .../libnl/libnl1-1.1/build.only.static.lib.patch | 79 ++++++++++++= ++++++++ > > .../libnl1-1.1/dont-link-libnl-from-sysroot.patch | 26 +++++++ > > recipes/libnl/libnl1-1.1/fix-includes.patch | 13 +++ > > recipes/libnl/libnl1-1.1/local-includes.patch | 12 +++ > > recipes/libnl/libnl1-1.1/netlink-local-fix.patch | 12 +++ > > recipes/libnl/libnl1-1.1/respect-ldflags.patch | 12 +++ > > recipes/libnl/libnl1_1.1.bb | 22 ++++++ > > recipes/libnl/libnl_1.1.bb | 17 ---- > > 13 files changed, 176 insertions(+), 92 deletions(-) > > delete mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroo= t.patch > > delete mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch > > delete mode 100644 recipes/libnl/libnl-1.1/local-includes.patch > > delete mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch > > delete mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch > > create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch > > create mode 100644 recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysro= ot.patch > > create mode 100644 recipes/libnl/libnl1-1.1/fix-includes.patch > > create mode 100644 recipes/libnl/libnl1-1.1/local-includes.patch > > create mode 100644 recipes/libnl/libnl1-1.1/netlink-local-fix.patch > > create mode 100644 recipes/libnl/libnl1-1.1/respect-ldflags.patch > > create mode 100644 recipes/libnl/libnl1_1.1.bb > > delete mode 100644 recipes/libnl/libnl_1.1.bb > >=20 > > diff --git a/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch= b/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch > > deleted file mode 100644 > > index beb6361..0000000 > > --- a/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch > > +++ /dev/null > > @@ -1,26 +0,0 @@ > > -Index: libnl-1.1/src/Makefile > > -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > ---- libnl-1.1.orig/src/Makefile 2008-01-14 07:48:45.000000000 -0800 > > -+++ libnl-1.1/src/Makefile 2010-09-22 14:58:46.820826001 -0700 > > -@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > > - include ../Makefile.opts > > - endif > > -=20 > > --LDFLAGS +=3D -L../lib -lnl utils.o > > -+LDFLAGS +=3D ../lib/libnl.so utils.o > > - CIN :=3D $(wildcard nl-*.c) $(wildcard genl-*.c) $(wildcard nf-*.c) > > - TOOLS :=3D $(CIN:%.c=3D%) > > -=20 > > -Index: libnl-1.1/tests/Makefile > > -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > ---- libnl-1.1.orig/tests/Makefile 2008-01-14 07:48:45.000000000 -0800 > > -+++ libnl-1.1/tests/Makefile 2010-09-22 14:58:46.820826001 -0700 > > -@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > > - include ../Makefile.opts > > - endif > > -=20 > > --LDFLAGS +=3D -L../lib -lnl ../src/utils.o > > -+LDFLAGS +=3D ../lib/libnl.so ../src/utils.o > > - CIN :=3D $(wildcard test-*.c) > > - TOOLS :=3D $(CIN:%.c=3D%) > > -=20 > > diff --git a/recipes/libnl/libnl-1.1/fix-includes.patch b/recipes/libnl= /libnl-1.1/fix-includes.patch > > deleted file mode 100644 > > index b172fd2..0000000 > > --- a/recipes/libnl/libnl-1.1/fix-includes.patch > > +++ /dev/null > > @@ -1,13 +0,0 @@ > > -diff -ruN libnl-1.1/lib/route/link/vlan.c libnl-1.1-new/lib/route/link= /vlan.c > > ---- libnl-1.1/lib/route/link/vlan.c 2008-01-14 18:48:45.000000000 +0300 > > -+++ libnl-1.1-new/lib/route/link/vlan.c 2009-01-30 10:55:09.000000000 = +0300 > > -@@ -26,7 +26,9 @@ > > - #include > > - #include > > -=20 > > -+#ifndef VLAN_FLAG_REORDER_HDR > > - #include > > -+#endif > > -=20 > > - /** @cond SKIP */ > > - #define VLAN_HAS_ID (1<<0) > > diff --git a/recipes/libnl/libnl-1.1/local-includes.patch b/recipes/lib= nl/libnl-1.1/local-includes.patch > > deleted file mode 100644 > > index 85659db..0000000 > > --- a/recipes/libnl/libnl-1.1/local-includes.patch > > +++ /dev/null > > @@ -1,12 +0,0 @@ > > -diff -urN libnl-1.1.orig/Makefile.opts.in libnl-1.1/Makefile.opts.in > > ---- libnl-1.1.orig/Makefile.opts.in 2008-01-14 15:48:45.000000000 +0000 > > -+++ libnl-1.1/Makefile.opts.in 2009-04-06 10:20:40.000000000 +0000 > > -@@ -10,7 +10,7 @@ > > - # > > -=20 > > - CC :=3D @CC@ > > --CFLAGS :=3D @CFLAGS@ > > -+CFLAGS :=3D -I./include -I. -I../include @CFLAGS@ > > - LDFLAGS :=3D @LDFLAGS@ > > - CPPFLAGS :=3D @CPPFLAGS@ > > - PACKAGE_NAME :=3D @PACKAGE_NAME@ > > diff --git a/recipes/libnl/libnl-1.1/netlink-local-fix.patch b/recipes/= libnl/libnl-1.1/netlink-local-fix.patch > > deleted file mode 100644 > > index 51c6736..0000000 > > --- a/recipes/libnl/libnl-1.1/netlink-local-fix.patch > > +++ /dev/null > > @@ -1,12 +0,0 @@ > > -Index: libnl-1.1/include/netlink-local.h > > -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > ---- libnl-1.1.orig/include/netlink-local.h 2009-06-18 15:28:32.6142096= 45 +0400 > > -+++ libnl-1.1/include/netlink-local.h 2009-06-18 15:28:44.094190518 +0= 400 > > -@@ -26,6 +26,7 @@ > > - #include > > - #include > > - #include > > -+#include > > -=20 > > - #include > > - #include > > diff --git a/recipes/libnl/libnl-1.1/respect-ldflags.patch b/recipes/li= bnl/libnl-1.1/respect-ldflags.patch > > deleted file mode 100644 > > index ba97dc6..0000000 > > --- a/recipes/libnl/libnl-1.1/respect-ldflags.patch > > +++ /dev/null > > @@ -1,12 +0,0 @@ > > -diff -urN libnl-1.1.orig/lib/Makefile libnl-1.1/lib/Makefile > > ---- libnl-1.1.orig/lib/Makefile 2008-01-14 15:48:45.000000000 +0000 > > -+++ libnl-1.1/lib/Makefile 2009-04-06 10:16:21.000000000 +0000 > > -@@ -48,7 +48,7 @@ > > -=20 > > - $(OUT_SLIB): ../Makefile.opts $(OBJ) > > - @echo " LD $(OUT_SLIB)"; \ > > -- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_L= IB) -lc > > -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ= ) $(LIBNL_LIB) -lc > > - @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \ > > - rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB) > > - @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \ > > diff --git a/recipes/libnl/libnl1-1.1/build.only.static.lib.patch b/rec= ipes/libnl/libnl1-1.1/build.only.static.lib.patch > > new file mode 100644 > > index 0000000..770a392 > > --- /dev/null > > +++ b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch > > @@ -0,0 +1,79 @@ > > +diff -uNr libnl-1.1.orig//lib/Makefile libnl-1.1/lib/Makefile > > +--- libnl-1.1.orig//lib/Makefile 2011-03-23 15:50:32.310534329 +0100 > > ++++ libnl-1.1/lib/Makefile 2011-03-23 15:50:43.926534326 +0100 > > +@@ -33,18 +33,24 @@ > > + DEPS :=3D $(CIN:%.c=3D%.d) > > + OBJ :=3D $(CIN:%.c=3D%.o) > > + CFLAGS +=3D -fPIC > > ++OUT_LIB :=3D $(PACKAGE_NAME)1.a > > + OUT_SLIB :=3D $(PACKAGE_NAME).so.$(PACKAGE_VERSION) > > + LN_SLIB :=3D $(PACKAGE_NAME).so > > + LN1_SLIB :=3D $(LN_SLIB).1 > > +=20 > > + export > > +=20 > > +-.PHONY: all clean install librtn.a $(OUT_SLIB) > > ++.PHONY: all clean install librtn.a $(OUT_SLIB) $(OUT_LIB) > > +=20 > > +=20 > > + all: > > +- @echo " MAKE $(OUT_SLIB)"; \ > > +- $(MAKE) $(OUT_SLIB) > > ++ @echo " MAKE $(OUT_LIB)"; \ > > ++ $(MAKE) $(OUT_LIB) > > ++ > > ++$(OUT_LIB): ../Makefile.opts $(OBJ) > > ++ @echo " LD $(OUT_LIB)"; \ > > ++ echo $(AR) rs $(OUT_LIB) $(OBJ) > > ++ $(AR) rs $(OUT_LIB) $(OBJ) > > +=20 > > + $(OUT_SLIB): ../Makefile.opts $(OBJ) > > + @echo " LD $(OUT_SLIB)"; \ > > +@@ -56,8 +62,8 @@ > > +=20 > > + clean: > > + @echo " CLEAN lib"; \ > > +- $(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \ > > +- $(RM) -f $(DEPS) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB) > > ++ $(RM) -f $(OBJ) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB); \ > > ++ $(RM) -f $(DEPS) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB) > > +=20 > > + distclean: > > + @echo " DISTCLEAN lib"; \ > > +@@ -65,11 +71,7 @@ > > +=20 > > + install: > > +- mkdir -p $(DESTDIR)$(libdir)/ > > +- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir) > > +- rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB) > > +- $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB) > > +- rm -f $(DESTDIR)$(libdir)/$(LN_SLIB) > > +- $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB) > > ++ mkdir -p $(DESTDIR)$(libdir)/libnl1 > > ++ install -m 0644 $(OUT_LIB) $(DESTDIR)$(libdir)/libnl1 > > +=20 > > + $(DEPS): ../Makefile.opts > > +=20 > > +diff -uNr libnl-1.1.orig//Makefile libnl-1.1/Makefile > > +--- libnl-1.1.orig//Makefile 2008-01-14 16:48:45.000000000 +0100 > > ++++ libnl-1.1/Makefile 2011-03-23 16:53:12.438533242 +0100 > > +@@ -13,7 +13,7 @@ > > + include Makefile.opts > > + endif > > +=20 > > +-SUBDIRS :=3D lib include doc src tests > > ++SUBDIRS :=3D lib include doc=20 > > + .PHONY: all clean distclean install gendoc $(SUBDIRS) > > +=20 > > + all: Makefile.opts > > +diff -uNr libnl-1.1.orig//libnl-1.pc.in libnl-1.1/libnl-1.pc.in > > +--- libnl-1.1.orig//libnl-1.pc.in 2008-01-14 16:48:45.000000000 +0100 > > ++++ libnl-1.1/libnl-1.pc.in 2011-03-23 16:57:18.084533174 +0100 > > +@@ -6,5 +6,5 @@ > > + Name: libnl > > + Description: Convenience library for netlink sockets > > + Version: @PACKAGE_VERSION@ > > +-Libs: -L${libdir} -lnl > > +-Cflags: > > ++Libs: -L${libdir}/libnl1 -lnl1 -lm > > ++Cflags: -I${includedir}/libnl1 > > diff --git a/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patc= h b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch > > new file mode 100644 > > index 0000000..beb6361 > > --- /dev/null > > +++ b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch > > @@ -0,0 +1,26 @@ > > +Index: libnl-1.1/src/Makefile > > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > +--- libnl-1.1.orig/src/Makefile 2008-01-14 07:48:45.000000000 -0800 > > ++++ libnl-1.1/src/Makefile 2010-09-22 14:58:46.820826001 -0700 > > +@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > > + include ../Makefile.opts > > + endif > > +=20 > > +-LDFLAGS +=3D -L../lib -lnl utils.o > > ++LDFLAGS +=3D ../lib/libnl.so utils.o > > + CIN :=3D $(wildcard nl-*.c) $(wildcard genl-*.c) $(wildcard nf-*.c) > > + TOOLS :=3D $(CIN:%.c=3D%) > > +=20 > > +Index: libnl-1.1/tests/Makefile > > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > +--- libnl-1.1.orig/tests/Makefile 2008-01-14 07:48:45.000000000 -0800 > > ++++ libnl-1.1/tests/Makefile 2010-09-22 14:58:46.820826001 -0700 > > +@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > > + include ../Makefile.opts > > + endif > > +=20 > > +-LDFLAGS +=3D -L../lib -lnl ../src/utils.o > > ++LDFLAGS +=3D ../lib/libnl.so ../src/utils.o > > + CIN :=3D $(wildcard test-*.c) > > + TOOLS :=3D $(CIN:%.c=3D%) > > +=20 > > diff --git a/recipes/libnl/libnl1-1.1/fix-includes.patch b/recipes/libn= l/libnl1-1.1/fix-includes.patch > > new file mode 100644 > > index 0000000..b172fd2 > > --- /dev/null > > +++ b/recipes/libnl/libnl1-1.1/fix-includes.patch > > @@ -0,0 +1,13 @@ > > +diff -ruN libnl-1.1/lib/route/link/vlan.c libnl-1.1-new/lib/route/link= /vlan.c > > +--- libnl-1.1/lib/route/link/vlan.c 2008-01-14 18:48:45.000000000 +0300 > > ++++ libnl-1.1-new/lib/route/link/vlan.c 2009-01-30 10:55:09.000000000 = +0300 > > +@@ -26,7 +26,9 @@ > > + #include > > + #include > > +=20 > > ++#ifndef VLAN_FLAG_REORDER_HDR > > + #include > > ++#endif > > +=20 > > + /** @cond SKIP */ > > + #define VLAN_HAS_ID (1<<0) > > diff --git a/recipes/libnl/libnl1-1.1/local-includes.patch b/recipes/li= bnl/libnl1-1.1/local-includes.patch > > new file mode 100644 > > index 0000000..85659db > > --- /dev/null > > +++ b/recipes/libnl/libnl1-1.1/local-includes.patch > > @@ -0,0 +1,12 @@ > > +diff -urN libnl-1.1.orig/Makefile.opts.in libnl-1.1/Makefile.opts.in > > +--- libnl-1.1.orig/Makefile.opts.in 2008-01-14 15:48:45.000000000 +0000 > > ++++ libnl-1.1/Makefile.opts.in 2009-04-06 10:20:40.000000000 +0000 > > +@@ -10,7 +10,7 @@ > > + # > > +=20 > > + CC :=3D @CC@ > > +-CFLAGS :=3D @CFLAGS@ > > ++CFLAGS :=3D -I./include -I. -I../include @CFLAGS@ > > + LDFLAGS :=3D @LDFLAGS@ > > + CPPFLAGS :=3D @CPPFLAGS@ > > + PACKAGE_NAME :=3D @PACKAGE_NAME@ > > diff --git a/recipes/libnl/libnl1-1.1/netlink-local-fix.patch b/recipes= /libnl/libnl1-1.1/netlink-local-fix.patch > > new file mode 100644 > > index 0000000..51c6736 > > --- /dev/null > > +++ b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch > > @@ -0,0 +1,12 @@ > > +Index: libnl-1.1/include/netlink-local.h > > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > +--- libnl-1.1.orig/include/netlink-local.h 2009-06-18 15:28:32.6142096= 45 +0400 > > ++++ libnl-1.1/include/netlink-local.h 2009-06-18 15:28:44.094190518 +0= 400 > > +@@ -26,6 +26,7 @@ > > + #include > > + #include > > + #include > > ++#include > > +=20 > > + #include > > + #include > > diff --git a/recipes/libnl/libnl1-1.1/respect-ldflags.patch b/recipes/l= ibnl/libnl1-1.1/respect-ldflags.patch > > new file mode 100644 > > index 0000000..ba97dc6 > > --- /dev/null > > +++ b/recipes/libnl/libnl1-1.1/respect-ldflags.patch > > @@ -0,0 +1,12 @@ > > +diff -urN libnl-1.1.orig/lib/Makefile libnl-1.1/lib/Makefile > > +--- libnl-1.1.orig/lib/Makefile 2008-01-14 15:48:45.000000000 +0000 > > ++++ libnl-1.1/lib/Makefile 2009-04-06 10:16:21.000000000 +0000 > > +@@ -48,7 +48,7 @@ > > +=20 > > + $(OUT_SLIB): ../Makefile.opts $(OBJ) > > + @echo " LD $(OUT_SLIB)"; \ > > +- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_L= IB) -lc > > ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ= ) $(LIBNL_LIB) -lc > > + @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \ > > + rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB) > > + @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \ > > diff --git a/recipes/libnl/libnl1_1.1.bb b/recipes/libnl/libnl1_1.1.bb > > new file mode 100644 > > index 0000000..3569867 > > --- /dev/null > > +++ b/recipes/libnl/libnl1_1.1.bb > > @@ -0,0 +1,22 @@ > > +require libnl.inc > > + > > +PR =3D "${INC_PR}.0" > > + > > +# move it to extra subdirectory > > +includedir =3D "${prefix}/include/libnl1" > > + > > +CFLAGS +=3D '-DVLAN_FLAG_REORDER_HDR=3D1' > > + > > +SRC_URI =3D "\ > > + http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ > > + file://local-includes.patch \ > > + file://fix-includes.patch \ > > + file://respect-ldflags.patch \ > > + file://netlink-local-fix.patch \ > > + file://dont-link-libnl-from-sysroot.patch \ > > + file://build.only.static.lib.patch \ > > +" > > +S =3D "${WORKDIR}/libnl-${PV}" > > + > > +SRC_URI[md5sum] =3D "ae970ccd9144e132b68664f98e7ceeb1" > > +SRC_URI[sha256sum] =3D "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384= 299b4b21883e22edc3" > > diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl_1.1.bb > > deleted file mode 100644 > > index d9f250e..0000000 > > --- a/recipes/libnl/libnl_1.1.bb > > +++ /dev/null > > @@ -1,17 +0,0 @@ > > -require libnl.inc > > - > > -PR =3D "${INC_PR}.0" > > - > > -CFLAGS +=3D '-DVLAN_FLAG_REORDER_HDR=3D1' > > - > > -SRC_URI =3D "\ > > - http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ > > - file://local-includes.patch \ > > - file://fix-includes.patch \ > > - file://respect-ldflags.patch \ > > - file://netlink-local-fix.patch \ > > - file://dont-link-libnl-from-sysroot.patch \ > > -" > > - > > -SRC_URI[md5sum] =3D "ae970ccd9144e132b68664f98e7ceeb1" > > -SRC_URI[sha256sum] =3D "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384= 299b4b21883e22edc3" >=20 > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.5 (Darwin) >=20 > iD8DBQFNik6yMkyGM64RGpERAmGaAJ4hgELxVhOiPwxLdFdvQ8NLxocuCACeIuyH > XZWggTYtFEhserJNsOLOhqU=3D > =3D7A9C > -----END PGP SIGNATURE----- >=20 >=20 > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --oOpJzULQ70+PGW7h Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk2KUb4ACgkQN1Ujt2V2gBwYdACgjwUKXrOByFaZjjgonEfJwNwu J5MAoII/RI0xO4e6p22GAGx6G2cY70cy =/HJe -----END PGP SIGNATURE----- --oOpJzULQ70+PGW7h--