gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ar71xx: allow WNDR3700 image creation to fail if kernel/rootfs too big

Browse Source 
SVN-Revision: 29431
This commit is contained in:
Gabor Juhos 2011-12-05 12:47:53 +00:00
parent d3d91930d1
commit 8a3a60fc64
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/ar71xx/image/Makefile
View File

@ -384,26 +384,24 @@ define Image/Build/Netgear
if [ `stat -c%s '$(KDIR)/vmlinux-$(2).uImage.squashfs'` -gt \ if [ `stat -c%s '$(KDIR)/vmlinux-$(2).uImage.squashfs'` -gt \
`cat '$(KDIR)/$(2)_kernel_maxsize'` ]; then \ `cat '$(KDIR)/$(2)_kernel_maxsize'` ]; then \
echo "$(KDIR)/vmlinux-$(2).uImage.squashfs is too big" >& 2; \ echo "$(KDIR)/vmlinux-$(2).uImage.squashfs is too big" >& 2; \
false; \ else if [ `stat -c%s '$(KDIR)/root.$(1)'` -gt \
fi
if [ `stat -c%s '$(KDIR)/root.$(1)'` -gt \
`cat '$(KDIR)/$(2)_rootfs_maxsize'` ]; then \ `cat '$(KDIR)/$(2)_rootfs_maxsize'` ]; then \
echo "$(KDIR)/root.$(1) is too big" >& 2; \ echo "$(KDIR)/root.$(1) is too big" >& 2; \
false; \ else \
fi
( \ ( \
set -e; \ set -e; \
dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs \ dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs \
bs=`cat '$(KDIR)/$(2)_kernel_maxsize'` conv=sync; \ bs=`cat '$(KDIR)/$(2)_kernel_maxsize'` conv=sync; \
dd if=$(KDIR)/root.$(1) bs=64k; \ dd if=$(KDIR)/root.$(1) bs=64k; \
) > $(call sysupname,$(1),$(2)) ) > $(call sysupname,$(1),$(2)); \
for r in $(7) ; do \ for r in $(7) ; do \
[ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \ [ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
$(STAGING_DIR_HOST)/bin/mkdniimg \ $(STAGING_DIR_HOST)/bin/mkdniimg \
-B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \ -B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
-i $(call sysupname,$(1),$(2)) \ -i $(call sysupname,$(1),$(2)) \
-o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \ -o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
done done; \
fi; fi
endef endef
define Image/Build/Netgear/initramfs define Image/Build/Netgear/initramfs