[source] rb532: drop patch-cmdline from base-files

LEDE Commits lede-commits at lists.infradead.org
Sat Jan 7 08:51:20 PST 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/50a3bce3eb1383fbdf76edb0851f0ec147dd7011

commit 50a3bce3eb1383fbdf76edb0851f0ec147dd7011
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Jan 6 08:58:08 2017 +0100

    rb532: drop patch-cmdline from base-files
    
    It is no longer used for upgrading
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 target/linux/rb532/base-files.mk       | 11 -----
 target/linux/rb532/src/patch-cmdline.c | 79 ----------------------------------
 2 files changed, 90 deletions(-)

diff --git a/target/linux/rb532/base-files.mk b/target/linux/rb532/base-files.mk
deleted file mode 100644
index afd1220..0000000
--- a/target/linux/rb532/base-files.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(TARGET_CC) -o $(PKG_BUILD_DIR)/patch-cmdline $(PLATFORM_DIR)/src/patch-cmdline.c
-endef
-
-define Package/base-files/install-target
-	mkdir -p $(1)/sbin
-	$(CP) $(PKG_BUILD_DIR)/patch-cmdline $(1)/sbin
-endef
-
-
diff --git a/target/linux/rb532/src/patch-cmdline.c b/target/linux/rb532/src/patch-cmdline.c
deleted file mode 100644
index d3a5b11..0000000
--- a/target/linux/rb532/src/patch-cmdline.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * patch-cmdline.c - patch the kernel command line on rb532
- *
- * Copyright (C) 2006 Felix Fietkau <nbd at nbd.name>
- *
- * 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.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <string.h>
-
-#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 <file> <cmdline>\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;
-}



More information about the lede-commits mailing list