Remove patch-cmdline from the packages and move it tools tools/. adm5120 and rb532 do use it for procuding ready-to-use kernels (#1631)

SVN-Revision: 7820

6 files changed, 40 insertions, 46 deletions

diff --git a/package/patch-cmdline/Makefile b/package/patch-cmdline/Makefile
deleted file mode 100644
index 70dc1ea69f..0000000000
--- a/package/patch-cmdline/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=patch-cmdline
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/patch-cmdline
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Patch the kernel command line for RouterBoards
-  DEPENDS:=@LINUX_2_6_ADM5120||@LINUX_2_6_RB532
-  DESCRIPTION:=\
-	A tool to patch the kernel command line on RouterBoards
-  URL:=https://dev.openwrt.org/browser/trunk/package/patch-cmdline/src/patch-cmdline.c
-  VERSION:=1
-endef
-
-define Build/Prepare
-	$(CP) ./src/$(PKG_NAME).c $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-	$(TARGET_CC) -o $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME).c
-endef
-
-define Package/patch-cmdline/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,patch-cmdline))
diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120-2.6/image/Makefile
index 360a87f657..ae869f6055 100644
--- a/target/linux/adm5120-2.6/image/Makefile
+++ b/target/linux/adm5120-2.6/image/Makefile
@@ -77,8 +77,13 @@ define Image/Build/MyLoader
 		$(IMGNAME)-$(3)-$(2).bin
 endef
 
+define Image/cmdline/yaffs2
+root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit
+endef
+
 define Image/Build/RouterBoard
 	$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-vmlinux
+	$(STAGING_DIR)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) '
 endef
 
 define Image/Build
diff --git a/target/linux/rb532-2.6/image/Makefile b/target/linux/rb532-2.6/image/Makefile
index 84f37e3bb2..555eb2a645 100644
--- a/target/linux/rb532-2.6/image/Makefile
+++ b/target/linux/rb532-2.6/image/Makefile
@@ -20,10 +20,6 @@ LOADER_MAKEOPTS= \
 		RAMSIZE=$(RAMSIZE) \
 		IMAGE_COPY=$(IMAGE_COPY)
 
-define Build/Compile
-	$(CC) -o $(STAGING_DIR)/bin/patch-cmdline $(PLATFORM_DIR)/src/patch-cmdline.c
-endef
-
 define Build/Clean
 	$(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean
 endef
diff --git a/tools/Makefile b/tools/Makefile
index 4ee3f1ae7e..68e7dab534 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,7 @@
 # Main makefile for the host tools
 #
 include $(TOPDIR)/rules.mk
-TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils
+TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline
 TARGETS-$(CONFIG_CCACHE) += ccache
 
 TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
diff --git a/tools/patch-cmdline/Makefile b/tools/patch-cmdline/Makefile
new file mode 100644
index 0000000000..75ea7b52d4
--- /dev/null
+++ b/tools/patch-cmdline/Makefile
@@ -0,0 +1,34 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=patch-cmdline
+
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+OS:=$(shell uname)
+ifeq ($(HOST_OS),Darwin)
+  CFLAGS += -I./include
+endif
+CFLAGS += -I $(TOPDIR)/tools/include -include endian.h
+
+define Build/Compile
+	$(CC) $(CFLAGS) -o $(PKG_BUILD_DIR)/$(PKG_NAME) src/$(PKG_NAME).c
+endef
+
+define Build/Install
+	mkdir -p $(STAGING_DIR)/bin
+	$(CP) $(PKG_BUILD_DIR)/patch-cmdline $(STAGING_DIR)/bin/
+endef
+
+define Build/Clean
+	-rm -f $(STAGING_DIR)/bin/patch-cmdline
+endef
+
+$(eval $(call HostBuild))
diff --git a/package/patch-cmdline/src/patch-cmdline.c b/tools/patch-cmdline/src/patch-cmdline.c
index d4636f7732..d4636f7732 100644
--- a/package/patch-cmdline/src/patch-cmdline.c
+++ b/tools/patch-cmdline/src/patch-cmdline.c