From a1701ecb013364609652dc2208cc53528bf3959e Mon Sep 17 00:00:00 2001 From: wbx Date: Wed, 23 Feb 2005 21:16:20 +0000 Subject: [PATCH 01/16] selecting zlib automatically in Config.in does not mean it will be build before dropbear. add zlib as dependency git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@289 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dropbear_sshd/dropbear_sshd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dropbear_sshd/dropbear_sshd.mk b/package/dropbear_sshd/dropbear_sshd.mk index e5ac5dc40..4031e218f 100644 --- a/package/dropbear_sshd/dropbear_sshd.mk +++ b/package/dropbear_sshd/dropbear_sshd.mk @@ -67,7 +67,7 @@ $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY): $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SS cp $(DROPBEAR_SSHD_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/ chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear -dropbear_sshd: uclibc $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY) +dropbear_sshd: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY) dropbear_sshd-clean: $(MAKE) DESTDIR=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) \ -- 2.20.1 From b7a5a29ecb22d80d8a68951f207967c8437dc2e1 Mon Sep 17 00:00:00 2001 From: wbx Date: Wed, 23 Feb 2005 21:50:10 +0000 Subject: [PATCH 02/16] I do not believe that users will cleanup kernelsource, when switching rootfs. force it with scripts and Makefile changes from Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@290 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 21 +++++++++++++++++++++ README | 2 +- package/config/mconf.c | 1 - scripts/configtest.pl | 11 +++++++++++ flash.sh => scripts/flash.sh | 0 target/Config.in | 2 -- 6 files changed, 33 insertions(+), 4 deletions(-) create mode 100755 scripts/configtest.pl rename flash.sh => scripts/flash.sh (100%) diff --git a/Makefile b/Makefile index 92137eac2..dfa272120 100644 --- a/Makefile +++ b/Makefile @@ -166,27 +166,48 @@ $(CONFIG)/mconf: fi 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) #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config + -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/README b/README index c79070cfa..7d937e76d 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ Simply running 'make' will build your firmware and a tarball of kernel modules. It will download all sources, build the cross-compile toolchain, the kernel and all choosen applications. -You can use flash.sh for remotely updating your embedded system +You can use scripts/flash.sh for remotely updating your embedded system via tftp. diff --git a/package/config/mconf.c b/package/config/mconf.c index 659e49cd6..0db6f8f6c 100644 --- a/package/config/mconf.c +++ b/package/config/mconf.c @@ -705,7 +705,6 @@ int main(int ac, char **av) conf_write(NULL); printf("\n\n" "*** End of Buildroot configuration.\n" - "*** After changing root fs, use make linux-dirclean.\n" "*** Check the top-level Makefile for additional configuration options.\n\n"); } else printf("\n\nYour Buildroot configuration changes were NOT saved.\n\n"); diff --git a/scripts/configtest.pl b/scripts/configtest.pl new file mode 100755 index 000000000..61fe8a7b6 --- /dev/null +++ b/scripts/configtest.pl @@ -0,0 +1,11 @@ +#!/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/flash.sh b/scripts/flash.sh similarity index 100% rename from flash.sh rename to scripts/flash.sh diff --git a/target/Config.in b/target/Config.in index 0fe83857c..36616f07b 100644 --- a/target/Config.in +++ b/target/Config.in @@ -1,5 +1,3 @@ -comment "after changing root fs, use make linux-dirclean" - choice prompt "Target Root Filesystem" source "target/jffs2/Config.in" -- 2.20.1 From 6f1e58162d1a46941bf79594e5204106f6c6b2cc Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 24 Feb 2005 08:46:59 +0000 Subject: [PATCH 03/16] Added a CHANGES file, summarizing changes between official and experimental git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@291 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- docs/CHANGES | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docs/CHANGES diff --git a/docs/CHANGES b/docs/CHANGES new file mode 100644 index 000000000..382aecf3e --- /dev/null +++ b/docs/CHANGES @@ -0,0 +1,16 @@ + + OpenWRT CHANGES + --------------- + + Changes between official and experimental + + *) new buildroot (based on uClib buildroot2) + + *) new kernel (updated to 2.4.29) + + *) jffs2 root partition support + + *) lzma compression (kernel and squashfs root partition) + + *) posix threads library (libpthread) is now embedded in firmware + -- 2.20.1 From 990231f8414f8720aa36ebc57359580481bd0c95 Mon Sep 17 00:00:00 2001 From: wbx Date: Fri, 25 Feb 2005 13:21:48 +0000 Subject: [PATCH 04/16] add ebtables and Asus support git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@292 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- docs/CHANGES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/CHANGES b/docs/CHANGES index 382aecf3e..36ee41af1 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -14,3 +14,8 @@ *) posix threads library (libpthread) is now embedded in firmware + *) newest ebtables support + + *) better support for Asus WL-500g + (kernel modules for usb,scsi,vfat build) + -- 2.20.1 From 7cd49ecd1cbad9a999f9d49fc7b389e4a1cc719e Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 25 Feb 2005 23:56:46 +0000 Subject: [PATCH 05/16] Allow firstboot to mount /dev/mtdblock/4 on /jffs when root fs is squashfs git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@293 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/squashfs-lzma/squashfslzmaroot.mk | 1 + target/squashfs/squashfsroot.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk index 722c20524..4059896bc 100644 --- a/target/squashfs-lzma/squashfslzmaroot.mk +++ b/target/squashfs-lzma/squashfslzmaroot.mk @@ -39,6 +39,7 @@ squashfslzma-dirclean: squashfslzmaroot: squashfslzma @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info + @mkdir -p $(TARGET_DIR)/jffs $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le squashfslzmaroot-source: squashfslzma-source diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index d3a104a83..62b645a88 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -38,6 +38,7 @@ squashfs-dirclean: squashfsroot: squashfs @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info + @mkdir -p $(TARGET_DIR)/jffs $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le squashfsroot-source: squashfs-source -- 2.20.1 From f0aa43923c309c39cc61b1a932737ab87c66a029 Mon Sep 17 00:00:00 2001 From: mbm Date: Sat, 26 Feb 2005 02:32:16 +0000 Subject: [PATCH 06/16] bugfix git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@294 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 2 ++ package/openwrt/jffs2root.c | 5 ++++- target/default/target_skeleton/etc/preinit | 6 +++--- target/squashfs-lzma/squashfslzmaroot.mk | 1 - target/squashfs/squashfsroot.mk | 1 - 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index dfa272120..b8c9b10b7 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,8 @@ $(TARGET_DIR): fi; -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf + -ln -sf /tmp/resolv.conf $(TARGET_DIR) + -mkdir -p $(TARGET_DIR)/jffs source: $(TARGETS_SOURCE) diff --git a/package/openwrt/jffs2root.c b/package/openwrt/jffs2root.c index e74c89a9b..2ff37fdad 100644 --- a/package/openwrt/jffs2root.c +++ b/package/openwrt/jffs2root.c @@ -48,7 +48,10 @@ void init_crc32() unsigned long crc; unsigned long poly = 0xEDB88320L; int n, bit; - crc32 = (unsigned long *) malloc(256 * sizeof(unsigned long)); + if ((crc32 = (unsigned long *) malloc(256 * sizeof(unsigned long))) == (void *)-1) { + perror("malloc"); + exit(1); + } for (n = 0; n < 256; n++) { crc = (unsigned long) n; for (bit = 0; bit < 8; bit++) diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit index d2036f4e5..28fe80526 100755 --- a/target/default/target_skeleton/etc/preinit +++ b/target/default/target_skeleton/etc/preinit @@ -11,10 +11,10 @@ else mtd unlock mtd4 mount -t jffs2 /dev/mtdblock/4 /jffs pivot_root /jffs /jffs/rom - mount none /dev -t devfs - mount none /proc -t proc - umount rom/proc } + mount none /dev -t devfs + mount none /proc -t proc + umount rom/proc fi mount none /tmp -t ramfs exec /sbin/init diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk index 4059896bc..722c20524 100644 --- a/target/squashfs-lzma/squashfslzmaroot.mk +++ b/target/squashfs-lzma/squashfslzmaroot.mk @@ -39,7 +39,6 @@ squashfslzma-dirclean: squashfslzmaroot: squashfslzma @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info - @mkdir -p $(TARGET_DIR)/jffs $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le squashfslzmaroot-source: squashfslzma-source diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index 62b645a88..d3a104a83 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -38,7 +38,6 @@ squashfs-dirclean: squashfsroot: squashfs @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info - @mkdir -p $(TARGET_DIR)/jffs $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le squashfsroot-source: squashfs-source -- 2.20.1 From 2ef3e0006a2bdc32593b5d9806589cbe0a563897 Mon Sep 17 00:00:00 2001 From: mbm Date: Sun, 27 Feb 2005 07:08:08 +0000 Subject: [PATCH 07/16] update diag module git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@295 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../104-drivers_net_diag-mbm.bz2 | Bin 1870 -> 1892 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/linux/kernel-patches/104-drivers_net_diag-mbm.bz2 b/package/linux/kernel-patches/104-drivers_net_diag-mbm.bz2 index 8b7351ca30a4a1d730b3b288fdf84a2a2b9b7c52..1167fc13eca89bc0a1c5857b89136ef516e27bf3 100644 GIT binary patch literal 1892 zcmV-q2b=gpT4*^jL0KkKS%GfJ3;+e{Uw}_Ae}Dh~|G(Z|zyII*U^G{^%W0QCS00QCbv0V+@c00000000^Q z0003Zf&fND^hQlJCzBIInWj@UJef~W@`EOxNPeX8NurU0VVE>QAXy{>8e>CaX|cFO zMgT$J^$gI3K?GQYgcMO#6;MGDh7kUTx1Ss+e%t=n6a|4H6up#Pm2(gHb!^lY3Q48y zrc853hP2XZO(+yJO$Drwp){H%hC#=T>)O^7T>LTY(`KH&qNmw#Xlr5Pc3oC5Mvi7Ccbji8c=u9CWWuq#Ya23)7)?No?8(9n!nSGpg39P$7n8UhlsSBg@$ z4+^JPr!+vKMiT)9u+2XNm+VY*n@C0{)*R(t02O`1T_ssuaSl9uU8bUtwF{NFUM%nxob|CDy$3D2Np&F}9>_2q}_5ERfx#iO8&y^x_ioxI@3Giip_PPF}k7aW~|^ z(@3!>NZRQ}lmo7~BD;E1wOTw0N{L;f$SEX z(x&@gkuvy5_2%hi$I->p5(tqejnxUeyZCY6!x<#yr<)O7Y3m*BtdePmRqPf{;>N(0xucuLJ)ThNsT20p73cTXe!f$ z^DyJ)DV;SL2B2na>q^69tt?R3q|ZqlM3lL7lJ{*pbu*`gHR5i0n_ccDy+l`1`;AQ*v{-V0`k<#26HA#9?H?AZJCKK zL5EINlJyKWXa*>j^igR`HiXC=_|Za}Ckm%T*Wihx0Y}7pf2TbJibzno9s@l_Jdp-0 zae3Fkpr+MuAGj?HP77&KD-mICW^LU-sj>X{5R0_d$Qby;u2SRi5AJZTX4|&K$v8pK zR+aO?B4wnFW_^ek&O<0l9~+>nrI53b<7T*BtTj?(!31=5^fKRd^^PkNZ%tD z+EaB^7@|uNm<#~x1E@Qo9Z?{QPbj@%3dkBs>dCx;!L^7VQqb573uK|NXhGF5k>EKa zFEm;P0Fb2~)rUa|&^-QOSStI6Xv~ag#1EEokOiB8h$76!u$mDN1Xk=4io_sfEK<8H z2Ft<9guOwrUalcpYU5#Dd76UIq@$5yWSC*!Q;N(kxTMk;5k5DCgMr$J=5wSJ@MKz;#wb@2CDBD1$DrK_=9k)-!e$HIP_#u$3^7Z#`^trVh`g?~ z;R*;+t}g;q2`wv18qfn06jfTo@GUr@F`CR$^E60NBt%)RLGq9wmq#1gG=7i}h%6C7 zV2BAEo*rg{tO*eU?QsfV3Y3EsE+Io>N<{%5cs*sTDh3X&jh+xDD((r_%)<7znX5^H z;DVNg&>PMBMlrgO*ahK|$w3-9QQ37|(!)XGvTY+wfo@qffZGNr3enkuHRN;G&#dIcM9B)W!=(yWlpDa1OypE3RuQ~Wpq*M)yON|d z1-|r(5v)kjm=|x)j@O8cLrGhdC?a>oDjJwUxe;O`0ujk{VD3)#{-&+VUCSnd$lBB> zF{?E$q+SOo8Dz#xMkD~Dk)k0-eI+5cm#)mifE3VUpv8n70O{+PvbifnQfw(?3T;4( z2oX+9vIz#g+`)vx(MObsww?h7@<~W2UD~5&gkP=%E{$EEREv#qF_5Z6#xoc|b;1BZ zBsd`ovczjJA-?cRis=x-!bcfNi4wJ53WT6FrgbS4fnm-uwac>vs|qV1PpCmDR36J! zQVc(NsX=t+t*90?2WxC?r@pgL8_UU{(h;p0hBKQ9A@;4HyonwDXlV+=JbF?L(0I~W e1;`9WHkkXzsVInK8X-r+e;0B^I8cy*ZpjQ>PgBPL literal 1870 zcmV-U2eJ4Fh)QGsrrg0l=eu}+Mb$$qiHspfuIA_8UScC83RoYXwjjj z5DG9RngGaXVgS*I(7_o15-1=7WYqOEWD;ymG}Q;DOi}7#9#Hi?5#7$zEn zL=pv>NimFKOl)Wd9`9((&{P^CfPxArq9TF_v}lL;H}lhp59?X;(Iz<7{~liX$Pu*ob)5!Gognke|5ScDN=9 z;w8qes_GdWd^S186SyhWx1{$;rjvtFB$iVAUvZIV@W|Lyc$Uum2AR%Mjann zOzEi1HiI>1SgbhZX<~;OlRtSJgqNT*AXHX+k2&O+dQtiNLvsjvz4jgcKPvaTE_<$x zTF-qs~CG=MQ|*!ZmPC^p)z zOZA1Jk<7Oh60sH*>T2E83Y!`9<{=kujDeSO>y)}aVemQRZo70{$-)kTw6C5C6DN(9 zQz)UjUObX;=|-y=E)upAoh=2rL(dAWHsYIT*%h&<9-89W>^UGWU#h54CfL+j2A1@& zORx^0?tnmOu=AtsP^f{4o>?ab*1$YeuYg*5iv$7Ohr*Z4VeFlFlZYpU@wCe5dx+8w zJCI@wXZjE5FYK`s5BR>)pz(GGtTOOeqR_~wBDdg_RzU+XWR=ak4wekj#ZMJ5kO)oP_OLs0yE zF-$6?N`k0}(WNZk@Ck`hl?4A4O)+z5kwR1*o`%~^&3$D>BK%UQ6dm#pqDdF>gg6$^P`cY(h2^L1h2gwyL-QMGcytMVhY3OS-l07kP(1;gipKU@i2i>=#0hwW}*-* z`3CT8OG2B#ys=kfTZDL*D5)xDp9O$aOmH8lFEB%Fe1ju|D}edR*F#9mig>k0@`t}g;q0$Ucq zYY-TLMOC1B%TAC?W`;r{C=ntqC7|~ZAeTQy%@}@AK!_{Cg1{hzY1PQkb%7!vUA7^$ zB#KfDkh%hd(vd(%mR16(l`t<=ZS8z_gMi;fX)mls!G74BOaNd2JhB3O3+Dh=v zW}u9D5#+kASz(FgvTY+|k~gf{z-@yR2I%r&jWaq38_IHs9#F3$hqr{iOIt z0$PIR(BjBM$qKT=#)T`&4hcvmaVium2;LE(om&={3XsGt{%I5=L?aziyN10hV2y!^ zQuUAF72_i6kntWT^hWfREv!wWg%1(7|fvo*9ZXskl=t-mLo#~94`c@u8|BZBy`G5 zNR_JaR0;!ICsL70Rvg0{T%33%SZrB>eLxbGLHAl!Aj9l7s4pI>+JR+IcDBaad@DAA zz`U9Yff~b5%5z~PKGnDvdPj$&U~d`b*dWyhm`gCY112%1Ke5JAN(l-moOAydaz!{$ IkT8p%IK9PFsQ>@~ -- 2.20.1 From 77dcd848b7f7a75c3532a18bf23a94442a28a53d Mon Sep 17 00:00:00 2001 From: mbm Date: Mon, 28 Feb 2005 07:04:51 +0000 Subject: [PATCH 08/16] bugfixes git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@296 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 7 ++++--- package/openwrt/openwrt.mk | 2 +- target/default/target_skeleton/etc/preinit | 15 +++++++++------ target/jffs2/jffs2root.mk | 3 +-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index b8c9b10b7..e490078bc 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,7 @@ ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y) # along with the packages to build for the target. # ############################################################## -TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils -TARGETS+=openwrt-sstrip linux +TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils linux openwrt include toolchain/Makefile.in include package/Makefile.in @@ -118,7 +117,7 @@ $(TARGET_DIR): fi; -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf - -ln -sf /tmp/resolv.conf $(TARGET_DIR) + -ln -sf /tmp/resolv.conf $(TARGET_DIR)/etc -mkdir -p $(TARGET_DIR)/jffs source: $(TARGETS_SOURCE) @@ -226,3 +225,5 @@ endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y) .PHONY: dummy subdirs release distclean clean config oldconfig \ menuconfig tags check test depend +targets: + @echo $(TARGETS) diff --git a/package/openwrt/openwrt.mk b/package/openwrt/openwrt.mk index dcb4c3334..935fe16e7 100644 --- a/package/openwrt/openwrt.mk +++ b/package/openwrt/openwrt.mk @@ -160,7 +160,7 @@ STRIP=$(OPENWRT_SSTRIP_TARGET) linksys: linksys-shared linksys-nvram linksys-wlconf -openwrt: linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-jffs2root +openwrt: linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-jffs2root openwrt-sstrip openwrt-dirclean: linksys-shared-dirclean linksys-nvram-dirclean linksys-wlconf-dirclean diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit index 28fe80526..30c025be2 100755 --- a/target/default/target_skeleton/etc/preinit +++ b/target/default/target_skeleton/etc/preinit @@ -1,5 +1,6 @@ #!/bin/sh mount none /proc -t proc +mount none /tmp -t ramfs insmod diag echo 0x01 > /proc/sys/diag sleep 1 @@ -7,14 +8,16 @@ if [ $(cat /proc/sys/reset) = 1 ] ; then export FAILSAFE=true while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done & else - mount | grep jffs2 1>&- || { + mount | grep jffs2 >&- + if [ $? = 0 ] && [ $(cat /proc/mtd | wc -l) = 6 ] ; then + jffs2root --move && reboot + else mtd unlock mtd4 mount -t jffs2 /dev/mtdblock/4 /jffs pivot_root /jffs /jffs/rom - } - mount none /dev -t devfs - mount none /proc -t proc - umount rom/proc + mount none /dev -t devfs + mount none /proc -t proc + umount rom/proc + fi fi -mount none /tmp -t ramfs exec /sbin/init diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 8dcd00f57..92dad0e57 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -29,8 +29,7 @@ mtd: $(MKFS_JFFS2) ############################################################# jffs2root: mtd - #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true; - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; + -@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 \ -- 2.20.1 From 469f2ce1658f1509a8ea72e967d3ebed3fac7515 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 1 Mar 2005 06:56:22 +0000 Subject: [PATCH 09/16] bugfix git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@297 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/default/target_skeleton/etc/preinit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit index 30c025be2..01df20583 100755 --- a/target/default/target_skeleton/etc/preinit +++ b/target/default/target_skeleton/etc/preinit @@ -1,6 +1,5 @@ #!/bin/sh mount none /proc -t proc -mount none /tmp -t ramfs insmod diag echo 0x01 > /proc/sys/diag sleep 1 @@ -17,7 +16,8 @@ else pivot_root /jffs /jffs/rom mount none /dev -t devfs mount none /proc -t proc - umount rom/proc + umount rom/proc rom/dev fi fi +mount none /tmp -t ramfs exec /sbin/init -- 2.20.1 From 2ffb3bf75b770464a0f2d97d3fdcd0ea5f1fddb4 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 1 Mar 2005 07:05:19 +0000 Subject: [PATCH 10/16] typo git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@298 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/openwrt/openwrt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openwrt/openwrt.mk b/package/openwrt/openwrt.mk index 935fe16e7..765f511d6 100644 --- a/package/openwrt/openwrt.mk +++ b/package/openwrt/openwrt.mk @@ -156,7 +156,7 @@ openwrt-sstrip: $(OPENWRT_SSTRIP_TARGET) openwrt-sstrip-clean: rm $(OPENWRT_SSTRIP_TARGET) -STRIP=$(OPENWRT_SSTRIP_TARGET) +SSTRIP=$(OPENWRT_SSTRIP_TARGET) linksys: linksys-shared linksys-nvram linksys-wlconf -- 2.20.1 From e4bd2b703975f2c1d48cfab6154b16e27983c6c5 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 1 Mar 2005 09:10:15 +0000 Subject: [PATCH 11/16] Add MPPE/MPPC kernel module git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@299 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/kernel-patches/303-mppe-mppc.bz2 | Bin 0 -> 13262 bytes package/linux/linux.config | 25 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 package/linux/kernel-patches/303-mppe-mppc.bz2 diff --git a/package/linux/kernel-patches/303-mppe-mppc.bz2 b/package/linux/kernel-patches/303-mppe-mppc.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..0ad769211477be86bd850b2b6d0b9159e2b18ec2 GIT binary patch literal 13262 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 Date: Wed, 2 Mar 2005 01:28:40 +0000 Subject: [PATCH 12/16] Add hardware details for WRT54G v1.1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@300 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- docs/hardware/linksys/wrt54g_v11/cpuinfo.txt | 16 ++++ .../linksys/wrt54g_v11/dmesg-2_4_29.txt | 96 +++++++++++++++++++ docs/hardware/linksys/wrt54g_v11/ifconfig.txt | 54 +++++++++++ docs/hardware/linksys/wrt54g_v11/info.txt | 23 +++++ docs/hardware/linksys/wrt54g_v11/lspci-vv.txt | 92 ++++++++++++++++++ docs/hardware/linksys/wrt54g_v11/nvram.txt | 88 +++++++++++++++++ docs/hardware/linksys/wrt54g_v11/pci.txt | 56 +++++++++++ 7 files changed, 425 insertions(+) create mode 100644 docs/hardware/linksys/wrt54g_v11/cpuinfo.txt create mode 100644 docs/hardware/linksys/wrt54g_v11/dmesg-2_4_29.txt create mode 100644 docs/hardware/linksys/wrt54g_v11/ifconfig.txt create mode 100644 docs/hardware/linksys/wrt54g_v11/info.txt create mode 100644 docs/hardware/linksys/wrt54g_v11/lspci-vv.txt create mode 100644 docs/hardware/linksys/wrt54g_v11/nvram.txt create mode 100644 docs/hardware/linksys/wrt54g_v11/pci.txt diff --git a/docs/hardware/linksys/wrt54g_v11/cpuinfo.txt b/docs/hardware/linksys/wrt54g_v11/cpuinfo.txt new file mode 100644 index 000000000..b3cfcfb0b --- /dev/null +++ b/docs/hardware/linksys/wrt54g_v11/cpuinfo.txt @@ -0,0 +1,16 @@ +system type : Broadcom BCM947XX +processor : 0 +cpu model : BCM4710 V0.0 +BogoMIPS : 82.94 +wait instruction : no +microsecond timers : yes +tlb_entries : 32 +extra interrupt vector : no +hardware watchpoint : no +VCED exceptions : not available +VCEI exceptions : not available +dcache hits : 2866936757 +dcache misses : 57830034 +icache hits : 1724839356 +icache misses : 431170605 +instructions : 2156850242 diff --git a/docs/hardware/linksys/wrt54g_v11/dmesg-2_4_29.txt b/docs/hardware/linksys/wrt54g_v11/dmesg-2_4_29.txt new file mode 100644 index 000000000..58e5ce54c --- /dev/null +++ b/docs/hardware/linksys/wrt54g_v11/dmesg-2_4_29.txt @@ -0,0 +1,96 @@ +CPU revision is: 00024000 +Primary instruction cache 8kB, physically tagged, 2-way, linesize 16 bytes. +Primary data cache 4kB, 2-way, linesize 16 bytes. +Linux version 2.4.29 (nthill@mr-grey) (gcc version 3.3.5) #1 Tue Mar 1 19:49:53 CET 2005 +Determined physical RAM map: + memory: 01000000 @ 00000000 (usable) +On node 0 totalpages: 4096 +zone(0): 4096 pages. +zone(1): 0 pages. +zone(2): 0 pages. +Kernel command line: root=/dev/mtdblock2 rootfstype=squashfs init=/etc/preinit noinitrd console=ttyS0,115200 +CPU: BCM4710 rev 0 at 125 MHz +Using 62.400 MHz high precision timer. +!unable to setup serial console! +Calibrating delay loop... 82.94 BogoMIPS +Memory: 14044k/16384k available (1485k kernel code, 2340k reserved, 100k data, 100k init, 0k highmem) +Dentry cache hash table entries: 2048 (order: 2, 16384 bytes) +Inode cache hash table entries: 1024 (order: 1, 8192 bytes) +Mount cache hash table entries: 512 (order: 0, 4096 bytes) +Buffer cache hash table entries: 1024 (order: 0, 4096 bytes) +Page-cache hash table entries: 4096 (order: 2, 16384 bytes) +Checking for 'wait' instruction... unavailable. +POSIX conformance testing by UNIFIX +PCI: Fixing up bus 0 +PCI: Fixing up bridge +PCI: Setting latency timer of device 01:00.0 to 64 +PCI: Fixing up bus 1 +Linux NET4.0 for Linux 2.4 +Based upon Swansea University Computer Society NET3.039 +Initializing RT netlink socket +Starting kswapd +devfs: v1.12c (20020818) Richard Gooch (rgooch@atnf.csiro.au) +devfs: boot_options: 0x1 +JFFS2 version 2.1. (C) 2001 Red Hat, Inc., designed by Axis Communications AB. +Squashfs 2.1-r2 (released 2004/12/15) (C) 2002-2004 Phillip Lougher +pty: 256 Unix98 ptys configured +Serial driver version 5.05c (2001-07-08) with MANY_PORTS SHARE_IRQ SERIAL_PCI enabled +Software Watchdog Timer: 0.05, timer margin: 60 sec +loop: loaded (max 8 devices) +PPP generic driver version 2.4.2 + Amd/Fujitsu Extended Query Table v1.1 at 0x0040 +Physically mapped flash: Swapping erase regions for broken CFI table. +number of CFI chips: 1 +cfi_cmdset_0002: Disabling fast programming due to code brokenness. +Flash device: 0x400000 at 0x1fc00000 +Creating 5 MTD partitions on "Physically mapped flash": +0x00000000-0x00040000 : "pmon" +0x00040000-0x003f0000 : "linux" +0x000edd94-0x001fd000 : "rootfs" +mtd: partition "rootfs" doesn't start on an erase block boundary -- force read-only +0x003f0000-0x00400000 : "nvram" +0x00200000-0x003f0000 : "OpenWrt" +sflash: chipcommon not found +Initializing Cryptographic API +NET4: Linux TCP/IP 1.0 for NET4.0 +IP Protocols: ICMP, UDP, TCP, IGMP +IP: routing cache hash table of 512 buckets, 4Kbytes +TCP: Hash tables configured (established 1024 bind 2048) +ip_conntrack version 2.1 (128 buckets, 1024 max) - 288 bytes per conntrack +ip_tables: (C) 2000-2002 Netfilter core team +NET4: Unix domain sockets 1.0/SMP for Linux NET4.0. +NET4: Ethernet Bridge 008 for NET4.0 +Bridge firewalling registered +802.1Q VLAN Support v1.8 Ben Greear +All bugs added by David S. Miller +VFS: Mounted root (squashfs filesystem) readonly. +Mounted devfs on /dev +Freeing unused kernel memory: 100k freed +Warning: unable to open an initial console. +Algorithmics/MIPS FPU Emulator v1.5 +diag boardtype: 0000041a +using v1 hardware +jffs2.bbc: SIZE compression mode activated. +PCI: Setting latency timer of device 00:02.0 to 64 +5325E phy=FFFFFFFF +eth0: Broadcom BCM47xx 10/100 Mbps Ethernet Controller 3.60.13.0 +PCI: Setting latency timer of device 00:08.0 to 64 +5325E phy=FFFFFFFF +eth1: Broadcom BCM47xx 10/100 Mbps Ethernet Controller 3.60.13.0 +PCI: Setting latency timer of device 01:08.0 to 64 +PCI: Enabling device 01:08.0 (0004 -> 0006) +eth2: Broadcom BCM4320 802.11 Wireless Controller 3.60.13.0 +device eth0 entered promiscuous mode +vlan2: add 01:00:5e:00:00:01 mcast address to master interface +device eth1 entered promiscuous mode +device eth2 entered promiscuous mode +br0: port 3(eth2) entering learning state +br0: port 2(eth1) entering learning state +br0: port 1(vlan2) entering learning state +br0: port 3(eth2) entering forwarding state +br0: topology change detected, propagating +br0: port 2(eth1) entering forwarding state +br0: topology change detected, propagating +br0: port 1(vlan2) entering forwarding state +br0: topology change detected, propagating +vlan1: add 01:00:5e:00:00:01 mcast address to master interface diff --git a/docs/hardware/linksys/wrt54g_v11/ifconfig.txt b/docs/hardware/linksys/wrt54g_v11/ifconfig.txt new file mode 100644 index 000000000..a47a11b70 --- /dev/null +++ b/docs/hardware/linksys/wrt54g_v11/ifconfig.txt @@ -0,0 +1,54 @@ +br0 Link encap:Ethernet HWaddr 00:0C:41:B3:3C:55 + inet addr:192.168.1.1 Bcast:192.168.1.255 Mask:255.255.255.0 + UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 + RX packets:6022 errors:0 dropped:0 overruns:0 frame:0 + TX packets:5768 errors:0 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:0 + RX bytes:356276 (347.9 KiB) TX bytes:457411 (446.6 KiB) + +eth0 Link encap:Ethernet HWaddr 00:0C:41:B3:3C:55 + UP BROADCAST RUNNING PROMISC MULTICAST MTU:1500 Metric:1 + RX packets:6204 errors:0 dropped:0 overruns:0 frame:0 + TX packets:5774 errors:0 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:1000 + RX bytes:514297 (502.2 KiB) TX bytes:484047 (472.7 KiB) + Interrupt:3 Base address:0x2000 + +eth1 Link encap:Ethernet HWaddr 00:0C:41:B3:3C:56 + UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 + RX packets:0 errors:0 dropped:0 overruns:0 frame:0 + TX packets:66 errors:0 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:1000 + RX bytes:0 (0.0 B) TX bytes:7209 (7.0 KiB) + Interrupt:4 Base address:0x8000 + +eth2 Link encap:Ethernet HWaddr 00:0C:41:B3:3C:57 + UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 + RX packets:0 errors:0 dropped:0 overruns:0 frame:2202 + TX packets:93 errors:36 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:1000 + RX bytes:0 (0.0 B) TX bytes:11951 (11.6 KiB) + Interrupt:6 Base address:0x2000 + +lo Link encap:Local Loopback + inet addr:127.0.0.1 Mask:255.0.0.0 + UP LOOPBACK RUNNING MTU:16436 Metric:1 + RX packets:0 errors:0 dropped:0 overruns:0 frame:0 + TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:0 + RX bytes:0 (0.0 B) TX bytes:0 (0.0 B) + +vlan1 Link encap:Ethernet HWaddr 00:0C:41:B3:3C:55 + UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 + RX packets:181 errors:0 dropped:0 overruns:0 frame:0 + TX packets:6 errors:0 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:0 + RX bytes:19634 (19.1 KiB) TX bytes:3564 (3.4 KiB) + +vlan2 Link encap:Ethernet HWaddr 00:0C:41:B3:3C:55 + UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 + RX packets:6023 errors:0 dropped:0 overruns:0 frame:0 + TX packets:5768 errors:0 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:0 + RX bytes:382991 (374.0 KiB) TX bytes:480483 (469.2 KiB) + diff --git a/docs/hardware/linksys/wrt54g_v11/info.txt b/docs/hardware/linksys/wrt54g_v11/info.txt new file mode 100644 index 000000000..2bd458d16 --- /dev/null +++ b/docs/hardware/linksys/wrt54g_v11/info.txt @@ -0,0 +1,23 @@ +Linksys WRT54G v1.1 + +Online Description from Linksys: +http://www.linksys.com/products/product.asp?grid=33&scid=35&prid=601 + +CPU: BCM4710 at 125 MHz +RAM: 16 MB +Flash: 4 MB (AMD AM29LV320DT 2 M x 16-Bit) +1 Broadcom BCM47xx 10/100 Mbps Ethernet Controller +1 Broadcom BCM4320 802.11 Wireless Controller +1 Infineon-ADMtek ADM6996L 5-ports Ethernet swith +serial port possible (but not used) +JTAG interface available (but not used) + +List of files: +nvram.txt: contents of NVRAM after 'mtd erase' and OpenWRT upgrade +cpuinfo.txt: contents of /proc/cpuinfo (2.4.29) +pci.txt: contents of /proc/pci (2.4.29) +dmesg-2_4_29.txt: dmesg from Kernel 2.4.29 +lspci-vv.txt: output of lspci -vv -P ./proc/bus/pci (deported) + +-- +Nico diff --git a/docs/hardware/linksys/wrt54g_v11/lspci-vv.txt b/docs/hardware/linksys/wrt54g_v11/lspci-vv.txt new file mode 100644 index 000000000..d58a02b25 --- /dev/null +++ b/docs/hardware/linksys/wrt54g_v11/lspci-vv.txt @@ -0,0 +1,92 @@ +0000:00:00.0 RAM memory: Broadcom Corporation: Unknown device 0803 + Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- (32-bit, non-prefetchable) [disabled] [size=128M] + Region 2: Memory at 10000000 (32-bit, non-prefetchable) [disabled] [size=128M] + Region 3: Memory at 80000000 (32-bit, non-prefetchable) [disabled] [size=80000000] + Expansion ROM at [disabled] [size=2K] + +0000:00:01.0 Ethernet controller: Broadcom Corporation BCM47xx Sentry5 iLine32 HomePNA 2.0 + Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- [disabled] [size=2K] + +0000:00:02.0 Ethernet controller: Broadcom Corporation Sentry5 Ethernet Controller + Control: I/O- Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- [disabled] [size=2K] + +0000:00:03.0 Modem: Broadcom Corporation Sentry5 UART (prog-if 00 [Generic]) + Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- [disabled] [size=2K] + +0000:00:04.0 USB Controller: Broadcom Corporation Sentry5 USB Controller (prog-if 10 [OHCI]) + Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- [disabled] [size=2K] + +0000:00:05.0 PCI bridge: Broadcom Corporation Sentry5 PCI Bridge (prog-if 00 [Normal decode]) + Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap+ 66MHz+ UDF+ FastB2B+ ParErr+ DEVSEL=?? >TAbort+ SERR+ [disabled] [size=2K] + BridgeCtl: Parity- SERR- NoISA- VGA- MAbort- >Reset- FastB2B- + +0000:00:06.0 MIPS: Broadcom Corporation Sentry5 MIPS32 CPU + Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- [disabled] [size=2K] + +0000:00:07.0 FLASH memory: Broadcom Corporation Sentry5 External Interface Core + Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- [disabled] [size=2K] + +0000:00:08.0 Ethernet controller: Broadcom Corporation Sentry5 Ethernet Controller + Control: I/O- Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- [disabled] [size=2K] + +0000:01:00.0 Host bridge: Broadcom Corporation BCM4710 Sentry5 PCI to SB Bridge (rev 01) + Subsystem: Broadcom Corporation BCM4710 Sentry5 PCI to SB Bridge + Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- (32-bit, prefetchable) [size=128M] + +0000:01:08.0 Network controller: Broadcom Corporation BCM4306 802.11b/g Wireless LAN Controller (rev 03) + Subsystem: Tekram Technology Co.,Ltd.: Unknown device 1603 + Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- + Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- Date: Thu, 3 Mar 2005 02:44:10 +0000 Subject: [PATCH 13/16] 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 --- Makefile | 7 --- .../600-linux-squashfs-lzma.bz2 | Bin package/linux/linux.config | 2 +- package/linux/linux.mk | 14 +---- package/openwrt/trx.c | 14 ++++- scripts/configtest.pl | 11 ---- target/Config.in | 1 - target/Makefile.in | 3 +- target/jffs2/blocksize.mk | 1 + target/jffs2/jffs2root.mk | 4 +- target/squashfs/Config.in | 5 -- target/squashfs/squashfsroot.mk | 54 ------------------ 12 files changed, 22 insertions(+), 94 deletions(-) rename target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 => package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 (100%) delete mode 100755 scripts/configtest.pl create mode 100644 target/jffs2/blocksize.mk delete mode 100644 target/squashfs/Config.in delete mode 100644 target/squashfs/squashfsroot.mk diff --git a/Makefile b/Makefile index e490078bc..bc69f2a1d 100644 --- a/Makefile +++ b/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/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 b/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 similarity index 100% rename from target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 rename to package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 diff --git a/package/linux/linux.config b/package/linux/linux.config index de477721a..761906ae5 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 bead2226a..6e3f7a4d2 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 d4ad60037..79a04026e 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 { diff --git a/scripts/configtest.pl b/scripts/configtest.pl deleted file mode 100755 index 61fe8a7b6..000000000 --- a/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/target/Config.in b/target/Config.in index 36616f07b..1a997da2a 100644 --- a/target/Config.in +++ b/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/target/Makefile.in b/target/Makefile.in index 15cf6bded..22cd7a420 100644 --- a/target/Makefile.in +++ b/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/target/jffs2/blocksize.mk b/target/jffs2/blocksize.mk new file mode 100644 index 000000000..9e08a0497 --- /dev/null +++ b/target/jffs2/blocksize.mk @@ -0,0 +1 @@ +JFFS2_BLOCK_SIZE:=0x20000 diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 92dad0e57..9846d001f 100644 --- a/target/jffs2/jffs2root.mk +++ b/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/target/squashfs/Config.in b/target/squashfs/Config.in deleted file mode 100644 index 6f1d709d5..000000000 --- a/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/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk deleted file mode 100644 index d3a104a83..000000000 --- a/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 -- 2.20.1 From 31e8413d2039597ea052e4973add59a6b135b7f0 Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 3 Mar 2005 23:28:13 +0000 Subject: [PATCH 14/16] fix binutils alignment issue git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@302 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../binutils/2.14.90.0.8/002-max-pagesize.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 toolchain/binutils/2.14.90.0.8/002-max-pagesize.patch diff --git a/toolchain/binutils/2.14.90.0.8/002-max-pagesize.patch b/toolchain/binutils/2.14.90.0.8/002-max-pagesize.patch new file mode 100644 index 000000000..a8ae110e8 --- /dev/null +++ b/toolchain/binutils/2.14.90.0.8/002-max-pagesize.patch @@ -0,0 +1,12 @@ +diff -urN binutils-2.14.90.0.8.test/bfd/elf32-mips.c binutils-2.14.90.0.8/bfd/elf32-mips.c +--- binutils-2.14.90.0.8.test/bfd/elf32-mips.c 2004-01-14 22:07:43.000000000 +0100 ++++ binutils-2.14.90.0.8/bfd/elf32-mips.c 2005-03-03 23:44:00.000000000 +0100 +@@ -1611,7 +1611,7 @@ + + /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses + page sizes of up to that limit, so we need to respect it. */ +-#define ELF_MAXPAGESIZE 0x10000 ++#define ELF_MAXPAGESIZE 0x1000 + #define elf32_bed elf32_tradbed + + /* Include the target file again for this target. */ -- 2.20.1 From 0a28aa018879ac7dfcf09710f8651100da8fbbf4 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Mar 2005 04:35:15 +0000 Subject: [PATCH 15/16] fix the jffs2 build for separate 4M/8M images git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@303 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 1 + target/Makefile.in | 20 ++++++++++---------- target/jffs2/blocksize.mk | 1 - target/jffs2/jffs2root.mk | 10 +++++++--- target/squashfs-lzma/squashfslzmaroot.mk | 9 ++++++++- 5 files changed, 26 insertions(+), 15 deletions(-) delete mode 100644 target/jffs2/blocksize.mk diff --git a/Makefile b/Makefile index bc69f2a1d..ae8e59fbe 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS)) TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS)) world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS) + @echo DONE. .PHONY: all world clean dirclean distclean source $(TARGETS) \ $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \ diff --git a/target/Makefile.in b/target/Makefile.in index 22cd7a420..aeceb3c14 100644 --- a/target/Makefile.in +++ b/target/Makefile.in @@ -1,5 +1,6 @@ # Default target skeleton stuff, may be overridden -EXTRAVERSION= +EXTRAVERSION:= +XXX:= TARGET_SKELETON=target/default/skel.tar.gz TARGET_SKEL_DIR=target/default/target_skeleton @@ -10,19 +11,18 @@ include target/jffs2/blocksize.mk JFFS2FLAGS+=-a $(JFFS2_BLOCK_SIZE) endif - openwrt-linux.trx: openwrt-trx - PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ + @PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS) -openwrt-gs-code.bin: openwrt-addpattern openwrt-linux.trx - PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \ - -o openwrt-gs-code$(EXTRAVERSION).bin -g - -openwrt-g-code.bin: openwrt-gs-code.bin - sed -e "1s,^W54S,W54G," < openwrt-gs-code$(EXTRAVERSION).bin > openwrt-g-code$(EXTRAVERSION).bin +openwrt-code.bin: openwrt-addpattern openwrt-linux.trx + @PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \ + -o openwrt-$(TAG)-code$(EXTRAVERSION).bin -g + @sed -i -e "1s,^W54S,$(TAG)," openwrt-$(TAG)-code$(EXTRAVERSION).bin -openwrt-image: openwrt openwrt-g-code.bin +ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) +else +endif openwrt-image-clean: @-rm openwrt-* 2>/dev/null diff --git a/target/jffs2/blocksize.mk b/target/jffs2/blocksize.mk deleted file mode 100644 index 9e08a0497..000000000 --- a/target/jffs2/blocksize.mk +++ /dev/null @@ -1 +0,0 @@ -JFFS2_BLOCK_SIZE:=0x20000 diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 9846d001f..b14f2d0f7 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -4,8 +4,6 @@ # ############################################################# -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 @@ -46,6 +44,12 @@ jffs2root-dirclean: rm -rf $(MTD_DIR) ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -TARGETS+=jffs2root openwrt-image +TARGETS+=openwrt-image ROOTFS=jffs2 + +openwrt-image: openwrt + @make jffs2root openwrt-code.bin TAG=W54G \ + EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000 + @make jffs2root openwrt-code.bin TAG=W54S \ + EXTRAVERSION=$(EXTRAVERSION)-JFFS2-8M JFFS2_BLOCK_SIZE=0x20000 endif diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk index 722c20524..1aa80e002 100644 --- a/target/squashfs-lzma/squashfslzmaroot.mk +++ b/target/squashfs-lzma/squashfslzmaroot.mk @@ -39,7 +39,8 @@ squashfslzma-dirclean: squashfslzmaroot: squashfslzma @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info - $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le + $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma \ + $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le squashfslzmaroot-source: squashfslzma-source @@ -52,4 +53,10 @@ squashfslzmaroot-dirclean: ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS_LZMA)),y) TARGETS+=squashfslzmaroot openwrt-image ROOTFS=squashfslzma + +openwrt-image: openwrt + @make openwrt-code.bin TAG=W54G \ + EXTRAVERSION=$(EXTRAVERSION)-SQUASHFSLZMA + @make openwrt-code.bin TAG=W54S \ + EXTRAVERSION=$(EXTRAVERSION)-SQUASHFSLZMA endif -- 2.20.1 From febbb945a927bfbdd74349a6a2b2a2fadfc0e169 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Mar 2005 04:43:26 +0000 Subject: [PATCH 16/16] cleanup git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@304 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/Makefile.in | 16 +++------------- target/jffs2/jffs2root.mk | 1 + 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/target/Makefile.in b/target/Makefile.in index aeceb3c14..d40fd158d 100644 --- a/target/Makefile.in +++ b/target/Makefile.in @@ -1,28 +1,18 @@ # Default target skeleton stuff, may be overridden EXTRAVERSION:= -XXX:= TARGET_SKELETON=target/default/skel.tar.gz TARGET_SKEL_DIR=target/default/target_skeleton include target/device/Makefile.in -ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -include target/jffs2/blocksize.mk -JFFS2FLAGS+=-a $(JFFS2_BLOCK_SIZE) -endif - openwrt-linux.trx: openwrt-trx - @PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ + PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS) openwrt-code.bin: openwrt-addpattern openwrt-linux.trx - @PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \ + PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \ -o openwrt-$(TAG)-code$(EXTRAVERSION).bin -g - @sed -i -e "1s,^W54S,$(TAG)," openwrt-$(TAG)-code$(EXTRAVERSION).bin - -ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -else -endif + @$(SED) "1s,^W54S,$(TAG)," openwrt-$(TAG)-code$(EXTRAVERSION).bin openwrt-image-clean: @-rm openwrt-* 2>/dev/null diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index b14f2d0f7..5e9380821 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -46,6 +46,7 @@ jffs2root-dirclean: ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) TARGETS+=openwrt-image ROOTFS=jffs2 +JFFS2FLAGS=-a $(JFFS2_BLOCK_SIZE) openwrt-image: openwrt @make jffs2root openwrt-code.bin TAG=W54G \ -- 2.20.1