mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 00:14:05 +02:00
bugfixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@296 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
2ef3e0006a
commit
77dcd848b7
7
Makefile
7
Makefile
@ -48,8 +48,7 @@ ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
|
|||||||
# along with the packages to build for the target.
|
# along with the packages to build for the target.
|
||||||
#
|
#
|
||||||
##############################################################
|
##############################################################
|
||||||
TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils
|
TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils linux openwrt
|
||||||
TARGETS+=openwrt-sstrip linux
|
|
||||||
|
|
||||||
include toolchain/Makefile.in
|
include toolchain/Makefile.in
|
||||||
include package/Makefile.in
|
include package/Makefile.in
|
||||||
@ -118,7 +117,7 @@ $(TARGET_DIR):
|
|||||||
fi;
|
fi;
|
||||||
-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
|
-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
|
||||||
-find $(TARGET_DIR) -type d -name .svn | 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
|
-mkdir -p $(TARGET_DIR)/jffs
|
||||||
|
|
||||||
source: $(TARGETS_SOURCE)
|
source: $(TARGETS_SOURCE)
|
||||||
@ -226,3 +225,5 @@ endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
|
|||||||
.PHONY: dummy subdirs release distclean clean config oldconfig \
|
.PHONY: dummy subdirs release distclean clean config oldconfig \
|
||||||
menuconfig tags check test depend
|
menuconfig tags check test depend
|
||||||
|
|
||||||
|
targets:
|
||||||
|
@echo $(TARGETS)
|
||||||
|
@ -160,7 +160,7 @@ STRIP=$(OPENWRT_SSTRIP_TARGET)
|
|||||||
|
|
||||||
linksys: linksys-shared linksys-nvram linksys-wlconf
|
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
|
openwrt-dirclean: linksys-shared-dirclean linksys-nvram-dirclean linksys-wlconf-dirclean
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
mount none /proc -t proc
|
mount none /proc -t proc
|
||||||
|
mount none /tmp -t ramfs
|
||||||
insmod diag
|
insmod diag
|
||||||
echo 0x01 > /proc/sys/diag
|
echo 0x01 > /proc/sys/diag
|
||||||
sleep 1
|
sleep 1
|
||||||
@ -7,14 +8,16 @@ if [ $(cat /proc/sys/reset) = 1 ] ; then
|
|||||||
export FAILSAFE=true
|
export FAILSAFE=true
|
||||||
while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
|
while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
|
||||||
else
|
else
|
||||||
mount | grep jffs2 1>&- || {
|
mount | grep jffs2 >&-
|
||||||
|
if [ $? = 0 ] && [ $(cat /proc/mtd | wc -l) = 6 ] ; then
|
||||||
|
jffs2root --move && reboot
|
||||||
|
else
|
||||||
mtd unlock mtd4
|
mtd unlock mtd4
|
||||||
mount -t jffs2 /dev/mtdblock/4 /jffs
|
mount -t jffs2 /dev/mtdblock/4 /jffs
|
||||||
pivot_root /jffs /jffs/rom
|
pivot_root /jffs /jffs/rom
|
||||||
}
|
mount none /dev -t devfs
|
||||||
mount none /dev -t devfs
|
mount none /proc -t proc
|
||||||
mount none /proc -t proc
|
umount rom/proc
|
||||||
umount rom/proc
|
fi
|
||||||
fi
|
fi
|
||||||
mount none /tmp -t ramfs
|
|
||||||
exec /sbin/init
|
exec /sbin/init
|
||||||
|
@ -29,8 +29,7 @@ mtd: $(MKFS_JFFS2)
|
|||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
jffs2root: mtd
|
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 $(SSTRIP) 2>/dev/null || true;
|
||||||
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
|
|
||||||
@rm -rf $(TARGET_DIR)/usr/man
|
@rm -rf $(TARGET_DIR)/usr/man
|
||||||
@rm -rf $(TARGET_DIR)/usr/info
|
@rm -rf $(TARGET_DIR)/usr/info
|
||||||
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
|
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
|
||||||
|
Loading…
Reference in New Issue
Block a user