diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-02-28 07:04:51 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-02-28 07:04:51 +0000 |
| commit | bec201651bd011a9f7bb56e82ab8eca554ba9d6a (patch) | |
| tree | f88eb18c1f691dddede7c925e5294689cf94f9ce /openwrt | |
| parent | c5e45e2e383ba669b6c8b1ff93145577182aeafa (diff) | |
bugfixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
| -rw-r--r-- | openwrt/Makefile | 7 | ||||
| -rw-r--r-- | openwrt/package/openwrt/openwrt.mk | 2 | ||||
| -rwxr-xr-x | openwrt/target/default/target_skeleton/etc/preinit | 15 | ||||
| -rw-r--r-- | openwrt/target/jffs2/jffs2root.mk | 3 |
4 files changed, 15 insertions, 12 deletions
diff --git a/openwrt/Makefile b/openwrt/Makefile index b8c9b10b7..e490078bc 100644 --- a/openwrt/Makefile +++ b/openwrt/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/openwrt/package/openwrt/openwrt.mk b/openwrt/package/openwrt/openwrt.mk index dcb4c3334..935fe16e7 100644 --- a/openwrt/package/openwrt/openwrt.mk +++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/preinit b/openwrt/target/default/target_skeleton/etc/preinit index 28fe80526..30c025be2 100755 --- a/openwrt/target/default/target_skeleton/etc/preinit +++ b/openwrt/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/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk index 8dcd00f57..92dad0e57 100644 --- a/openwrt/target/jffs2/jffs2root.mk +++ b/openwrt/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 \ |