Mercurial > hg > aboriginal

comparison sources/functions.sh @ 1631:18cafed76d65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ext2/ext3 build failures
author Guenter Roeck <linux@roeck-us.net>
date Thu, 03 Oct 2013 15:06:01 -0500
parents 57ed3f0570a4
children b89324905ca2
comparison
equal deleted inserted replaced
1630:dd94f87b89ae 1631:18cafed76d65
403 # Produce a filesystem with the currently used space plus 20% for filesystem 403 # Produce a filesystem with the currently used space plus 20% for filesystem
404 # overhead, which should always be big enough. 404 # overhead, which should always be big enough.
405 405
406 BLOCKS=$[1024*(($(du -m -s "$1" | awk '{print $1}')*12)/10)] 406 BLOCKS=$[1024*(($(du -m -s "$1" | awk '{print $1}')*12)/10)]
407 [ $BLOCKS -lt 4096 ] && BLOCKS=4096 407 [ $BLOCKS -lt 4096 ] && BLOCKS=4096
408 FILE="$.$SYSIMAGE_TYPE" 408 FILE="$2.$SYSIMAGE_TYPE"
409 409
410 echo "/dev d 755 0 0 - - - - -" > "$WORK/devs" && 410 echo "/dev d 755 0 0 - - - - -" > "$WORK/devs" &&
411 echo "/dev/console c 640 0 0 5 1 0 0 -" >> "$WORK/devs" && 411 echo "/dev/console c 640 0 0 5 1 0 0 -" >> "$WORK/devs" &&
412 genext2fs -z -D "$WORK/devs" -d "$1" -b $BLOCKS -i 1024 "$FILE" && 412 genext2fs -z -D "$WORK/devs" -d "$1" -b $BLOCKS -i 1024 "$FILE" &&
413 rm "$WORK/devs" || dienow 413 rm "$WORK/devs" || dienow
421 then 421 then
422 echo resizing image to $SYSIMAGE_HDA_MEGS 422 echo resizing image to $SYSIMAGE_HDA_MEGS
423 resize2fs "$FILE" ${SYSIMAGE_HDA_MEGS}M || dienow 423 resize2fs "$FILE" ${SYSIMAGE_HDA_MEGS}M || dienow
424 fi 424 fi
425 425
426 tune2fs -c 0 -i 0 $([$SYS_IMAGE_TYPE == ext3] && echo -j) "$FILE" || dienow 426 tune2fs -c 0 -i 0 $([ "$SYS_IMAGE_TYPE" = "ext3" ] && echo -j) "$FILE" || dienow
427 echo $SYSIMAGE_TYPE generated 427 echo $SYSIMAGE_TYPE generated
428 428
429 elif [ "$SYSIMAGE_TYPE" == "squashfs" ] 429 elif [ "$SYSIMAGE_TYPE" == "squashfs" ]
430 then 430 then
431 mksquashfs "$1" "$2.sqf" -noappend -all-root \ 431 mksquashfs "$1" "$2.sqf" -noappend -all-root \