move perl-DBI and perl-DBD-SQLite to core system

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

diff --git a/lfs/flash-images b/lfs/flash-images
index e9bd0434b514a3e78699cc41a098c3a1fca78867..5f39c488f610e25fdaa8ccd17952260e19ad0225 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        #
@@ -55,8 +55,8 @@ md5 :
 ###############################################################################
 # Installation Details
 ###############################################################################
-MNThdd   := /install/harddisk
-IMG      := /install/images/image.img
+MNThdd   := $(DIR_TMP)/harddisk
+IMG      := $(DIR_TMP)/image.img
 
 # All sizes in blocks
 ifeq "$(BUILD_PLATFORM)" "arm"
@@ -77,9 +77,9 @@ else
 endif
 
 # /boot:  128MB - OFFSET
-# /    : 1200 MB
+# /    : 1400 MB
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 2476032
+S_ROOT := 2934784
 
 ifeq "$(EFI)" "1"
  S_EFI = 65536 # 32 MB
@@ -152,9 +152,9 @@ endif
 
        # Install IPFire
 ifneq "$(BUILD_PLATFORM)" "arm"
-       tar -x --xz -C $(MNThdd)/ -f /install/cdrom/distro.img
+       tar -x --xz -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
 else
-       tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
+       tar -x -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
 endif
        -touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
        mkdir $(MNThdd)/proc
@@ -215,7 +215,7 @@ endif
        rm -f $(MNThdd)/etc/grub.d/11_linux_scon
 endif
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_PLATFORM)" "arm"
        # 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"
@@ -262,4 +262,4 @@ endif
 
        # Compress Image
        xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
-       rm -rf $(IMG) $(MNThdd)
+       rm -rf $(IMG) $(MNThdd) $(DIR_TMP)/cdrom