suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/flash-images b/lfs/flash-images
index 9c6af5092ac9335d95fa124ec76d5282e23f15a5..464ad5edf56d55ab53eca841907ceef1ae263111 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  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        #
@@ -36,7 +36,7 @@ ifeq "$(EFI)" "1"
 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
 
@@ -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
@@ -76,10 +77,10 @@ else
  PART_TYPE = L
 endif
 
-# /boot:  128MB - OFFSET
-# /    : 1600 MB
-S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 3354038
+# /boot:  512 MB - OFFSET
+# /    : 1800 MB
+S_BOOT := $(shell echo $$(( 1048576 - $(S_OFFSET) )))
+S_ROOT := 3773292
 
 ifeq "$(EFI)" "1"
  S_EFI = 65536 # 32 MB
@@ -141,18 +142,9 @@ ifeq "$(EFI)" "1"
        mount $(PART_EFI) $(MNThdd)/boot/efi
 endif
 
-       # Install Pandaboard MLO and uboot first
-ifeq "$(BUILD_ARCH)" "armv5tel"
-       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 --xz -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
+       tar $(TAR_OPTIONS) -x --zstd -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
 else
        tar $(TAR_OPTIONS) -x -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
 endif
@@ -166,7 +158,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 +180,8 @@ ifeq "$(BOOTLOADER)" "grub"
 
        # 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
@@ -255,9 +248,9 @@ endif
        # not copied to a block device)
        dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
-       # 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
+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