X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fflash-images;h=b78691e083ea40a309bb336552ba492a5307fa68;hb=eeee108f183e8d39e27154ee19c1ee0a8b27be11;hp=f2ac6a34a154579214fc9ac522919d9c66a78ead;hpb=779706b5f8f0025690dec3f8bf32f32deb9f7e05;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/flash-images b/lfs/flash-images
index f2ac6a34a1..b78691e083 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -31,6 +31,9 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DEVICE     = $(shell losetup -f)
 PART_BOOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
+ifeq "$(EFI)" "1"
+  PART_EFI = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p2
+endif
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
 IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz
@@ -62,11 +65,14 @@ ifeq "$(BUILD_PLATFORM)" "arm"
 
  # FAT32
  PART_TYPE = c
+ifeq "$(BUILD_ARCH)" "aarch64"
+ BOOTLOADER = grub
+endif
 else
  BOOTLOADER = grub
  S_OFFSET = 8192
 
- # Logical
+ # Linux
  PART_TYPE = L
 endif
 
@@ -75,8 +81,24 @@ endif
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
 S_ROOT := 2477600
 
+ifeq "$(EFI)" "1"
+ S_EFI = 65536 # 32 MB
+else
+ S_EFI = 0
+endif
+
 PADDING = 100 # MB
 
+ifeq "$(EFI)" "1"
+ SFDISK      = $(SFDISK_BOOT)$(SFDISK_EFI)$(SFDISK_ROOT)
+else
+ SFDISK      = $(SFDISK_BOOT),0,0\n$(SFDISK_ROOT)
+endif
+
+SFDISK_BOOT = $(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n
+SFDISK_EFI  = $(shell echo $$(( $(S_OFFSET) + $(S_BOOT) ))),$(S_EFI),U\n
+SFDISK_ROOT = $(shell echo $$(( $(S_OFFSET) + $(S_BOOT) + $(S_EFI) ))),$(S_ROOT),L\n
+
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Stop if $(MNThdd) is still mounted
 	mountpoint $(MNThdd) && exit 1 || exit 0
@@ -84,13 +106,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rf $(IMG) $(MNThdd) && mkdir -p $(MNThdd)
 
 	# Allocate image on disk
-	dd if=/dev/zero of=$(IMG) bs=512 count=$$(( $(S_OFFSET) + $(S_BOOT) + $(S_ROOT) ))
+	dd if=/dev/zero of=$(IMG) bs=512 count=$$(( $(S_OFFSET) + $(S_BOOT) + $(S_EFI) + $(S_ROOT) ))
 	losetup $(DEVICE) $(IMG)
 
 	# Write Partition table
-	echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \
-		| sfdisk -uS $(DEVICE)
-	-echo -e "d\n2\nw\n\q\n" | fdisk $(DEVICE)
+	echo -e "$(SFDISK)" | sfdisk -uS $(DEVICE)
 
 	kpartx -v -a $(DEVICE)
 
@@ -99,6 +119,9 @@ ifeq "$(PART_TYPE)" "c"
 	mkfs.vfat $(PART_BOOT)
 else
 	mkfs.ext2 -F $(PART_BOOT)
+endif
+ifeq "$(EFI)" "1"
+	mkfs.vfat $(PART_EFI)
 endif
 	mkfs.ext4 -O ^has_journal,extent -F $(PART_ROOT)
 
@@ -113,6 +136,11 @@ endif
 	mkdir -pv $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot
 
+ifeq "$(EFI)" "1"
+	mkdir -pv $(MNThdd)/boot/efi
+	mount $(PART_EFI) $(MNThdd)/boot/efi
+endif
+
 	# Install Pandaboard MLO and uboot first
 ifeq "$(BUILD_ARCH)" "armv5tel"
 	cp -v /boot/MLO $(MNThdd)/boot/
@@ -128,10 +156,6 @@ ifneq "$(BUILD_PLATFORM)" "arm"
 else
 	tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
 endif
-	echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings
-	echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
-	echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
-
 	-touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
 	mkdir $(MNThdd)/proc
 	mount --bind /proc $(MNThdd)/proc
@@ -143,6 +167,10 @@ endif
 	# Create /etc/fstab
 	printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_BOOT))" "/boot" \
 		"auto" "defaults" 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
+endif
 	printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_ROOT))" "/" \
 		"auto" "defaults" 1 1 >> $(MNThdd)/etc/fstab
 
@@ -153,7 +181,6 @@ ifeq "$(BOOTLOADER)" "grub"
 	# Enable also serial console on GRUB
 	echo "GRUB_TERMINAL=\"serial console\"" >> $(MNThdd)/etc/default/grub
 	echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> $(MNThdd)/etc/default/grub
-	echo "GRUB_TIMEOUT=-1" >> $(MNThdd)/etc/default/grub
 
 	# Add additional entry for Serial console
 	cp $(DIR_SRC)/config/flash-images/grub/11_linux_scon \
@@ -163,14 +190,25 @@ ifeq "$(BOOTLOADER)" "grub"
 	mkdir -pv $(MNThdd)/boot/grub
 	chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
 
+	# Boot the first kernel by default
+	chroot $(MNThdd) grub-set-default 0
+
 	# Insert the UUID because grub-mkconfig often fails to
 	# detect that correctly
 	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=$(GRUB_ARCH)-efi --removable --no-nvram \
+		--boot-directory=$(MNThdd)/boot --efi-directory=$(MNThdd)/boot/efi
+endif
 
 	# restore orginal defaults
 	mv -f $(MNThdd)/etc/default/grub.backup $(MNThdd)/etc/default/grub
@@ -187,6 +225,9 @@ endif
 	umount $(MNThdd)/proc
 	umount $(MNThdd)/sys
 	umount $(MNThdd)/dev
+ifeq "$(EFI)" "1"
+	umount $(MNThdd)/boot/efi
+endif
 	umount $(MNThdd)/boot
 	umount $(MNThdd)