###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2018 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 #
PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
ifeq "$(SCON)" "1"
- IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(MACHINE)-full-core$(CORE).img.gz
+ IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4-scon.$(BUILD_ARCH)-full-core$(CORE).img.gz
else
- IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(MACHINE)-full-core$(CORE).img.gz
+ IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
endif
FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
IMG := /install/images/image.img
# All sizes in blocks
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
BOOTLOADER =
S_OFFSET = 8192
PART_TYPE = L
endif
-# /boot: 64MB - OFFSET
-# / : 700MB
-S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
-S_ROOT := 1433600
+# /boot: 100MB - OFFSET
+# / : 1200 MB
+S_BOOT := $(shell echo $$(( 204800 - $(S_OFFSET) )))
+S_ROOT := 2477600
PADDING = 100 # MB
# Write Partition table
echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \
- | sfdisk -D -uS -H 64 -S 32 $(DEVICE)
+ | sfdisk -uS $(DEVICE)
+ -echo -e "d\n2\nw\n\q\n" | fdisk $(DEVICE)
kpartx -v -a $(DEVICE)
mkdir -pv $(MNThdd)/boot
mount $(PART_BOOT) $(MNThdd)/boot
- # Install MLO and uboot first
-ifeq "$(MACHINE_TYPE)" "arm"
+ # Install Pandaboard MLO and uboot first
+ifeq "$(BUILD_PLATFORM)" "arm"
cp -v /boot/MLO $(MNThdd)/boot/
cp -v /boot/u-boot.img $(MNThdd)/boot/
- cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
sync
umount $(MNThdd)/boot
mount $(PART_BOOT) $(MNThdd)/boot
endif
# Install IPFire
-ifneq "$(MACHINE_TYPE)" "arm"
- tar -x --lzma -C $(MNThdd)/ -f /install/cdrom/distro.img
+ifneq "$(BUILD_PLATFORM)" "arm"
+ tar -x --xz -C $(MNThdd)/ -f /install/cdrom/distro.img
else
tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
endif
echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
ifeq "$(SCON)" "1"
- # Enable serial console
- sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab
+ # Disable console on tty2-6
sed -i -e "s|2:2345:respawn:|#2:2345:respawn:|g" $(MNThdd)/etc/inittab
sed -i -e "s|3:2345:respawn:|#3:2345:respawn:|g" $(MNThdd)/etc/inittab
sed -i -e "s|4:2345:respawn:|#4:2345:respawn:|g" $(MNThdd)/etc/inittab
sed -i -e "s|5:2345:respawn:|#5:2345:respawn:|g" $(MNThdd)/etc/inittab
sed -i -e "s|6:2345:respawn:|#6:2345:respawn:|g" $(MNThdd)/etc/inittab
- sed -i -e "s|#7:2345:respawn:|7:2345:respawn:|g" $(MNThdd)/etc/inittab
-ifeq "$(MACHINE_TYPE)" "arm"
- 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
+ifeq "$(BUILD_PLATFORM)" "arm"
+ sed -i -e "s|SERIAL-CONSOLE=OFF|SERIAL-CONSOLE=ON|g" $(MNThdd)/boot/uEnv.txt
+ sed -i -e "s|xxxDTBSUNXIxxx|sun8i-h2-plus-ipfire-nano.dtb|" $(MNThdd)/boot/uEnv.txt
+endif
+else
+ifeq "$(BUILD_PLATFORM)" "arm"
+ sed -i -e "s|xxxDTBSUNXIxxx|sun7i-a20-bananapi.dtb|" $(MNThdd)/boot/uEnv.txt
endif
endif
mkdir -pv $(MNThdd)/boot/grub
chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
- # Insert the UUID because grub-mkconfig fails to detect that correctly
+ # Insert the UUID because grub-mkconfig often fails to
+ # detect that correctly
sed -i $(MNThdd)/boot/grub/grub.cfg \
- -e "s/root=[a-z0-9\/]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
+ -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
# Install GRUB
- grub-install --force --recheck --no-floppy \
+ grub-install --force --recheck --no-floppy --target=i386-pc \
--root-directory=$(MNThdd) $(DEVICE)
endif
+ # Set ramdisk mode to automatic
+ echo RAMDISK_MODE=2 > $(MNThdd)/etc/sysconfig/ramdisk
+
# Automatically resize the root partition to its maximum size at first boot
touch $(MNThdd)/.partresize
-fsck.ext4 -f -y $(PART_ROOT)
fsck.ext4 -f -y $(PART_ROOT)
+ sleep 10 #Ubuntu compiling: allow time to automount/dismount
kpartx -d -v $(DEVICE)
losetup -d $(DEVICE)
# not copied to a block device)
dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)
+ifeq "$(BUILD_PLATFORM)" "arm"
+ifeq "$(SCON)" "1"
+ # Install u-boot for Orangepi Zero/Nanopi DUO into image 8KB
+ dd if=/usr/share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
+else
+ # Install u-boot for LeMaker Banana Pi into image 8KB
+ dd if=/usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
+endif
+endif
+
# Compress Image
pigz -f9 < $(IMG) > $(IMAGE_FILE)
rm -rf $(IMG) $(MNThdd)
projects / ipfire-2.x.git / blobdiff