X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fflash-images;h=554c0466212587faa6594a670abdc446d7c6a08b;hp=530bf339b80b95ae2e86bec54ed7a0d91cd212f7;hb=dc7d6b204d8ef2178a8fd4f0da28ec1ff6967913;hpb=2fd3387aec57a23e43a70531aba3b58bbb11b19f

diff --git a/lfs/flash-images b/lfs/flash-images
index 530bf339b8..554c046621 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2016  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        #
@@ -34,9 +34,9 @@ PART_BOOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
 ifeq "$(SCON)" "1"
-	IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(MACHINE)-full-core$(CORE).img.gz
+	IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(BUILD_ARCH)-full-core$(CORE).img.gz
 else
-	IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(MACHINE)-full-core$(CORE).img.gz
+	IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
 endif
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
@@ -60,7 +60,7 @@ MNThdd   := /install/harddisk
 IMG      := /install/images/image.img
 
 # All sizes in blocks
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
  BOOTLOADER =
  S_OFFSET = 8192
 
@@ -117,20 +117,25 @@ endif
 	mount $(PART_BOOT) $(MNThdd)/boot
 
 	# Install Pandaboard MLO and uboot first
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
 	cp -v /boot/u-boot.img $(MNThdd)/boot/
 	cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
+	cp -v /boot/uInit-ipfire-multi $(MNThdd)/boot/
+	cp -v /boot/uImage-ipfire-kirkwood $(MNThdd)/boot/
+	cp -v /boot/uInit-ipfire-kirkwood $(MNThdd)/boot/
+	cp -v /boot/uEnv.txt $(MNThdd)/boot/
 	# work around a u-boot bug not find the folders sometimes
 	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-multi
 	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-kirkwood
+	
 	sync
 	umount $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot
 endif
 
 	# Install IPFire
-ifneq "$(MACHINE_TYPE)" "arm"
+ifneq "$(BUILD_PLATFORM)" "arm"
 	tar -x --lzma -C $(MNThdd)/ -f /install/cdrom/distro.img
 else
 	tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
@@ -149,7 +154,7 @@ ifeq "$(SCON)" "1"
 	sed -i -e "s|6:2345:respawn:|#6:2345:respawn:|g" $(MNThdd)/etc/inittab
 	sed -i -e "s|#7:2345:respawn:|7:2345:respawn:|g" $(MNThdd)/etc/inittab
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 	sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
 	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/uEnv.txt
 endif
@@ -182,15 +187,19 @@ endif
 	mkdir -pv $(MNThdd)/boot/grub
 	chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
 
-	# Insert the UUID because grub-mkconfig fails to detect that correctly
+	# Insert the UUID because grub-mkconfig often fails to
+	# detect that correctly
 	sed -i $(MNThdd)/boot/grub/grub.cfg \
-		-e "s/root=[a-z0-9\/]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
+		-e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
 
 	# Install GRUB
-	grub-install --force --recheck --no-floppy \
+	grub-install --force --recheck --no-floppy --target=i386-pc \
 		--root-directory=$(MNThdd) $(DEVICE)
 endif
 
+	# Set ramdisk mode to automatic
+	echo RAMDISK_MODE=2 > $(MNThdd)/etc/sysconfig/ramdisk
+
 	# Automatically resize the root partition to its maximum size at first boot
 	touch $(MNThdd)/.partresize
 
@@ -219,7 +228,7 @@ endif
 	# not copied to a block device)
 	dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 	# Install u-boot for LeMaker Banana Pi into image 8KB
 	dd if=/usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
 endif