diff --git a/Makefile b/Makefile index 39c536f..24dd97e 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,11 @@ BIN = bin all: packages dist: ctf-install.zip -ctf-install.zip: packages.zip /usr/lib/syslinux/mbr.bin - zip --junk-paths $@ packages.zip /usr/lib/syslinux/mbr.bin install.sh +ctf-install.zip: packages.zip bzImage rootfs.squashfs /usr/lib/syslinux/mbr.bin + zip --junk-paths $@ packages.zip bzImage rootfs.squashfs /usr/lib/syslinux/mbr.bin install.sh -packages.zip: packages bzImage rootfs.squashfs - zip --junk-paths $@ bin/*.pkg bzImage rootfs.squashfs +packages.zip: packages + zip --junk-paths $@ bin/*.pkg clean: packages-clean rm -rf $(BUILD) $(TARGET) $(BIN) diff --git a/install.sh b/install.sh index 8c4e42e..d63c8a0 100755 --- a/install.sh +++ b/install.sh @@ -8,12 +8,14 @@ if ! [ -b "$DRIVE" ]; then exit fi +size=$(sfdisk -s $DRIVE) +fatsize=$(expr $size \* 95 / 100) FATFS=${DRIVE}1 EXTFS=${DRIVE}2 -sfdisk $DRIVE <