###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
###############################################################################
# Installation Details
###############################################################################
-IMGinst := /install/images/$(SNAME)-$(VERSION).2gb-ext2.$(MACHINE)-full-core$(CORE).img
-IMGinsts := /install/images/$(SNAME)-$(VERSION).2gb-ext2-scon.$(MACHINE)-full-core$(CORE).img
+IMGinst := /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(MACHINE)-full-core$(CORE).img
+IMGinsts := /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(MACHINE)-full-core$(CORE).img
MNThdd := /install/harddisk
IMGpart := /install/images/part_area
IMGboot := /install/images/bootfs
-# don't change SIZEboot this without checking Image size
-SIZEboot := 50
IMGroot := /install/images/rootfs
-SIZEroot := 1400
-IMGvar := /install/images/varfs
-SIZEvar := 400
+
+# All sizes in blocks
+ifeq "$(MACHINE_TYPE)" "arm"
+ S_OFFSET = 8192
+
+ # FAT32
+ PART_TYPE = c
+else
+ S_OFFSET = 32
+
+ # Logical
+ PART_TYPE = L
+endif
+
+# /boot: 64MB - OFFSET
+# / : 600MB
+S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
+S_ROOT := 1228800
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) && mkdir -p $(MNThdd)
+ rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) && mkdir -p $(MNThdd)
# Create first 32 sectors of image
- dd bs=1k if=/dev/zero of=$(IMGpart) count=16
+ dd if=/dev/zero of=$(IMGpart) bs=512 count=$(S_OFFSET)
# Create images for filesystems
- dd bs=1K if=/dev/zero of=$(IMGboot) count=51184 # 50MB-16K
- dd bs=1M if=/dev/zero of=$(IMGroot) count=$(SIZEroot)
- dd bs=1M if=/dev/zero of=$(IMGvar) count=$(SIZEvar)
+ dd if=/dev/zero of=$(IMGboot) bs=512 count=$(S_BOOT)
+ dd if=/dev/zero of=$(IMGroot) bs=512 count=$(S_ROOT)
# Format them
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(PART_TYPE)" "c"
mkfs.vfat $(IMGboot)
else
mkfs.ext2 -F $(IMGboot)
endif
- mkfs.ext2 -F $(IMGroot)
- mkfs.ext2 -F $(IMGvar)
+ mkfs.ext4 -O ^has_journal,extent -F $(IMGroot)
+
+ # Most systems that use Flashimages has no RTC at boot
+ # so the interval check should disables
+ tune2fs -i0 $(IMGroot)
# Mount Images
mount -o loop $(IMGroot) $(MNThdd)
mkdir $(MNThdd)/var
mkdir $(MNThdd)/var/log
mount -o loop $(IMGboot) $(MNThdd)/boot
- mount -o loop $(IMGvar) $(MNThdd)/var
# Install MLO and uboot first
ifeq "$(MACHINE_TYPE)" "arm"
cp -v /boot/MLO $(MNThdd)/boot/
- cp -v /boot/u-boot.bin $(MNThdd)/boot/
+ cp -v /boot/u-boot.img $(MNThdd)/boot/
+ cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
sync
umount $(MNThdd)/boot
mount -o loop $(IMGboot) $(MNThdd)/boot
mount --bind /sys $(MNThdd)/sys
chroot $(MNThdd) /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
sed -i -e "s|DEVICE1|UUID=$$(blkid -sUUID $(IMGboot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(PART_TYPE)" "c"
# ARM flash images have a VFAT partition for /boot.
sed -i -e "s|ext2|vfat|" $(MNThdd)/etc/fstab
endif
sed -i -e "s|DEVICE2|#DEVICE2|g" $(MNThdd)/etc/fstab
sed -i -e "s|DEVICE3|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
- sed -i -e "s|DEVICE4|UUID=$$(blkid -sUUID $(IMGvar) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
- sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab
+ sed -i -e "s|DEVICE4|#DEVICE4|g" $(MNThdd)/etc/fstab
+ sed -i -e "s|FSTYPE|ext4|g" $(MNThdd)/etc/fstab
ifneq "$(MACHINE_TYPE)" "arm"
sed -i -e "s|MOUNT|ro|g" $(MNThdd)/boot/grub/grub.conf
ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
# Copy grub files manually
- cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/
+ cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/
endif
# Setup symlink for partresize at first boot...
ln -sf ../init.d/partresize $(MNThdd)/etc/rc.d/rcsysinit.d/S25partresize
# Setup symlink for fsresize at second boot...
- ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S26fsresize
+ ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S42fsresize
# Unmount
umount $(MNThdd)/proc
umount $(MNThdd)/dev
umount $(MNThdd)/sys
umount $(MNThdd)/boot
- umount $(MNThdd)/var
umount $(MNThdd)
# zerofree the ext2 images to get better compression
-ifneq "$(MACHINE_TYPE)" "arm"
+ifneq "$(PART_TYPE)" "c"
zerofree $(IMGboot)
-fsck.ext2 -f -y $(IMGboot)
fsck.ext2 -f -y $(IMGboot)
endif
zerofree $(IMGroot)
- -fsck.ext2 -f -y $(IMGroot)
- fsck.ext2 -f -y $(IMGroot)
- zerofree $(IMGvar)
- -fsck.ext2 -f -y $(IMGvar)
- fsck.ext2 -f -y $(IMGvar)
+ -fsck.ext4 -f -y $(IMGroot)
+ fsck.ext4 -f -y $(IMGroot)
# Cat to an image
- cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinst)
+ cat $(IMGpart) $(IMGboot) $(IMGroot) > $(IMGinst)
# Write Partition table
-ifneq "$(MACHINE_TYPE)" "arm"
- echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \
- | sfdisk -D -uM -H 64 -S 32 $(IMGinst)
-else
- echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \
- | sfdisk -D -uM -H 64 -S 32 $(IMGinst)
-endif
+ echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n,0,0\n" \
+ | sfdisk -D -uS -H 64 -S 32 $(IMGinst)
ifneq "$(MACHINE_TYPE)" "arm"
# Install grub
sed -i -e "s|#serial|serial|g" $(MNThdd)/boot/grub/grub.conf
sed -i -e "s|#terminal|terminal|g" $(MNThdd)/boot/grub/grub.conf
sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" $(MNThdd)/boot/grub/grub.conf
+else
+ sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
+ sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/boot.script
+ cd $(MNThdd)/boot && ./convert_bootscript
endif
sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab
umount $(MNThdd)
# zerofree the ext3 images to get better compression
-ifneq "$(MACHINE_TYPE)" "arm"
+ifneq "$(PART_TYPE)" "c"
zerofree $(IMGboot)
-fsck.ext2 -f -y $(IMGboot)
fsck.ext2 -f -y $(IMGboot)
endif
zerofree $(IMGroot)
- -fsck.ext2 -f -y $(IMGroot)
- fsck.ext2 -f -y $(IMGroot)
- zerofree $(IMGvar)
- -fsck.ext2 -f -y $(IMGvar)
- fsck.ext2 -f -y $(IMGvar)
+ -fsck.ext4 -f -y $(IMGroot)
+ fsck.ext4 -f -y $(IMGroot)
# Cat to an image
- cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinsts)
- rm -vf $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar)
+ cat $(IMGpart) $(IMGboot) $(IMGroot) > $(IMGinsts)
+ rm -vf $(IMGpart) $(IMGboot) $(IMGroot)
# Write Partition table
-ifneq "$(MACHINE_TYPE)" "arm"
- echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \
- | sfdisk -D -uM -H 64 -S 32 $(IMGinsts)
-else
- echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \
- | sfdisk -D -uM -H 64 -S 32 $(IMGinsts)
-endif
+ echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n,0,0\n" \
+ | sfdisk -D -uS -H 64 -S 32 $(IMGinsts)
ifneq "$(MACHINE_TYPE)" "arm"
# Install grub
# Compress Image
gzip -f9 $(IMGinsts)
- rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar)
+ rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot)