###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2019 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
###############################################################################
-MNThdd := /install/harddisk
-IMG := /install/images/image.img
+MNThdd := $(DIR_TMP)/harddisk
+IMG := $(DIR_TMP)/image.img
# All sizes in blocks
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_PLATFORM)" "arm"
BOOTLOADER =
S_OFFSET = 8192
# FAT32
PART_TYPE = c
+ifeq "$(BUILD_ARCH)" "aarch64"
+ BOOTLOADER = grub
+endif
else
BOOTLOADER = grub
S_OFFSET = 8192
endif
# /boot: 128MB - OFFSET
-# / : 1200 MB
+# / : 1400 MB
S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 2477600
+S_ROOT := 2934784
ifeq "$(EFI)" "1"
S_EFI = 65536 # 32 MB
ifeq "$(EFI)" "1"
SFDISK = $(SFDISK_BOOT)$(SFDISK_EFI)$(SFDISK_ROOT)
else
- SFDISK = $(SFDISK_BOOT)$(SFDISK_ROOT)
+ SFDISK = $(SFDISK_BOOT),0,0\n$(SFDISK_ROOT)
endif
SFDISK_BOOT = $(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n
# Install IPFire
ifneq "$(BUILD_PLATFORM)" "arm"
- tar -x --xz -C $(MNThdd)/ -f /install/cdrom/distro.img
+ tar $(TAR_OPTIONS) -x --xz -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
else
- tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
+ tar $(TAR_OPTIONS) -x -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
endif
-touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
mkdir $(MNThdd)/proc
rm -f $(MNThdd)/etc/grub.d/11_linux_scon
endif
+ifeq "$(BUILD_PLATFORM)" "arm"
+ # Insert the UUID to uENV.txt
+ sed -i $(MNThdd)/boot/uENV.txt \
+ -e "s/^root_dev=.*/root_dev=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
+endif
+
# Set ramdisk mode to automatic
echo RAMDISK_MODE=2 > $(MNThdd)/etc/sysconfig/ramdisk
# Compress Image
xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
- rm -rf $(IMG) $(MNThdd)
+ rm -rf $(IMG) $(MNThdd) $(DIR_TMP)/cdrom