From 114632438a8d787127db0cb997fea058c4307d46 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 1 Jul 2007 09:45:27 +0000 Subject: 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 --- tools/Makefile | 2 +- tools/patch-cmdline/Makefile | 34 ++++++++++++++ tools/patch-cmdline/src/patch-cmdline.c | 80 +++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 tools/patch-cmdline/Makefile create mode 100644 tools/patch-cmdline/src/patch-cmdline.c (limited to 'tools') 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/tools/patch-cmdline/src/patch-cmdline.c b/tools/patch-cmdline/src/patch-cmdline.c new file mode 100644 index 0000000000..d4636f7732 --- /dev/null +++ b/tools/patch-cmdline/src/patch-cmdline.c @@ -0,0 +1,80 @@ +/* + * patch-cmdline.c - patch the kernel command line on rb532 + * + * Copyright (C) 2006 Felix Fietkau + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id:$ + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define SEARCH_SPACE (16 * 1024) +#define CMDLINE_MAX 512 + +int main(int argc, char **argv) +{ + int fd, found = 0, len, ret = -1; + char *ptr, *p; + + if (argc != 3) { + fprintf(stderr, "Usage: %s \n", argv[0]); + goto err1; + } + len = strlen(argv[2]); + if (len + 9 > CMDLINE_MAX) { + fprintf(stderr, "Command line string too long\n"); + goto err1; + } + + if (((fd = open(argv[1], O_RDWR)) < 0) || + (ptr = (char *) mmap(0, SEARCH_SPACE + CMDLINE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) { + fprintf(stderr, "Could not open kernel image"); + goto err2; + } + + for (p = ptr; p < (ptr + SEARCH_SPACE); p += 4) { + if (memcmp(p, "CMDLINE:", 8) == 0) { + found = 1; + p += 8; + break; + } + } + if (!found) { + fprintf(stderr, "Command line marker not found!\n"); + goto err3; + } + + memset(p, 0, CMDLINE_MAX - 8); + strcpy(p, argv[2]); + msync(p, CMDLINE_MAX, MS_SYNC|MS_INVALIDATE); + ret = 0; + +err3: + munmap((void *) ptr, len); +err2: + if (fd > 0) + close(fd); +err1: + return ret; +} -- cgit v1.2.3