###############################################################################
# #
# 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 = L
endif
-# /boot: 128MB - OFFSET
+# /boot: 512 MB - OFFSET
# / : 1800 MB
-S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
+S_BOOT := $(shell echo $$(( 1048576 - $(S_OFFSET) )))
S_ROOT := 3773292
ifeq "$(EFI)" "1"
mount $(PART_EFI) $(MNThdd)/boot/efi
endif
- # Install Pandaboard MLO and uboot first
-ifeq "$(BUILD_ARCH)" "armv6l"
- cp -v /boot/MLO $(MNThdd)/boot/
- cp -v /boot/u-boot.img $(MNThdd)/boot/
- sync
- umount $(MNThdd)/boot
- mount $(PART_BOOT) $(MNThdd)/boot
-endif
-
# Install IPFire
ifneq "$(BUILD_PLATFORM)" "arm"
tar $(TAR_OPTIONS) -x --zstd -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
# 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
# not copied to a block device)
dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)
-ifeq "$(BUILD_ARCH)" "armv6l"
- # 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