From a7db6e872e79589c4f26c66d25d6f2d0e8b56391 Mon Sep 17 00:00:00 2001 From: Qing He Date: Mon, 15 Nov 2010 17:16:56 +0800 Subject: [PATCH] libnl: upgrade to version 2.0 from 1.1 removed outdated patches Signed-off-by: Qing He --- meta/recipes-support/libnl/libnl/compilefix.patch | 12 ------------ .../recipes-support/libnl/libnl/local-includes.patch | 11 ----------- .../libnl/{libnl_1.1.bb => libnl_2.0.bb} | 11 +++++------ 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl/compilefix.patch delete mode 100644 meta/recipes-support/libnl/libnl/local-includes.patch rename meta/recipes-support/libnl/{libnl_1.1.bb => libnl_2.0.bb} (61%) diff --git a/meta/recipes-support/libnl/libnl/compilefix.patch b/meta/recipes-support/libnl/libnl/compilefix.patch deleted file mode 100644 index f75ff282af..0000000000 --- a/meta/recipes-support/libnl/libnl/compilefix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libnl-1.1/include/netlink-local.h -=================================================================== ---- libnl-1.1.orig/include/netlink-local.h 2009-09-04 10:10:09.000000000 +0100 -+++ libnl-1.1/include/netlink-local.h 2009-09-04 10:10:15.000000000 +0100 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/meta/recipes-support/libnl/libnl/local-includes.patch b/meta/recipes-support/libnl/libnl/local-includes.patch deleted file mode 100644 index 5af463004b..0000000000 --- a/meta/recipes-support/libnl/libnl/local-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libnl-1.0-pre6/Makefile.opts.in.orig 2006-08-24 14:57:42.000000000 +0200 -+++ libnl-1.0-pre6/Makefile.opts.in 2006-08-24 14:58:20.000000000 +0200 -@@ -10,7 +10,7 @@ - # - - CC := @CC@ --CFLAGS := @CFLAGS@ -+CFLAGS := -I./include -I. -I../include @CFLAGS@ - LDFLAGS := @LDFLAGS@ - CPPFLAGS := @CPPFLAGS@ - PACKAGE_NAME := @PACKAGE_NAME@ diff --git a/meta/recipes-support/libnl/libnl_1.1.bb b/meta/recipes-support/libnl/libnl_2.0.bb similarity index 61% rename from meta/recipes-support/libnl/libnl_1.1.bb rename to meta/recipes-support/libnl/libnl_2.0.bb index 683df9159f..fa96215f0f 100644 --- a/meta/recipes-support/libnl/libnl_1.1.bb +++ b/meta/recipes-support/libnl/libnl_2.0.bb @@ -4,13 +4,12 @@ SECTION = "libs/network" PRIORITY = "optional" LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc \ - file://src/utils.c;beginline=4;endline=9;md5=6e99dfba5cfd64e92b4eb2c7b31e5e4e" +LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" -PR = "r1" +PR = "r0" -SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz \ - file://local-includes.patch;apply=yes \ - file://compilefix.patch;apply=yes" +SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz" inherit autotools pkgconfig + +LEAD_SONAME = "libnl.so" -- 2.40.1