[Modulinux-commits] SF.net SVN: modulinux:[12] trunk

[<ser...@us...>]

Revision: 12
          http://modulinux.svn.sourceforge.net/modulinux/?rev=12&view=rev
Author:   serisman
Date:     2009-12-15 05:44:23 +0000 (Tue, 15 Dec 2009)

Log Message:
-----------
Updated libnl to version 2.0, various compilation bug fixes

Modified Paths:
--------------
    trunk/README
    trunk/scripts/foundation/libnl/libnl.mk
    trunk/scripts/utilities/bridge-utils/bridge-utils.mk
    trunk/scripts/utilities/flashrom/flashrom.mk
    trunk/scripts/utilities/hostapd/hostapd.mk
    trunk/scripts/utilities/pciutils/pciutils.mk
    trunk/scripts/utilities/zlib/zlib.mk

Modified: trunk/README
===================================================================
--- trunk/README	2009-12-15 01:49:26 UTC (rev 11)
+++ trunk/README	2009-12-15 05:44:23 UTC (rev 12)
@@ -1,9 +1,13 @@
 fresh install - ubuntu 9.10 x64
 -------------------------------
 sudo apt-get install subversion
+sudo apt-get install git-core
 sudo apt-get install patch
 sudo apt-get install m4
 sudo apt-get install texinfo
 sudo apt-get install ncurses-dev
+sudo apt-get install autoconf
+sudo apt-get install libtool
+sudo apt-get install shtool
 
 sudo apt-get install ccache

Modified: trunk/scripts/foundation/libnl/libnl.mk
===================================================================
--- trunk/scripts/foundation/libnl/libnl.mk	2009-12-15 01:49:26 UTC (rev 11)
+++ trunk/scripts/foundation/libnl/libnl.mk	2009-12-15 05:44:23 UTC (rev 12)
@@ -4,17 +4,18 @@
 #
 ######################################################################
 
-FOUNDATION_LIBNL_VERSION:=1.1
-FOUNDATION_LIBNL_SITE:=http://people.suug.ch/~tgr/libnl/files
-FOUNDATION_LIBNL_ARCHIVE:=libnl-$(FOUNDATION_LIBNL_VERSION).tar.gz
+FOUNDATION_LIBNL_VERSION:=2.0
+FOUNDATION_LIBNL_GIT_VERSION:=ff76549013c31082d303b3feef755bbd35e13ec6
+FOUNDATION_LIBNL_GIT_REPO:=git://git.kernel.org/pub/scm/libs/netlink/libnl.git
 FOUNDATION_LIBNL_SOURCE_DIR:=$(SOURCE_DIR)/libnl-$(FOUNDATION_LIBNL_VERSION)
 FOUNDATION_LIBNL_BUILD_DIR:=$(FOUNDATION_BUILD_DIR)/libnl-$(FOUNDATION_LIBNL_VERSION)
 
-$(DOWNLOAD_DIR)/$(FOUNDATION_LIBNL_ARCHIVE):
-	$(DOWNLOAD) -P $(DOWNLOAD_DIR) $(FOUNDATION_LIBNL_SITE)/$(FOUNDATION_LIBNL_ARCHIVE)
-
-$(FOUNDATION_LIBNL_SOURCE_DIR)/.unpacked: $(DOWNLOAD_DIR)/$(FOUNDATION_LIBNL_ARCHIVE)
-	gunzip -c $(DOWNLOAD_DIR)/$(FOUNDATION_LIBNL_ARCHIVE) | tar -C $(SOURCE_DIR) $(TAR_OPTIONS) -
+$(FOUNDATION_LIBNL_SOURCE_DIR)/.unpacked:
+	-mkdir $(FOUNDATION_LIBNL_SOURCE_DIR)
+	(cd $(FOUNDATION_LIBNL_SOURCE_DIR); \
+		git clone $(FOUNDATION_LIBNL_GIT_REPO) .; \
+		git checkout $(FOUNDATION_LIBNL_GIT_VERSION); \
+	);	
 	touch $@
 
 $(FOUNDATION_LIBNL_SOURCE_DIR)/.patched: $(FOUNDATION_LIBNL_SOURCE_DIR)/.unpacked
@@ -30,26 +31,38 @@
 $(FOUNDATION_LIBNL_BUILD_DIR)/.configured : $(FOUNDATION_LIBNL_BUILD_DIR)/Makefile
 	$(LOG) foundation-libnl configuration is starting.
 	(cd $(FOUNDATION_LIBNL_BUILD_DIR); \
+		aclocal; \
+		./autogen.sh; \
 		./configure \
+		$(CROSS_COMPILE_OPTS) \
 		--target=$(TARGET_GNU_NAME) \
 		--host=$(HOST_GNU_NAME) \
-		--build=$(HOST_GNU_NAME) \
+		--build=$(TARGET_GNU_NAME) \
 	);
 	$(LOG) foundation-libnl configuration has completed.
 	touch $@
 
 $(FOUNDATION_LIBNL_BUILD_DIR)/.compiled: $(FOUNDATION_LIBNL_BUILD_DIR)/.configured | toolchain
 	$(LOG) foundation-libnl compilation is starting.
-	$(MAKE) -C $(FOUNDATION_LIBNL_BUILD_DIR) $(CROSS_COMPILE_OPTS)
+	$(MAKE_FAST) -C $(FOUNDATION_LIBNL_BUILD_DIR) $(CROSS_COMPILE_OPTS) LDFLAGS+="-Wl,-rpath-link,$(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs"
 	$(LOG) foundation-libnl compilation has completed.
 	touch $@
 
 $(FOUNDATION_LIBNL_BUILD_DIR)/.installed: $(FOUNDATION_LIBNL_BUILD_DIR)/.compiled
 	$(LOG) foundation-libnl installation is starting.
-	$(INSTALL) -D -m 0755 -s $(FOUNDATION_LIBNL_BUILD_DIR)/lib/libnl.so.$(FOUNDATION_LIBNL_VERSION) $(RELEASE_DIR)/lib
+	$(INSTALL) -D -m 0755 -s $(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs/libnl.so.$(FOUNDATION_LIBNL_VERSION).0 $(RELEASE_DIR)/lib
+	$(INSTALL) -D -m 0755 -s $(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs/libnl-genl.so.$(FOUNDATION_LIBNL_VERSION).0 $(RELEASE_DIR)/lib
+	$(INSTALL) -D -m 0755 -s $(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs/libnl-nf.so.$(FOUNDATION_LIBNL_VERSION).0 $(RELEASE_DIR)/lib
+	$(INSTALL) -D -m 0755 -s $(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs/libnl-route.so.$(FOUNDATION_LIBNL_VERSION).0 $(RELEASE_DIR)/lib
 	(cd $(RELEASE_DIR)/lib; \
-		ln -s -f libnl.so.$(FOUNDATION_LIBNL_VERSION) libnl.so.1; \
-		ln -s -f libnl.so.1 libnl.so; \
+		ln -s -f libnl.so.$(FOUNDATION_LIBNL_VERSION).0 libnl.so.2; \
+		ln -s -f libnl.so.2 libnl.so; \
+		ln -s -f libnl-genl.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-genl.so.2; \
+		ln -s -f libnl-genl.so.2 libnl-genl.so; \
+		ln -s -f libnl-nf.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-nf.so.2; \
+		ln -s -f libnl-nf.so.2 libnl-nf.so; \
+		ln -s -f libnl-route.so.$(FOUNDATION_LIBNL_VERSION).0 libnl-route.so.2; \
+		ln -s -f libnl-route.so.2 libnl-route.so; \
 	);
 	$(LOG) foundation-libnl installation has completed.
 	touch $@

Modified: trunk/scripts/utilities/bridge-utils/bridge-utils.mk
===================================================================
--- trunk/scripts/utilities/bridge-utils/bridge-utils.mk	2009-12-15 01:49:26 UTC (rev 11)
+++ trunk/scripts/utilities/bridge-utils/bridge-utils.mk	2009-12-15 05:44:23 UTC (rev 12)
@@ -5,7 +5,7 @@
 ######################################################################
 
 UTILITIES_BRIDGE_UTILS_VERSION:=1.4
-UTILITIES_BRIDGE_UTILS_SITE:=http://dl.sourceforge.net/bridge
+UTILITIES_BRIDGE_UTILS_SITE:=http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$(UTILITIES_BRIDGE_UTILS_VERSION)
 UTILITIES_BRIDGE_UTILS_ARCHIVE:=bridge-utils-$(UTILITIES_BRIDGE_UTILS_VERSION).tar.gz
 UTILITIES_BRIDGE_UTILS_SOURCE_DIR:=$(SOURCE_DIR)/bridge-utils-$(UTILITIES_BRIDGE_UTILS_VERSION)
 UTILITIES_BRIDGE_UTILS_BUILD_DIR:=$(UTILITIES_BUILD_DIR)/bridge-utils-$(UTILITIES_BRIDGE_UTILS_VERSION)

Modified: trunk/scripts/utilities/flashrom/flashrom.mk
===================================================================
--- trunk/scripts/utilities/flashrom/flashrom.mk	2009-12-15 01:49:26 UTC (rev 11)
+++ trunk/scripts/utilities/flashrom/flashrom.mk	2009-12-15 05:44:23 UTC (rev 12)
@@ -18,8 +18,8 @@
 	touch $@
 
 $(UTILITIES_FLASHROM_SOURCE_DIR)/.patched: $(UTILITIES_FLASHROM_SOURCE_DIR)/.unpacked
-	if test -d scripts/foundation/flashrom/$(UTILITIES_FLASHROM_VERSION); \
-	then $(PATCH) $(UTILITIES_FLASHROM_SOURCE_DIR) scripts/foundation/flashrom/$(UTILITIES_FLASHROM_VERSION) \*.patch; \
+	if test -d scripts/utilities/flashrom/$(UTILITIES_FLASHROM_VERSION); \
+	then $(PATCH) $(UTILITIES_FLASHROM_SOURCE_DIR) scripts/utilities/flashrom/$(UTILITIES_FLASHROM_VERSION) \*.patch; \
 	fi
 	touch $@
 
@@ -27,7 +27,7 @@
 	mkdir -p $(UTILITIES_FLASHROM_BUILD_DIR)
 	cp -r $(UTILITIES_FLASHROM_SOURCE_DIR)/* $(UTILITIES_FLASHROM_BUILD_DIR)/
 
-$(UTILITIES_FLASHROM_BUILD_DIR)/.compiled: $(UTILITIES_FLASHROM_BUILD_DIR)/Makefile | toolchain
+$(UTILITIES_FLASHROM_BUILD_DIR)/.compiled: $(UTILITIES_FLASHROM_BUILD_DIR)/Makefile | toolchain utilities-zlib utilities-pciutils
 	$(LOG) utilities-flashrom compilation is starting.
 	$(MAKE) -C $(UTILITIES_FLASHROM_BUILD_DIR) $(CROSS_COMPILE_OPTS) CFLAGS+="-I$(RELEASE_DIR)/include" LDFLAGS+="-L$(RELEASE_DIR)/lib"
 	$(LOG) utilities-flashrom compilation has completed.

Modified: trunk/scripts/utilities/hostapd/hostapd.mk
===================================================================
--- trunk/scripts/utilities/hostapd/hostapd.mk	2009-12-15 01:49:26 UTC (rev 11)
+++ trunk/scripts/utilities/hostapd/hostapd.mk	2009-12-15 05:44:23 UTC (rev 12)
@@ -18,8 +18,8 @@
 	touch $@
 
 $(UTILITIES_HOSTAPD_SOURCE_DIR)/.patched: $(UTILITIES_HOSTAPD_SOURCE_DIR)/.unpacked
-	if test -d scripts/foundation/hostapd/$(UTILITIES_HOSTAPD_VERSION); \
-	then $(PATCH) $(UTILITIES_HOSTAPD_SOURCE_DIR) scripts/foundation/hostapd/$(UTILITIES_HOSTAPD_VERSION) \*.patch; \
+	if test -d scripts/utilities/hostapd/$(UTILITIES_HOSTAPD_VERSION); \
+	then $(PATCH) $(UTILITIES_HOSTAPD_SOURCE_DIR) scripts/utilities/hostapd/$(UTILITIES_HOSTAPD_VERSION) \*.patch; \
 	fi
 	touch $@
 
@@ -31,9 +31,10 @@
 	$(LOG) utilities-hostapd configuration is starting.
 
 	echo "CONFIG_DRIVER_NL80211=y" >> $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd/.config
+	echo "CONFIG_LIBNL20=y" >> $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd/.config
 	echo "LIBNL=$(FOUNDATION_LIBNL_BUILD_DIR)" >> $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd/.config
 	echo "CFLAGS += -I$(FOUNDATION_LIBNL_BUILD_DIR)/include" >> $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd/.config
-	echo "LIBS += -L$(FOUNDATION_LIBNL_BUILD_DIR)/lib" >> $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd/.config
+	echo "LIBS += -L$(FOUNDATION_LIBNL_BUILD_DIR)/lib/.libs" >> $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd/.config
 
 	echo "CONFIG_EAP_PSK=y" >> $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd/.config
 
@@ -42,7 +43,7 @@
 
 $(UTILITIES_HOSTAPD_BUILD_DIR)/.compiled: $(UTILITIES_HOSTAPD_BUILD_DIR)/.configured | toolchain foundation-libnl
 	$(LOG) utilities-hostapd compilation is starting.
-	$(MAKE) -C $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd $(CROSS_COMPILE_OPTS)
+	$(MAKE_FAST) -C $(UTILITIES_HOSTAPD_BUILD_DIR)/hostapd $(CROSS_COMPILE_OPTS)
 	$(LOG) utilities-hostapd compilation has completed.
 	touch $@
 

Modified: trunk/scripts/utilities/pciutils/pciutils.mk
===================================================================
--- trunk/scripts/utilities/pciutils/pciutils.mk	2009-12-15 01:49:26 UTC (rev 11)
+++ trunk/scripts/utilities/pciutils/pciutils.mk	2009-12-15 05:44:23 UTC (rev 12)
@@ -18,8 +18,8 @@
 	touch $@
 
 $(UTILITIES_PCIUTILS_SOURCE_DIR)/.patched: $(UTILITIES_PCIUTILS_SOURCE_DIR)/.unpacked
-	if test -d scripts/foundation/pciutils/$(UTILITIES_PCIUTILS_VERSION); \
-	then $(PATCH) $(UTILITIES_PCIUTILS_SOURCE_DIR) scripts/foundation/pciutils/$(UTILITIES_PCIUTILS_VERSION) \*.patch; \
+	if test -d scripts/utilities/pciutils/$(UTILITIES_PCIUTILS_VERSION); \
+	then $(PATCH) $(UTILITIES_PCIUTILS_SOURCE_DIR) scripts/utilities/pciutils/$(UTILITIES_PCIUTILS_VERSION) \*.patch; \
 	fi
 	touch $@
 
@@ -29,7 +29,7 @@
 
 $(UTILITIES_PCIUTILS_BUILD_DIR)/.compiled: $(UTILITIES_PCIUTILS_BUILD_DIR)/Makefile | toolchain
 	$(LOG) utilities-pciutils compilation is starting.
-	$(CROSS) -C $(UTILITIES_PCIUTILS_BUILD_DIR) $(CROSS_COMPILE_OPTS) SHARED="yes" ZLIB="no"
+	$(MAKE_FAST) -C $(UTILITIES_PCIUTILS_BUILD_DIR) $(CROSS_COMPILE_OPTS) SHARED="yes" ZLIB="no"
 	$(LOG) utilities-pciutils compilation has completed.
 	touch $@
 

Modified: trunk/scripts/utilities/zlib/zlib.mk
===================================================================
--- trunk/scripts/utilities/zlib/zlib.mk	2009-12-15 01:49:26 UTC (rev 11)
+++ trunk/scripts/utilities/zlib/zlib.mk	2009-12-15 05:44:23 UTC (rev 12)
@@ -42,7 +42,7 @@
 
 $(UTILITIES_ZLIB_BUILD_DIR)/.compiled: $(UTILITIES_ZLIB_BUILD_DIR)/.configured | toolchain
 	$(LOG) utilities-zlib compilation is starting.
-	$(MAKE) -C $(UTILITIES_ZLIB_BUILD_DIR) $(CROSS_COMPILE_OPTS) all
+	$(MAKE_FAST) -C $(UTILITIES_ZLIB_BUILD_DIR) $(CROSS_COMPILE_OPTS) all
 	$(LOG) utilities-zlib compilation has completed.
 	touch $@
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.