summaryrefslogtreecommitdiff
path: root/openwrt
diff options
context:
space:
mode:
Diffstat (limited to 'openwrt')
-rw-r--r--openwrt/Makefile7
-rw-r--r--openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 (renamed from openwrt/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2)bin5730 -> 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
-rwxr-xr-xopenwrt/scripts/configtest.pl11
-rw-r--r--openwrt/target/Config.in1
-rw-r--r--openwrt/target/Makefile.in3
-rw-r--r--openwrt/target/jffs2/blocksize.mk1
-rw-r--r--openwrt/target/jffs2/jffs2root.mk4
-rw-r--r--openwrt/target/squashfs/Config.in5
-rw-r--r--openwrt/target/squashfs/squashfsroot.mk54
12 files changed, 22 insertions, 94 deletions
diff --git a/openwrt/Makefile b/openwrt/Makefile
index e490078bc5..bc69f2a1de 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -170,25 +170,21 @@ menuconfig: $(CONFIG)/mconf
-touch .config
-cp .config .config.test
@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
- -./scripts/configtest.pl
config: $(CONFIG)/conf
-touch .config
-cp .config .config.test
@$(CONFIG)/conf $(CONFIG_CONFIG_IN)
- -./scripts/configtest.pl
oldconfig: $(CONFIG)/conf
-touch .config
-cp .config .config.test
@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
- -./scripts/configtest.pl
randconfig: $(CONFIG)/conf
-touch .config
-cp .config .config.test
@$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
- -./scripts/configtest.pl
allyesconfig: $(CONFIG)/conf
#@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
@@ -196,19 +192,16 @@ allyesconfig: $(CONFIG)/conf
-touch .config
-cp .config .config.test
@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
- -./scripts/configtest.pl
allnoconfig: $(CONFIG)/conf
-touch .config
-cp .config .config.test
@$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
- -./scripts/configtest.pl
defconfig: $(CONFIG)/conf
-touch .config
-cp .config .config.test
@$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
- -./scripts/configtest.pl
#############################################################
#
diff --git a/openwrt/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 b/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2
index 8e19292c1e..8e19292c1e 100644
--- a/openwrt/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2
+++ 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 de477721ae..761906ae5d 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 bead2226a6..6e3f7a4d27 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 d4ad600378..79a04026ea 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 {
diff --git a/openwrt/scripts/configtest.pl b/openwrt/scripts/configtest.pl
deleted file mode 100755
index 61fe8a7b62..0000000000
--- a/openwrt/scripts/configtest.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/perl
-
-my %change = (
- 'ROOTFS' => 'make linux-dirclean'
-);
-
-foreach my $change (keys %change) {
- my $v1 = `grep '$change' .config.test`;
- my $v2 = `grep '$change' .config`;
- $v1 eq $v2 or system($change{$change});
-}
diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in
index 36616f07b8..1a997da2a6 100644
--- a/openwrt/target/Config.in
+++ b/openwrt/target/Config.in
@@ -1,7 +1,6 @@
choice
prompt "Target Root Filesystem"
source "target/jffs2/Config.in"
- source "target/squashfs/Config.in"
source "target/squashfs-lzma/Config.in"
endchoice
diff --git a/openwrt/target/Makefile.in b/openwrt/target/Makefile.in
index 15cf6bdede..22cd7a4208 100644
--- a/openwrt/target/Makefile.in
+++ b/openwrt/target/Makefile.in
@@ -6,7 +6,8 @@ TARGET_SKEL_DIR=target/default/target_skeleton
include target/device/Makefile.in
ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-JFFS2FLAGS+=-a 131072
+include target/jffs2/blocksize.mk
+JFFS2FLAGS+=-a $(JFFS2_BLOCK_SIZE)
endif
diff --git a/openwrt/target/jffs2/blocksize.mk b/openwrt/target/jffs2/blocksize.mk
new file mode 100644
index 0000000000..9e08a04974
--- /dev/null
+++ b/openwrt/target/jffs2/blocksize.mk
@@ -0,0 +1 @@
+JFFS2_BLOCK_SIZE:=0x20000
diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk
index 92dad0e57c..9846d001f0 100644
--- a/openwrt/target/jffs2/jffs2root.mk
+++ b/openwrt/target/jffs2/jffs2root.mk
@@ -4,6 +4,8 @@
#
#############################################################
+include target/jffs2/blocksize.mk
+
MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig
MTD_SOURCE=mtd_20050122.orig.tar.gz
MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd
@@ -32,7 +34,7 @@ jffs2root: mtd
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(SSTRIP) 2>/dev/null || true;
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/info
- $(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
+ $(MKFS_JFFS2) --pad --little-endian --squash -e $(JFFS2_BLOCK_SIZE) \
-d $(TARGET_DIR) -o $(IMAGE).jffs2
jffs2root-source: $(DL_DIR)/$(MTD_SOURCE)
diff --git a/openwrt/target/squashfs/Config.in b/openwrt/target/squashfs/Config.in
deleted file mode 100644
index 6f1d709d50..0000000000
--- a/openwrt/target/squashfs/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_TARGET_ROOTFS_SQUASHFS
- bool "squashfs"
- help
- Build a squashfs root filesystem
-
diff --git a/openwrt/target/squashfs/squashfsroot.mk b/openwrt/target/squashfs/squashfsroot.mk
deleted file mode 100644
index d3a104a83f..0000000000
--- a/openwrt/target/squashfs/squashfsroot.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################
-#
-# squashfs target
-#
-#############################################################
-
-SQUASHFS_DIR=$(BUILD_DIR)/squashfs2.1-r2
-SQUASHFS_SOURCE=squashfs2.1-r2.tar.gz
-SQUASHFS_SITE=http://dl.sourceforge.net/sourceforge/squashfs
-
-$(DL_DIR)/$(SQUASHFS_SOURCE):
- $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE)
-
-$(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE)
- zcat $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
- touch $(SQUASHFS_DIR)/.unpacked
-
-$(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked
- $(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools;
-
-squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs
-
-squashfs-source: $(DL_DIR)/$(SQUASHFS_SOURCE)
-
-squashfs-clean:
- -$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools clean
-
-squashfs-dirclean:
- rm -rf $(SQUASHFS_DIR)
-
-
-#############################################################
-#
-# Build the squashfs root filesystem image
-#
-#############################################################
-
-squashfsroot: squashfs
- @rm -rf $(TARGET_DIR)/usr/man
- @rm -rf $(TARGET_DIR)/usr/info
- $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le
-
-squashfsroot-source: squashfs-source
-
-squashfsroot-clean:
- -$(MAKE) -C $(SQUASHFS_DIR) clean
-
-squashfsroot-dirclean:
- rm -rf $(SQUASHFS_DIR)
-
-ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y)
-TARGETS+=squashfsroot openwrt-image
-ROOTFS=squashfs
-endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 23:39:01 +0000