summaryrefslogtreecommitdiffstats
path: root/openwrt/package
diff options
context:
space:
mode:
Diffstat (limited to 'openwrt/package')
-rw-r--r--openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2bin0 -> 5730 bytes
-rw-r--r--openwrt/package/linux/linux.config2
-rw-r--r--openwrt/package/linux/linux.mk14
-rw-r--r--openwrt/package/openwrt/trx.c14
4 files changed, 16 insertions, 14 deletions
diff --git a/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 b/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2
new file mode 100644
index 000000000..8e19292c1
--- /dev/null
+++ b/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2
Binary files differ
diff --git a/openwrt/package/linux/linux.config b/openwrt/package/linux/linux.config
index de477721a..761906ae5 100644
--- a/openwrt/package/linux/linux.config
+++ b/openwrt/package/linux/linux.config
@@ -86,7 +86,7 @@ CONFIG_BCM4704=y
# CONFIG_HIGHMEM is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
+CONFIG_CMDLINE="root=/dev/mtdblock2 init=/etc/preinit noinitrd console=ttyS0,115200"
CONFIG_PCI=y
CONFIG_NONCOHERENT_IO=y
CONFIG_NEW_TIME_C=y
diff --git a/openwrt/package/linux/linux.mk b/openwrt/package/linux/linux.mk
index bead2226a..6e3f7a4d2 100644
--- a/openwrt/package/linux/linux.mk
+++ b/openwrt/package/linux/linux.mk
@@ -50,21 +50,13 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINKSYS_KERNEL_TGZ
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
$(PATCH) $(LINUX_DIR) $(LINUX_PATCHES)
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y)
- $(PATCH) $(LINUX_DIR) target/squashfs-lzma/kernel-patch
-endif
touch $(LINUX_DIR)/.patched
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y)
- $(SED) "s,rootfstype=jffs2,rootfstype=squashfs," $(LINUX_DIR)/.config
-endif
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS),y)
- $(SED) "s,rootfstype=jffs2,rootfstype=squashfs," $(LINUX_DIR)/.config
-endif
- $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
- $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile
+ $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
+ $(LINUX_DIR)/Makefile \
+ $(LINUX_DIR)/arch/mips/Makefile
$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h
touch $(LINUX_DIR)/.configured
diff --git a/openwrt/package/openwrt/trx.c b/openwrt/package/openwrt/trx.c
index d4ad60037..79a04026e 100644
--- a/openwrt/package/openwrt/trx.c
+++ b/openwrt/package/openwrt/trx.c
@@ -170,7 +170,12 @@ int main(int argc, char **argv)
}
break;
case 'a':
- n = atoi(optarg);
+ errno = 0;
+ n = strtoul(optarg, &e, 0);
+ if (errno || (e == optarg) || *e) {
+ fprintf(stderr, "illegal numeric string\n");
+ usage();
+ }
if (cur_len & (n-1)) {
n = n - (cur_len & (n-1));
memset(buf + cur_len, 0, n);
@@ -178,7 +183,12 @@ int main(int argc, char **argv)
}
break;
case 'b':
- n = atoi(optarg);
+ errno = 0;
+ n = strtoul(optarg, &e, 0);
+ if (errno || (e == optarg) || *e) {
+ fprintf(stderr, "illegal numeric string\n");
+ usage();
+ }
if (n < cur_len) {
fprintf(stderr, "WARNING: current length exceeds -b %d offset\n",n);
} else {