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 b4fde8dd96125e2fc25b81cf77bab89f2e3350a9..464ad5edf56d55ab53eca841907ceef1ae263111 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -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
 
@@ -77,9 +77,9 @@ else
  PART_TYPE = L
 endif
 
-# /boot:  256 MB - OFFSET
+# /boot:  512 MB - OFFSET
 # /    : 1800 MB
-S_BOOT := $(shell echo $$(( 524288 - $(S_OFFSET) )))
+S_BOOT := $(shell echo $$(( 1048576 - $(S_OFFSET) )))
 S_ROOT := 3773292
 
 ifeq "$(EFI)" "1"
@@ -142,15 +142,6 @@ 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
@@ -257,10 +248,6 @@ endif
        # 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