From 76ed58d705e7f3892a1259abcd92882a527e7b53 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 28 May 2005 09:17:29 +0000
Subject: move package/linux into target/linux, use wbx' new kernel code.
 support building images with more than one kernel, split kernel module parts
 off of packages that use their own kernel modules (fuse, shfs, openswan).
 some cleanup in the image building process in target/. image builder is
 disabled for now, needs some fixing.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1085 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 target/linux/Makefile

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
new file mode 100644
index 000000000..ced6dca00
--- /dev/null
+++ b/target/linux/Makefile
@@ -0,0 +1,33 @@
+include $(TOPDIR)/rules.mk
+
+define kernel_template
+
+$(1)/$(2)-clean:
+	$(MAKE) -C $(1) BOARD="$(2)" clean
+
+$(1)/$(2)-prepare:
+	$(MAKE) -C $(1) BOARD="$(2)" prepare
+
+$(1)/$(2)-compile:
+	$(MAKE) -C $(1) BOARD="$(2)" compile
+
+$(1)/$(2)-install:
+	$(MAKE) -C $(1) BOARD="$(2)" install
+
+ifeq ($(BR2_LINUX_$(3)),y)
+clean: $(1)/$(2)-clean
+prepare: $(1)/$(2)-prepare
+compile: $(1)/$(2)-compile
+install: $(1)/$(2)-install
+endif
+
+.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-install
+endef
+
+prepare:
+compile:
+install:
+clean:
+	rm -rf $(BUILD_DIR)/kernel
+
+$(eval $(call kernel_template,linux-2.4,brcm,2_4_BRCM))
-- 
cgit v1.2.3


From 700e3934e55b089b7679489b3b310a1b07101f3a Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 5 Jun 2005 14:42:57 +0000
Subject: add rebuild target for the linux directory

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1149 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index ced6dca00..d1b4d545a 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -11,6 +11,9 @@ $(1)/$(2)-prepare:
 $(1)/$(2)-compile:
 	$(MAKE) -C $(1) BOARD="$(2)" compile
 
+$(1)/$(2)-rebuild:
+	$(MAKE) -C $(1) BOARD="$(2)" rebuild
+
 $(1)/$(2)-install:
 	$(MAKE) -C $(1) BOARD="$(2)" install
 
@@ -18,15 +21,17 @@ ifeq ($(BR2_LINUX_$(3)),y)
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
+rebuild: $(1)/$(2)-rebuild
 install: $(1)/$(2)-install
 endif
 
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-install
+.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install
 endef
 
 prepare:
 compile:
 install:
+rebuild:
 clean:
 	rm -rf $(BUILD_DIR)/kernel
 
-- 
cgit v1.2.3


From 8f37c266a301fd8ff423018d9c8aa8360331977d Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 11 Jun 2005 21:18:26 +0000
Subject: cleanup in target/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1205 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index d1b4d545a..604c739b5 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -3,36 +3,40 @@ include $(TOPDIR)/rules.mk
 define kernel_template
 
 $(1)/$(2)-clean:
-	$(MAKE) -C $(1) BOARD="$(2)" clean
+	$(MAKE) -C linux-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	$(MAKE) -C $(1) BOARD="$(2)" prepare
+	$(MAKE) -C linux-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	$(MAKE) -C $(1) BOARD="$(2)" compile
+	$(MAKE) -C linux-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	$(MAKE) -C $(1) BOARD="$(2)" rebuild
+	$(MAKE) -C linux-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	$(MAKE) -C $(1) BOARD="$(2)" install
+	$(MAKE) -C linux-$(1) BOARD="$(2)" install
+
+$(1)/$(2)-image: $(1)/$(2)-install
+	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 ifeq ($(BR2_LINUX_$(3)),y)
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
-install: $(1)/$(2)-install
+install: $(1)/$(2)-image
 endif
 
 .PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install
 endef
 
 prepare:
+	$(MAKE) -C image prepare
 compile:
+	$(MAKE) -C image compile
 install:
 rebuild:
 clean:
-	rm -rf $(BUILD_DIR)/kernel
 
-$(eval $(call kernel_template,linux-2.4,brcm,2_4_BRCM))
+$(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
-- 
cgit v1.2.3


From 26118ce258fcf8c31088fb4e160dc25ba281f30a Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 14 Jun 2005 07:03:57 +0000
Subject: add incomplete ar7 hardware support (disabled by default)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1236 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 604c739b5..e1ffc79fb 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -40,3 +40,4 @@ rebuild:
 clean:
 
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
+$(eval $(call kernel_template,2.4,ar7,2_4_AR7))
-- 
cgit v1.2.3


From 81c9bc6a856e26d30856d7c335c8069426113813 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 25 Jul 2005 15:40:23 +0000
Subject: add preliminary support for soekris boards

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1564 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index e1ffc79fb..3bbe3cdab 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -41,3 +41,4 @@ clean:
 
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
+$(eval $(call kernel_template,2.4,soekris,2_4_SOEKRIS))
-- 
cgit v1.2.3


From 960b21b516f519374168ee3703c8dd034c147843 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Aug 2005 15:00:56 +0000
Subject: add new image builder

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1661 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 3bbe3cdab..610bc7e1b 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -1,5 +1,11 @@
 include $(TOPDIR)/rules.mk
 
+PKG_OS:=$(shell uname -s)
+PKG_CPU:=$(shell uname -m)
+
+IB_NAME:=OpenWrt-ImageBuilder-$(PKG_OS)-$(PKG_CPU)
+IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
+
 define kernel_template
 
 $(1)/$(2)-clean:
@@ -20,17 +26,45 @@ $(1)/$(2)-install:
 $(1)/$(2)-image: $(1)/$(2)-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
+$(1)/$(2)-install-ib:
+	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
+	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
+
+
 ifeq ($(BR2_LINUX_$(3)),y)
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
 install: $(1)/$(2)-image
+install-ib: $(1)/$(2)-install-ib
 endif
 
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install
+.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-install-ib
 endef
 
+.PHONY: clean prepare compile rebuild install imagebuilder install-ib
+
+install-ib:
+
+$(BIN_DIR)/$(IB_NAME).tar.bz2:	
+	rm -rf $(IB_DIR)
+	mkdir -p $(IB_DIR)/packages
+	mkdir -p $(IB_DIR)/scripts
+	cp -dpR ./imagebuilder/* $(IB_DIR)/
+	cp -dpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
+	cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
+	$(MAKE) install-ib
+	cp $(TOPDIR)/rules.mk $(IB_DIR)
+	cp -dpR ./image $(IB_DIR)/
+	cp $(TOPDIR)/.config $(IB_DIR)/
+	find $(IB_DIR) -name CVS | xargs rm -rf
+	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
+
+ifeq ($(BR2_PACKAGE_IMAGEBUILDER),y)
+install: $(BIN_DIR)/$(IB_NAME).tar.bz2
+endif
+
 prepare:
 	$(MAKE) -C image prepare
 compile:
-- 
cgit v1.2.3


From 0a2707a01ad7344a240d728a414ae32169ac3295 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Aug 2005 15:56:01 +0000
Subject: fix image builder dependency problem

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1664 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 610bc7e1b..4c17a5788 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -36,11 +36,11 @@ clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
-install: $(1)/$(2)-image
+$(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
 install-ib: $(1)/$(2)-install-ib
 endif
 
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-install-ib
+.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
 endef
 
 .PHONY: clean prepare compile rebuild install imagebuilder install-ib
-- 
cgit v1.2.3


From 494b022ac436998369906e5864d9c043eca37590 Mon Sep 17 00:00:00 2001
From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 28 Aug 2005 09:06:53 +0000
Subject: first 2.6 stuff for netgear wgt634u, unusable.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1773 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 4c17a5788..01286405b 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -76,3 +76,4 @@ clean:
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
 $(eval $(call kernel_template,2.4,soekris,2_4_SOEKRIS))
+$(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
-- 
cgit v1.2.3


From f22255f8ee87b9677447fb7bd7461a55f6bbb010 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 1 Sep 2005 20:08:18 +0000
Subject: fix some typos

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1824 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 01286405b..e9edba256 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -51,12 +51,12 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 	rm -rf $(IB_DIR)
 	mkdir -p $(IB_DIR)/packages
 	mkdir -p $(IB_DIR)/scripts
-	cp -dpR ./imagebuilder/* $(IB_DIR)/
-	cp -dpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
+	cp -fpR ./imagebuilder/* $(IB_DIR)/
+	cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
 	cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
 	$(MAKE) install-ib
 	cp $(TOPDIR)/rules.mk $(IB_DIR)
-	cp -dpR ./image $(IB_DIR)/
+	cp -fpR ./image $(IB_DIR)/
 	cp $(TOPDIR)/.config $(IB_DIR)/
 	find $(IB_DIR) -name CVS | xargs rm -rf
 	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
-- 
cgit v1.2.3


From d92aa5a868e1f6500d0ee7359f57f6a3b42df8db Mon Sep 17 00:00:00 2001
From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 10 Sep 2005 16:32:31 +0000
Subject: add KERNEL variable

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1885 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index e9edba256..6fec977d6 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,19 +9,19 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" clean
+	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" prepare
+	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" compile
+	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" rebuild
+	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" install
+	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
-- 
cgit v1.2.3


From d0f611787c94090697587c02e1b5c2f3d45b0b0a Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 00:06:20 +0000
Subject: large build system cleanup. added some stuff to control the verbosity
 level, but not complete, yet.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2221 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 6fec977d6..2362ad6dd 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -58,6 +58,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 	cp $(TOPDIR)/rules.mk $(IB_DIR)
 	cp -fpR ./image $(IB_DIR)/
 	cp $(TOPDIR)/.config $(IB_DIR)/
+	find $(IB_DIR) -name .svn | xargs rm -rf
 	find $(IB_DIR) -name CVS | xargs rm -rf
 	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
 
@@ -66,8 +67,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:
+	@$(TRACE) target/linux/image/prepare
 	$(MAKE) -C image prepare
 compile:
+	@$(TRACE) target/linux/image/compile
 	$(MAKE) -C image compile
 install:
 rebuild:
-- 
cgit v1.2.3


From 0781686bc6c2e3d0b1c8645a1719c76bbfe60272 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 15:10:20 +0000
Subject: make log output a bit nicer

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2241 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 2362ad6dd..ae7545a46 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,24 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
+	$(TRACE) target/linux/linux-$(2)/clean
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
+	$(TRACE) target/linux/linux-$(2)/prepare
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
+	$(TRACE) target/linux/linux-$(2)/compile
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
+	$(TRACE) target/linux/linux-$(2)/rebuild
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
+	$(TRACE) target/linux/linux-$(2)/install
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
+	$(TRACE) target/linux/image/install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
+	$(TRACE) target/linux/image/install-ib
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
-- 
cgit v1.2.3


From cd45334873bf33da7101c954d1d7356f1e70e9e5 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 16:14:30 +0000
Subject: another batch of V= stuff

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2244 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index ae7545a46..fe3c6ca9f 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,23 +9,23 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	$(TRACE) target/linux/linux-$(2)/clean
+	$(TRACE) target/linux/linux-$(1)/clean
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	$(TRACE) target/linux/linux-$(2)/prepare
+	$(TRACE) target/linux/linux-$(1)/prepare
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	$(TRACE) target/linux/linux-$(2)/compile
+	$(TRACE) target/linux/linux-$(1)/compile
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	$(TRACE) target/linux/linux-$(2)/rebuild
+	$(TRACE) target/linux/linux-$(1)/rebuild
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	$(TRACE) target/linux/linux-$(2)/install
+	$(TRACE) target/linux/linux-$(1)/install
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-- 
cgit v1.2.3


From d698fe7f3fe340a73c411c114359efcdedd7226f Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 23 Oct 2005 18:47:07 +0000
Subject: rename soekris port to x86

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2285 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index fe3c6ca9f..01044d2b2 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -85,5 +85,5 @@ clean:
 
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
-$(eval $(call kernel_template,2.4,soekris,2_4_SOEKRIS))
+$(eval $(call kernel_template,2.4,x86,2_4_X86))
 $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
-- 
cgit v1.2.3


From 0c2301c503c96b0d94457f46152a963521fa0d6d Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 23 Oct 2005 21:00:35 +0000
Subject: cosmetic fix for V= stuff

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2290 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 01044d2b2..7949994f1 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,31 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	$(TRACE) target/linux/linux-$(1)/clean
+	@$(TRACE) target/linux/linux-$(1)/clean
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	$(TRACE) target/linux/linux-$(1)/prepare
+	@$(TRACE) target/linux/linux-$(1)/prepare
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	$(TRACE) target/linux/linux-$(1)/compile
+	@$(TRACE) target/linux/linux-$(1)/compile
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	$(TRACE) target/linux/linux-$(1)/rebuild
+	@$(TRACE) target/linux/linux-$(1)/rebuild
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	$(TRACE) target/linux/linux-$(1)/install
+	@$(TRACE) target/linux/linux-$(1)/install
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-	$(TRACE) target/linux/image/install
+	@$(TRACE) target/linux/image/install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
-	$(TRACE) target/linux/image/install-ib
+	@$(TRACE) target/linux/image/install-ib
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
-- 
cgit v1.2.3


From 88e6d938be231e660d4e73f97ebdf4374f192966 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 3 Nov 2005 02:38:38 +0000
Subject: add 2.6 support for x86

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2320 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 7949994f1..02ed636d1 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -87,3 +87,4 @@ $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
 $(eval $(call kernel_template,2.4,x86,2_4_X86))
 $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
+$(eval $(call kernel_template,2.6,x86,2_6_X86))
-- 
cgit v1.2.3


From 1a73c7e2c98f05b830dd6634b044ea42fd81cdf5 Mon Sep 17 00:00:00 2001
From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 25 Dec 2005 20:04:16 +0000
Subject: first ar531x support for 2.4, thx Mile Albon, some addons from me for
 mips big endian toolchain

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2781 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 02ed636d1..5dfe12ad7 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -88,3 +88,4 @@ $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
 $(eval $(call kernel_template,2.4,x86,2_4_X86))
 $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
 $(eval $(call kernel_template,2.6,x86,2_6_X86))
+$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
-- 
cgit v1.2.3


From dab3ca1324288a1abeb32590e1caec8848efe3e0 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Jan 2006 19:43:00 +0000
Subject: large target/linux cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2877 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 5dfe12ad7..038983f3a 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -10,23 +10,23 @@ define kernel_template
 
 $(1)/$(2)-clean:
 	@$(TRACE) target/linux/linux-$(1)/clean
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
 	@$(TRACE) target/linux/linux-$(1)/prepare
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
 	@$(TRACE) target/linux/linux-$(1)/compile
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
 	@$(TRACE) target/linux/linux-$(1)/rebuild
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
 	@$(TRACE) target/linux/linux-$(1)/install
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
 	@$(TRACE) target/linux/image/install
-- 
cgit v1.2.3


From 5f0e5ca33705395654f782f33851f4d4c3884801 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 11 Jan 2006 03:13:35 +0000
Subject: fix non-verbose messages for the new target/linux structure

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2901 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 038983f3a..fbc4e050d 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,23 +9,23 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	@$(TRACE) target/linux/linux-$(1)/clean
+	@$(TRACE) target/linux/$(2)-$(1)/clean
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	@$(TRACE) target/linux/linux-$(1)/prepare
+	@$(TRACE) target/linux/$(2)-$(1)/prepare
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	@$(TRACE) target/linux/linux-$(1)/compile
+	@$(TRACE) target/linux/$(2)-$(1)/compile
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	@$(TRACE) target/linux/linux-$(1)/rebuild
+	@$(TRACE) target/linux/$(2)-$(1)/rebuild
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	@$(TRACE) target/linux/linux-$(1)/install
+	@$(TRACE) target/linux/$(2)-$(1)/install
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-- 
cgit v1.2.3


From a72d14baa00fdd93001a891563d2beb9bb29cbd3 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 12 Jan 2006 19:10:07 +0000
Subject: Merge aruba support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2940 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index fbc4e050d..8a2eb7333 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -89,3 +89,4 @@ $(eval $(call kernel_template,2.4,x86,2_4_X86))
 $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
 $(eval $(call kernel_template,2.6,x86,2_6_X86))
 $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
+$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
-- 
cgit v1.2.3


From aaa50eba442636926d53f6dc454b9b2ed751c098 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 14 Jan 2006 01:57:24 +0000
Subject: fix trace targets to actually display correct target names

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2970 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 8a2eb7333..2fff3b33a 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,31 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	@$(TRACE) target/linux/$(2)-$(1)/clean
+	@$(TRACE) target/linux/$(2)-$(1)-clean
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	@$(TRACE) target/linux/$(2)-$(1)/prepare
+	@$(TRACE) target/linux/$(2)-$(1)-prepare
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	@$(TRACE) target/linux/$(2)-$(1)/compile
+	@$(TRACE) target/linux/$(2)-$(1)-compile
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	@$(TRACE) target/linux/$(2)-$(1)/rebuild
+	@$(TRACE) target/linux/$(2)-$(1)-rebuild
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	@$(TRACE) target/linux/$(2)-$(1)/install
+	@$(TRACE) target/linux/$(2)-$(1)-install
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-	@$(TRACE) target/linux/image/install
+	@$(TRACE) target/linux/image-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
-	@$(TRACE) target/linux/image/install-ib
+	@$(TRACE) target/linux/image-install-ib
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
@@ -74,10 +74,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:
-	@$(TRACE) target/linux/image/prepare
+	@$(TRACE) target/linux/image-prepare
 	$(MAKE) -C image prepare
 compile:
-	@$(TRACE) target/linux/image/compile
+	@$(TRACE) target/linux/image-compile
 	$(MAKE) -C image compile
 install:
 rebuild:
-- 
cgit v1.2.3


From f8dff0a1dd79f0e6fc825a9870519a5064712465 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 31 Jan 2006 21:55:38 +0000
Subject: fix "make target/linux/package/*-*" targets

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3103 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 2fff3b33a..626587b5b 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -45,6 +45,8 @@ compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
 $(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
 install-ib: $(1)/$(2)-install-ib
+package/%:
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" $$@
 endif
 
 .PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
-- 
cgit v1.2.3


From 82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 1 Feb 2006 23:53:19 +0000
Subject: change cp to $(CP)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 626587b5b..4ef6c45a0 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -60,13 +60,13 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 	rm -rf $(IB_DIR)
 	mkdir -p $(IB_DIR)/packages
 	mkdir -p $(IB_DIR)/scripts
-	cp -fpR ./imagebuilder/* $(IB_DIR)/
-	cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
-	cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
+	$(CP) ./imagebuilder/* $(IB_DIR)/
+	$(CP) $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
+	$(CP) $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
 	$(MAKE) install-ib
-	cp $(TOPDIR)/rules.mk $(IB_DIR)
-	cp -fpR ./image $(IB_DIR)/
-	cp $(TOPDIR)/.config $(IB_DIR)/
+	$(CP) $(TOPDIR)/rules.mk $(IB_DIR)
+	$(CP) ./image $(IB_DIR)/
+	$(CP) $(TOPDIR)/.config $(IB_DIR)/
 	find $(IB_DIR) -name .svn | xargs rm -rf
 	find $(IB_DIR) -name CVS | xargs rm -rf
 	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
-- 
cgit v1.2.3


From 1903fda53bfd3cfc89a2d1642909a59fb01346aa Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Apr 2006 15:31:26 +0000
Subject: Add initial support for AMD Alchemy 1500 boards (4G-Systems
 AccessCube). Thanks to Etienne for the hardware ;)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3606 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 4ef6c45a0..f40a99cf5 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -92,3 +92,4 @@ $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
 $(eval $(call kernel_template,2.6,x86,2_6_X86))
 $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
 $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
+$(eval $(call kernel_template,2.6,au1000,2_6_MTX-1))
-- 
cgit v1.2.3


From dc96101958bde084c6a61591a2b2b51eff44ce02 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 12 Apr 2006 14:48:36 +0000
Subject: Move ueagle to the main kernel config since it is in stock kernel Add
 Zydas ZD1211 driver, needs testing, closes #249 Change MTX-1 platform name
 for AU1000 in order to have a unique platform naming

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3626 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index f40a99cf5..9f25fd721 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -92,4 +92,4 @@ $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
 $(eval $(call kernel_template,2.6,x86,2_6_X86))
 $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
 $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
-$(eval $(call kernel_template,2.6,au1000,2_6_MTX-1))
+$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
-- 
cgit v1.2.3


From dd2b3f1c125a74f2f3c44d9114d316a861566cc4 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 10 May 2006 20:32:22 +0000
Subject: remove old trace/verbose junk

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3755 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 9f25fd721..7922de913 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,31 +9,24 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	@$(TRACE) target/linux/$(2)-$(1)-clean
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	@$(TRACE) target/linux/$(2)-$(1)-prepare
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	@$(TRACE) target/linux/$(2)-$(1)-compile
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	@$(TRACE) target/linux/$(2)-$(1)-rebuild
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	@$(TRACE) target/linux/$(2)-$(1)-install
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-	@$(TRACE) target/linux/image-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
-	@$(TRACE) target/linux/image-install-ib
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
@@ -76,10 +69,8 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:
-	@$(TRACE) target/linux/image-prepare
 	$(MAKE) -C image prepare
 compile:
-	@$(TRACE) target/linux/image-compile
 	$(MAKE) -C image compile
 install:
 rebuild:
-- 
cgit v1.2.3


From 11969830947ba88158f7dbba7f85b5c7f72883e3 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 11 May 2006 23:43:45 +0000
Subject: BR2_ -> CONFIG_

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3766 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 7922de913..d7744f56e 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -31,7 +31,7 @@ $(1)/$(2)-install-ib:
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
 
-ifeq ($(BR2_LINUX_$(3)),y)
+ifeq ($(CONFIG_LINUX_$(3)),y)
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
@@ -64,7 +64,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 	find $(IB_DIR) -name CVS | xargs rm -rf
 	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
 
-ifeq ($(BR2_PACKAGE_IMAGEBUILDER),y)
+ifeq ($(CONFIG_PACKAGE_IMAGEBUILDER),y)
 install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
-- 
cgit v1.2.3


From be8ad0190d689eb7f797bdc0618d7e87892a831d Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 30 May 2006 19:38:38 +0000
Subject: resync with kamikaze

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3844 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index d7744f56e..bea43514a 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -84,3 +84,5 @@ $(eval $(call kernel_template,2.6,x86,2_6_X86))
 $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
 $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
 $(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
+$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
+$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
-- 
cgit v1.2.3


From 275628fece4255b7125fc630529bd8d372987cdf Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 31 May 2006 12:38:39 +0000
Subject: disable target/linux/package

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3856 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 2 --
 1 file changed, 2 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index bea43514a..46b162c7e 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -38,8 +38,6 @@ compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
 $(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
 install-ib: $(1)/$(2)-install-ib
-package/%:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" $$@
 endif
 
 .PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
-- 
cgit v1.2.3


From ff69288edb1c2ef75c0ebb4a2dc159b82b92a3c5 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 4 Jun 2006 21:57:59 +0000
Subject: target/linux/image rewrite

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3905 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 87 +++++++++++++--------------------------------------
 1 file changed, 21 insertions(+), 66 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 46b162c7e..af3e3bd26 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -3,77 +3,13 @@ include $(TOPDIR)/rules.mk
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
-IB_NAME:=OpenWrt-ImageBuilder-$(PKG_OS)-$(PKG_CPU)
-IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
-
 define kernel_template
-
-$(1)/$(2)-clean:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
-
-$(1)/$(2)-prepare:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
-
-$(1)/$(2)-compile:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
-
-$(1)/$(2)-rebuild:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
-
-$(1)/$(2)-install:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
-
-$(1)/$(2)-image: $(1)/$(2)-install
-	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
-
-$(1)/$(2)-install-ib:
-	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
-	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
-
-
 ifeq ($(CONFIG_LINUX_$(3)),y)
-clean: $(1)/$(2)-clean
-prepare: $(1)/$(2)-prepare
-compile: $(1)/$(2)-compile
-rebuild: $(1)/$(2)-rebuild
-$(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
-install-ib: $(1)/$(2)-install-ib
+KERNEL:=$(1)
+BOARD:=$(2)
 endif
-
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
 endef
 
-.PHONY: clean prepare compile rebuild install imagebuilder install-ib
-
-install-ib:
-
-$(BIN_DIR)/$(IB_NAME).tar.bz2:	
-	rm -rf $(IB_DIR)
-	mkdir -p $(IB_DIR)/packages
-	mkdir -p $(IB_DIR)/scripts
-	$(CP) ./imagebuilder/* $(IB_DIR)/
-	$(CP) $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
-	$(CP) $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
-	$(MAKE) install-ib
-	$(CP) $(TOPDIR)/rules.mk $(IB_DIR)
-	$(CP) ./image $(IB_DIR)/
-	$(CP) $(TOPDIR)/.config $(IB_DIR)/
-	find $(IB_DIR) -name .svn | xargs rm -rf
-	find $(IB_DIR) -name CVS | xargs rm -rf
-	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
-
-ifeq ($(CONFIG_PACKAGE_IMAGEBUILDER),y)
-install: $(BIN_DIR)/$(IB_NAME).tar.bz2
-endif
-
-prepare:
-	$(MAKE) -C image prepare
-compile:
-	$(MAKE) -C image compile
-install:
-rebuild:
-clean:
-
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
 $(eval $(call kernel_template,2.4,x86,2_4_X86))
@@ -84,3 +20,22 @@ $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
 $(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
 $(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
 $(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
+
+export BOARD
+export KERNEL
+
+prepare:
+	$(MAKE) -C $(BOARD)-$(KERNEL) prepare
+
+compile:
+	$(MAKE) -C $(BOARD)-$(KERNEL) compile
+
+install:
+	$(MAKE) -C $(BOARD)-$(KERNEL) install
+	$(MAKE) -C image/$(BOARD) install
+	
+clean:
+	$(MAKE) -C $(BOARD)-$(KERNEL) clean
+
+image/%:
+	$(MAKE) -C image $(patsubst image/%,%,$@)
-- 
cgit v1.2.3


From b739c888dfd9095551cbf13798ed42fe1ec2bfc6 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 15 Jun 2006 21:43:59 +0000
Subject: add rb532 support

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3956 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index af3e3bd26..c08bb4c89 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -14,6 +14,7 @@ $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
 $(eval $(call kernel_template,2.4,x86,2_4_X86))
 $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
+$(eval $(call kernel_template,2.6,rb532,2_6_RB532))
 $(eval $(call kernel_template,2.6,x86,2_6_X86))
 $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
 $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
-- 
cgit v1.2.3


From 97f419b809d897b74baad8044de4bfcd47dd4fa9 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 20 Jun 2006 23:56:49 +0000
Subject: add target/download

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4030 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index c08bb4c89..2caee31b3 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -25,6 +25,10 @@ $(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
 export BOARD
 export KERNEL
 
+source:
+	$(MAKE) -C $(BOARD)-$(KERNEL) source
+	$(MAKE) -C image/$(BOARD) source
+
 prepare:
 	$(MAKE) -C $(BOARD)-$(KERNEL) prepare
 
-- 
cgit v1.2.3


From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 02:16:37 +0000
Subject: build system cleanup. move shared include files into
 $(TOPDIR)/include, move lzma, mkfs.* into toolchain/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 2caee31b3..e1a314d1d 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -30,6 +30,7 @@ source:
 	$(MAKE) -C image/$(BOARD) source
 
 prepare:
+	rm -f $(TOPDIR)/.kernel.mk
 	$(MAKE) -C $(BOARD)-$(KERNEL) prepare
 
 compile:
-- 
cgit v1.2.3


From a8de4fb9f24fea095e80a3fcd5c69bd6029e39d2 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 14:02:29 +0000
Subject: move target/linux/image to target/image

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4040 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index e1a314d1d..bab26845a 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -1,33 +1,8 @@
 include $(TOPDIR)/rules.mk
-
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
-
-define kernel_template
-ifeq ($(CONFIG_LINUX_$(3)),y)
-KERNEL:=$(1)
-BOARD:=$(2)
-endif
-endef
-
-$(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
-$(eval $(call kernel_template,2.4,ar7,2_4_AR7))
-$(eval $(call kernel_template,2.4,x86,2_4_X86))
-$(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
-$(eval $(call kernel_template,2.6,rb532,2_6_RB532))
-$(eval $(call kernel_template,2.6,x86,2_6_X86))
-$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
-$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
-$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
-$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
-$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
-
-export BOARD
-export KERNEL
+include $(INCLUDE_DIR)/target.mk
 
 source:
 	$(MAKE) -C $(BOARD)-$(KERNEL) source
-	$(MAKE) -C image/$(BOARD) source
 
 prepare:
 	rm -f $(TOPDIR)/.kernel.mk
@@ -38,10 +13,6 @@ compile:
 
 install:
 	$(MAKE) -C $(BOARD)-$(KERNEL) install
-	$(MAKE) -C image/$(BOARD) install
 	
 clean:
 	$(MAKE) -C $(BOARD)-$(KERNEL) clean
-
-image/%:
-	$(MAKE) -C image $(patsubst image/%,%,$@)
-- 
cgit v1.2.3


From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Jun 2006 00:35:46 +0000
Subject: credit where credit is due

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index bab26845a..9afda46c8 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
-- 
cgit v1.2.3


From 65aeed311cbddeb66427150582239ff1623246d9 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 21 Jul 2006 17:00:14 +0000
Subject: fix a few directories missed in [4176]'s source -> download

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4198 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'target/linux/Makefile')

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 9afda46c8..8682fc2b9 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
-source:
-	$(MAKE) -C $(BOARD)-$(KERNEL) source
+download:
+	$(MAKE) -C $(BOARD)-$(KERNEL) download
 
 prepare:
 	rm -f $(TOPDIR)/.kernel.mk
-- 
cgit v1.2.3