openvpn-2fa: Import a prototype of an authenticator

[people/pmueller/ipfire-2.x.git] / lfs / flash-images

diff --git a/lfs/flash-images b/lfs/flash-images
index ca1ffa5e0c89a59e8e39e0761de17d1ac3de5ad5..8a033c310c7491446fa6e63b11aa4e56b087f3fa 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # 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        #
@@ -50,7 +50,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -67,6 +67,7 @@ ifeq "$(BUILD_PLATFORM)" "arm"
  PART_TYPE = c
 ifeq "$(BUILD_ARCH)" "aarch64"
  BOOTLOADER = grub
+ S_OFFSET = 32768
 endif
 else
  BOOTLOADER = grub
@@ -77,9 +78,9 @@ else
 endif
 
 # /boot:  128MB - OFFSET
-# /    : 1600 MB
+# /    : 1800 MB
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 3354038
+S_ROOT := 3773292
 
 ifeq "$(EFI)" "1"
  S_EFI = 65536 # 32 MB
@@ -166,7 +167,7 @@ endif
 
        # 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
@@ -188,7 +189,7 @@ ifeq "$(BOOTLOADER)" "grub"
 
        # Create configuration
        mkdir -pv $(MNThdd)/boot/grub
-       GRUB_FIRST_BOOT=true chroot $(MNThdd) \
+       GRUB_FIRST_BOOT=true KERNEL_RELEASE="$(KVER)-ipfire" chroot $(MNThdd) \
                grub-mkconfig -o /boot/grub/grub.cfg
 
        # Boot the first kernel by default
@@ -260,6 +261,10 @@ 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
+endif
 
        # Compress Image
        xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)