X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fflash-images;h=40aca53770481b766795b6c683d176163eadbe60;hb=467581b8ab2c9a62a2239a7dcea4fe40fe70093c;hp=530bf339b80b95ae2e86bec54ed7a0d91cd212f7;hpb=65f2c9bb3940fab663248f81aae2161a3d1e13a5;p=ipfire-2.x.git diff --git a/lfs/flash-images b/lfs/flash-images index 530bf339b8..40aca53770 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 # +# Copyright (C) 2007-2018 IPFire Team # # # # 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 # @@ -33,11 +33,7 @@ DEVICE = $(shell losetup -f) 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 -else - IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(MACHINE)-full-core$(CORE).img.gz -endif +IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n @@ -60,7 +56,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 @@ -74,10 +70,10 @@ else PART_TYPE = L endif -# /boot: 64MB - OFFSET -# / : 750MB -S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) ))) -S_ROOT := 1536000 +# /boot: 128MB - OFFSET +# / : 1200 MB +S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) ))) +S_ROOT := 2477600 PADDING = 100 # MB @@ -93,7 +89,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Write Partition table echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \ - | sfdisk -D -uS -H 64 -S 32 $(DEVICE) + | sfdisk -uS $(DEVICE) + -echo -e "d\n2\nw\n\q\n" | fdisk $(DEVICE) kpartx -v -a $(DEVICE) @@ -117,44 +114,20 @@ endif mount $(PART_BOOT) $(MNThdd)/boot # Install Pandaboard MLO and uboot first -ifeq "$(MACHINE_TYPE)" "arm" +ifeq "$(BUILD_ARCH)" "armv5tel" cp -v /boot/MLO $(MNThdd)/boot/ cp -v /boot/u-boot.img $(MNThdd)/boot/ - cp -v /boot/zImage-ipfire-multi $(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" - tar -x --lzma -C $(MNThdd)/ -f /install/cdrom/distro.img +ifneq "$(BUILD_PLATFORM)" "arm" + tar -x --xz -C $(MNThdd)/ -f /install/cdrom/distro.img 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 - -ifeq "$(SCON)" "1" - # Enable serial console - sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab - sed -i -e "s|2:2345:respawn:|#2:2345:respawn:|g" $(MNThdd)/etc/inittab - sed -i -e "s|3:2345:respawn:|#3:2345:respawn:|g" $(MNThdd)/etc/inittab - sed -i -e "s|4:2345:respawn:|#4:2345:respawn:|g" $(MNThdd)/etc/inittab - sed -i -e "s|5:2345:respawn:|#5:2345:respawn:|g" $(MNThdd)/etc/inittab - 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" - 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 -endif - -touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep mkdir $(MNThdd)/proc mount --bind /proc $(MNThdd)/proc @@ -170,27 +143,41 @@ endif "auto" "defaults" 1 1 >> $(MNThdd)/etc/fstab ifeq "$(BOOTLOADER)" "grub" -ifeq "$(SCON)" "1" - # Enable serial console on GRUB - echo "GRUB_TERMINAL=\"serial\"" >> $(MNThdd)/etc/default/grub + # backup defaults file + cp $(MNThdd)/etc/default/grub $(MNThdd)/etc/default/grub.backup + + # 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 - sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" $(MNThdd)/etc/default/grub -endif + # Add additional entry for Serial console + cp $(DIR_SRC)/config/flash-images/grub/11_linux_scon \ + $(MNThdd)/etc/grub.d/ # Create configuration 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 + # 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-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) + + # restore orginal defaults + mv -f $(MNThdd)/etc/default/grub.backup $(MNThdd)/etc/default/grub + rm -f $(MNThdd)/etc/grub.d/11_linux_scon 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,11 +206,11 @@ endif # not copied to a block device) dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG) -ifeq "$(MACHINE_TYPE)" "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 +ifeq "$(BUILD_ARCH)" "armv5tel" + # 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 # Compress Image - pigz -f9 < $(IMG) > $(IMAGE_FILE) + xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE) rm -rf $(IMG) $(MNThdd)