core140: ship glibc built with new gcc

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

diff --git a/lfs/flash-images b/lfs/flash-images
index 5134fd672cc1142eb9d2cdf37997117b347cf2bb..332bd1fdf8b8ca6c556d046cdc42550b7c90bf2c 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -65,6 +65,9 @@ ifeq "$(BUILD_PLATFORM)" "arm"
 
  # FAT32
  PART_TYPE = c
+ifeq "$(BUILD_ARCH)" "aarch64"
+ BOOTLOADER = grub
+endif
 else
  BOOTLOADER = grub
  S_OFFSET = 8192
@@ -74,9 +77,9 @@ else
 endif
 
 # /boot:  128MB - OFFSET
-# /    : 1200 MB
+# /    : 1400 MB
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 2477600
+S_ROOT := 2934784
 
 ifeq "$(EFI)" "1"
  S_EFI = 65536 # 32 MB
@@ -89,7 +92,7 @@ PADDING = 100 # MB
 ifeq "$(EFI)" "1"
  SFDISK      = $(SFDISK_BOOT)$(SFDISK_EFI)$(SFDISK_ROOT)
 else
- SFDISK      = $(SFDISK_BOOT)$(SFDISK_ROOT)
+ SFDISK      = $(SFDISK_BOOT),0,0\n$(SFDISK_ROOT)
 endif
 
 SFDISK_BOOT = $(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n
@@ -195,13 +198,15 @@ ifeq "$(BOOTLOADER)" "grub"
        sed -i $(MNThdd)/boot/grub/grub.cfg \
                -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
 
+ifeq "$(BUILD_PLATFORM)" "x86"
        # Install GRUB
        grub-install --force --recheck --no-floppy --target=i386-pc \
                --root-directory=$(MNThdd) $(DEVICE)
+endif
 
 ifeq "$(EFI)" "1"
        # Install GRUB for EFI
-       grub-install --target=$(BUILD_ARCH)-efi --removable --no-nvram \
+       grub-install --target=$(GRUB_ARCH)-efi --removable --no-nvram \
                --boot-directory=$(MNThdd)/boot --efi-directory=$(MNThdd)/boot/efi
 endif
 
@@ -210,6 +215,12 @@ endif
        rm -f $(MNThdd)/etc/grub.d/11_linux_scon
 endif
 
+ifeq "$(BUILD_ARCH)" "armv5tel"
+       # Insert the UUID to uENV.txt
+       sed -i $(MNThdd)/boot/uENV.txt \
+               -e "s/^root_dev=.*/root_dev=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
+endif
+
        # Set ramdisk mode to automatic
        echo RAMDISK_MODE=2 > $(MNThdd)/etc/sysconfig/ramdisk