[leaf-commits] src/bering-uclibc4/source/libnl libnl-new-kernel.patch, NONE, 1.1 buildtool.cfg, 1.2, 1.3 buildtool.mk, 1.5, 1.6

Update of /cvsroot/leaf/src/bering-uclibc4/source/libnl
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9724

Modified Files:
	buildtool.cfg buildtool.mk 
Added Files:
	libnl-new-kernel.patch 
Log Message:
Removed old kernel headers from libnl dir that possible may cause wrong functioning of libnl; added patch that removes obsolete variables. 
Maked in attempt to start hostapd with ath5k on 2.6.35.


--- NEW FILE: libnl-new-kernel.patch ---
diff -aur libnl-1.1/include/netlink-local.h libnl-1.1.new/include/netlink-local.h
--- libnl-1.1/include/netlink-local.h	2008-01-14 17:48:45.000000000 +0200
+++ libnl-1.1.new/include/netlink-local.h	2010-08-09 21:48:41.000000000 +0300
@@ -370,8 +370,8 @@
 				      struct tc_ratespec *src)
 {
 	dst->rs_cell_log = src->cell_log;
-	dst->rs_feature = src->feature;
-	dst->rs_addend = src->addend;
+//	dst->rs_feature = src->feature;
+//	dst->rs_addend = src->addend;
 	dst->rs_mpu = src->mpu;
 	dst->rs_rate = src->rate;
 }
@@ -380,8 +380,8 @@
 				       struct rtnl_ratespec *src)
 {
 	dst->cell_log = src->rs_cell_log;
-	dst->feature = src->rs_feature;
-	dst->addend = src->rs_addend;
+//	dst->feature = src->rs_feature;
+//	dst->addend = src->rs_addend;
 	dst->mpu = src->rs_mpu;
 	dst->rate = src->rs_rate;
 }

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/libnl/buildtool.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.cfg	24 Jul 2010 19:37:03 -0000	1.2
--- buildtool.cfg	9 Aug 2010 19:02:37 -0000	1.3
***************
*** 12,20 ****
  </File>
  
        
  <Package>
  	<libnl>
  		Version = 1.1
! 		Revision = 2
  
  		Help <<EOF
--- 12,27 ----
  </File>
  
+ <File libnl-new-kernel.patch>
+   Server = cvs4-sourceforge
+   Revision = HEAD
+   envname = LIBNL_PATCH
+   Directory = libnl
+ </File>
+ 
        
  <Package>
  	<libnl>
  		Version = 1.1
! 		Revision = 3
  
  		Help <<EOF

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/libnl/buildtool.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.mk	9 Aug 2010 12:35:34 -0000	1.5
--- buildtool.mk	9 Aug 2010 19:02:37 -0000	1.6
***************
*** 7,10 ****
--- 7,13 ----
  $(LIBNL_DIR)/.source:
  	zcat $(LIBNL_SOURCE) | tar -xvf -
+ 	cat $(LIBNL_PATCH) | patch -p1 -d $(LIBNL_DIR)
+ 	-rm -rf $(LIBNL_DIR)/include/linux/netlink
+ 	(cd $(LIBNL_DIR)/include/linux; rm -f `ls *.h|grep -v ip_mp_alg`)
  	touch $(LIBNL_DIR)/.source
  
***************
*** 18,29 ****
  	mkdir -p $(LIBNL_TARGET_DIR)
  	DEPFLAGS="-I$(BT_STAGING_DIR)/include" make -C $(LIBNL_DIR) all
! 	$(BT_STRIP)  --strip-unneeded $(LIBNL_DIR)/lib/libnlso.1.1 
  	mkdir -p $(LIBNL_TARGET_DIR)/usr/lib
  	mkdir -p $(LIBNL_TARGET_DIR)/usr/include
  	cp -a $(LIBNL_DIR)/lib/*so* $(LIBNL_TARGET_DIR)/usr/lib
  	cp -ar $(LIBNL_DIR)/include $(LIBNL_TARGET_DIR)/usr
  	-rm -f $(LIBNL_TARGET_DIR)/usr/lib/Makefile
  	-rm -f $(LIBNL_TARGET_DIR)/usr/include/Makefile
- 	-rm -rf $(LIBNL_TARGET_DIR)/usr/include/linux
  	cp -a -f $(LIBNL_TARGET_DIR)/usr/lib/* $(BT_STAGING_DIR)/usr/lib/
  	cp -ar -f $(LIBNL_TARGET_DIR)/usr/include/netlink/* $(BT_STAGING_DIR)/usr/include
--- 21,32 ----
  	mkdir -p $(LIBNL_TARGET_DIR)
  	DEPFLAGS="-I$(BT_STAGING_DIR)/include" make -C $(LIBNL_DIR) all
! 	$(BT_STRIP)  --strip-unneeded $(LIBNL_DIR)/lib/libnl.so.1.1 
  	mkdir -p $(LIBNL_TARGET_DIR)/usr/lib
  	mkdir -p $(LIBNL_TARGET_DIR)/usr/include
  	cp -a $(LIBNL_DIR)/lib/*so* $(LIBNL_TARGET_DIR)/usr/lib
  	cp -ar $(LIBNL_DIR)/include $(LIBNL_TARGET_DIR)/usr
+ 	$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(LIBNL_DIR)/lib/libnl.so.1.1 
  	-rm -f $(LIBNL_TARGET_DIR)/usr/lib/Makefile
  	-rm -f $(LIBNL_TARGET_DIR)/usr/include/Makefile
  	cp -a -f $(LIBNL_TARGET_DIR)/usr/lib/* $(BT_STAGING_DIR)/usr/lib/
  	cp -ar -f $(LIBNL_TARGET_DIR)/usr/include/netlink/* $(BT_STAGING_DIR)/usr/include


------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev