###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2022 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 #
endif
PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
-IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz
+IMAGE_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).img.xz
FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
download :
-md5 :
+b2 :
###############################################################################
# Installation Details
PART_TYPE = c
ifeq "$(BUILD_ARCH)" "aarch64"
BOOTLOADER = grub
+ S_OFFSET = 32768
endif
else
BOOTLOADER = grub
PART_TYPE = L
endif
-# /boot: 128MB - OFFSET
-# / : 1600 MB
-S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 3354038
+# /boot: 256 MB - OFFSET
+# / : 1800 MB
+S_BOOT := $(shell echo $$(( 524288 - $(S_OFFSET) )))
+S_ROOT := 3773292
ifeq "$(EFI)" "1"
S_EFI = 65536 # 32 MB
# Create /etc/fstab
printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_BOOT))" "/boot" \
- "auto" "defaults" 1 2 > $(MNThdd)/etc/fstab
+ "auto" "defaults,nodev,noexec,nosuid" 1 2 > $(MNThdd)/etc/fstab
ifeq "$(EFI)" "1"
printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_EFI))" "/boot/efi" \
"auto" "defaults" 1 2 >> $(MNThdd)/etc/fstab
# Create configuration
mkdir -pv $(MNThdd)/boot/grub
- chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
+ GRUB_FIRST_BOOT=true KERNEL_RELEASE="$(KVER)-ipfire" chroot $(MNThdd) \
+ grub-mkconfig -o /boot/grub/grub.cfg
# Boot the first kernel by default
chroot $(MNThdd) grub-set-default 0
# 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
endif
+ifeq "$(BUILD_ARCH)" "aarch64"
+ # Install u-boot for NanoPi R2S into image 8KB
+ dd if=/usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin of=$(IMG) bs=1K seek=32 conv=notrunc
+endif
# Compress Image
xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)