fix wprobe conflict with libnl

[openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 05ae321..7439bc6 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,15 +1,16 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
+override MAKEFLAGS=
+
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
@@ -17,6 +18,8 @@ SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 EXCLUDE_DIRS:=*/ccache */stamp */man */share */stampfiles */info
 
+SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }')
+
 all: compile
 
 $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
@@ -30,8 +33,10 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                $(SDK_BUILD_DIR)/target/linux/*/files \
                $(SDK_BUILD_DIR)/target/linux/*/patches
        $(CP) \
+               $(TOPDIR)/LICENSE \
                $(TOPDIR)/rules.mk \
                $(TOPDIR)/.config \
+               ./files/Config.in \
                ./files/Makefile \
                ./files/README.SDK \
                $(SDK_BUILD_DIR)/
@@ -39,6 +44,10 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                ./files/package/rules.mk \
                $(TOPDIR)/package/Makefile \
                $(SDK_BUILD_DIR)/package/
+       echo "src-svn trunk $(SVN_PACKAGE_URL)" \
+               > $(SDK_BUILD_DIR)/feeds.conf.default
+       cat $(TOPDIR)/feeds.conf.default \
+               >> $(SDK_BUILD_DIR)/feeds.conf.default
        echo REVISION:="$(REVISION)" > $(SDK_BUILD_DIR)/include/version.mk
        find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf