diff options
| author | Mike Baker <mbm@openwrt.org> | 2005-03-03 02:44:10 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2005-03-03 02:44:10 +0000 |
| commit | 87f22e678a5764c4a17d78d6392ced68aeca3bad (patch) | |
| tree | effa4303a465585ece60f334611d03d7157c5783 /package | |
| parent | 79cb6ffbb0ab38c4a41548fa9c39e29aedd0120a (diff) | |
| download | master-187ad058-87f22e678a5764c4a17d78d6392ced68aeca3bad.tar.gz master-187ad058-87f22e678a5764c4a17d78d6392ced68aeca3bad.tar.bz2 master-187ad058-87f22e678a5764c4a17d78d6392ced68aeca3bad.zip | |
target/jffs2/blocksize.mk for setting block size (req. for wrt54g)
squashfs removed in favor of squashfs-lzma
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@301 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 | bin | 0 -> 5730 bytes | |||
| -rw-r--r-- | package/linux/linux.config | 2 | ||||
| -rw-r--r-- | package/linux/linux.mk | 14 | ||||
| -rw-r--r-- | package/openwrt/trx.c | 14 |
4 files changed, 16 insertions, 14 deletions
diff --git a/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 b/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 Binary files differnew file mode 100644 index 0000000000..8e19292c1e --- /dev/null +++ b/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 diff --git a/package/linux/linux.config b/package/linux/linux.config index de477721ae..761906ae5d 100644 --- a/package/linux/linux.config +++ b/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/package/linux/linux.mk b/package/linux/linux.mk index bead2226a6..6e3f7a4d27 100644 --- a/package/linux/linux.mk +++ b/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/package/openwrt/trx.c b/package/openwrt/trx.c index d4ad600378..79a04026ea 100644 --- a/package/openwrt/trx.c +++ b/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 { |