Please remember to update debian/changelog when making changes in
installer/ like any other package. General reminder since I've seen
several people forget lately.
Dann Frazier wrote:
> Author: dannf
> Date: Wed Aug 11 04:37:29 2004
> New Revision: 18971
>
> Added:
> trunk/installer/build/boot/ia64/elilo-cd.conf.with26
> trunk/installer/build/config/ia64/cdrom/
> trunk/installer/build/config/ia64/cdrom/2.6.cfg
> trunk/installer/build/config/ia64/miniiso/
> trunk/installer/build/config/ia64/miniiso/2.6.cfg
> trunk/installer/build/config/ia64/netboot/
> trunk/installer/build/config/ia64/netboot/2.6.cfg
> Modified:
> trunk/installer/build/config/ia64.cfg
> trunk/installer/build/config/ia64/cdrom.cfg
> trunk/installer/build/config/ia64/miniiso.cfg
> trunk/installer/build/config/ia64/netboot.cfg
> Log:
> add support for 2.6 builds for ia64 - contributed by
> Jim Lieb <lieb@wildopensource.com>
>
>
> Added: trunk/installer/build/boot/ia64/elilo-cd.conf.with26
> ==============================================================================
> --- (empty file)
> +++ trunk/installer/build/boot/ia64/elilo-cd.conf.with26 Wed Aug 11 04:37:29 2004
> @@ -0,0 +1,38 @@
> +# Load up initrd on boot.
> +chooser=textmenu
> +default=Linux
> +delay=20
> +prompt
> +#append="devfs=mount,dmknod,dreg,dchange"
> +
> +message=/efi/boot/elilo_menu.msg
> +f1=/efi/boot/general.msg
> +f2=/efi/boot/params.msg
> +
> +image=/linux
> + label=Linux
> + description="Install with Linux 2.4"
> + initrd=/initrd.gz
> + append="devfs=mount ramdisk_size=${RAMDISK_SIZE}"
> + root=/dev/ram
> +
> +image=/linux
> + label=Expert
> + description="Install in Expert mode with Linux 2.4"
> + initrd=/initrd.gz
> + append="devfs=mount ramdisk_size=${RAMDISK_SIZE} DEBCONF_PRIORITY=low"
> + root=/dev/ram
> +
> +image=/linux26
> + label=Linux26
> + description="Install with Linux 2.6"
> + initrd=/initrd26.gz
> + append="devfs=mount ramdisk_size=${RAMDISK_SIZE_26}"
> + root=/dev/ram
> +
> +image=/linux26
> + label=Expert26
> + description="Install in Expert mode with Linux 2.6"
> + initrd=/initrd26.gz
> + append="devfs=mount ramdisk_size=${RAMDISK_SIZE_26} DEBCONF_PRIORITY=low"
> + root=/dev/ram
>
> Modified: trunk/installer/build/config/ia64.cfg
> ==============================================================================
> --- trunk/installer/build/config/ia64.cfg (original)
> +++ trunk/installer/build/config/ia64.cfg Wed Aug 11 04:37:29 2004
> @@ -1,11 +1,13 @@
> # How big a floppy image should I make? (in kilobytes)
> -FLOPPY_SIZE = 10240
> +#FLOPPY_SIZE = 10240
> +FLOPPY_SIZE = 20480
>
> MEDIUM_SUPPORTED = cdrom netboot miniiso
>
> # The version of the kernel to use.
> KERNELMAJOR = 2.4
> KERNELVERSION = 2.4.26-itanium-smp
> +KERNELVERSION_2.6 = 2.6.7-1-itanium-smp
> KERNEL_FLAVOUR = di
> KERNELNAME = vmlinuz
> KERNELIMAGEVERSION = $(KERNELVERSION)
> @@ -30,11 +32,39 @@
> mmd -i$(TEMP_BOOT) ::/efi/boot
> mcopy -i$(TEMP_BOOT) $(TEMP_KERNEL) ::/linux
> mcopy -i$(TEMP_BOOT) $(TEMP_INITRD) ::/initrd.gz
> + if [ -n "$(KERNEL_2.6)" ] && [ -n "$(INITRD_2.6)" ]; then \
> + mcopy -i$(TEMP_BOOT) $(KERNEL_2.6) ::/linux26; \
> + mcopy -i$(TEMP_BOOT) $(INITRD_2.6) ::/initrd26.gz; \
> + fi
> mcopy -i$(TEMP_BOOT) /usr/lib/elilo/elilo.efi ::/efi/boot/bootia64.efi
> mcopy -i$(TEMP_BOOT) /usr/lib/elilo/elilo.efi ::/elilo.efi
> - mcopy -i$(TEMP_BOOT) boot/ia64/elilo-cd.conf ::/elilo.conf
> - mcopy -i$(TEMP_BOOT) boot/ia64/elilo-cd.conf ::/efi/boot/elilo.conf
> + mcopy -i$(TEMP_BOOT) $(TEMP_BOOT_SCREENS)/elilo-cd.conf ::/elilo.conf
> + mcopy -i$(TEMP_BOOT) $(TEMP_BOOT_SCREENS)/elilo-cd.conf ::/efi/boot/elilo.conf
> + mcopy -i$(TEMP_BOOT) $(TEMP_BOOT_SCREENS)/elilo_menu.msg ::/efi/boot/elilo_menu.msg
> + mcopy -i$(TEMP_BOOT) boot/ia64/general.msg ::/efi/boot/general.msg
> + mcopy -i$(TEMP_BOOT) boot/ia64/params.msg ::/efi/boot/params.msg
> echo "elilo linux" | mcopy -i$(TEMP_BOOT) - ::/install.nsh
>
> +.PHONY: arch_boot_screens
> arch_boot_screens:
> + -rm -f $(TEMP_BOOT_SCREENS)/*
> + mkdir -p $(TEMP_BOOT_SCREENS)
> + cat boot/ia64/elilo_menu.msg | ./bootscreen-subst "$(MEDIA_TYPE)" \
> + "$(DEBIAN_VERSION)" "$(BUILD_DATE)" \
> + > $(TEMP_BOOT_SCREENS)/elilo_menu.msg
> + (if [ -n "$(INITRD_2.6)" ] && [ -n "$(KERNEL_2.6)" ]; then \
> + cat boot/ia64/elilo-cd.conf.with26; \
> + else \
> + cat boot/ia64/elilo-cd.conf; \
> + fi) \
> + | ./ramdisk-size-subst $(TEMP_INITRD) $(INITRD_2.6) \
> + > $(TEMP_BOOT_SCREENS)/elilo-cd.conf
>
> +.PHONY: arch_miniiso
> +arch_miniiso:
> + -rm -rf $(TEMP_CD_TREE)/*
> + install -m 644 -D $(BASE_TMP)miniiso/boot.img \
> + $(TEMP_CD_TREE)/boot/boot.img
> +
> + mkisofs -no-emul-boot -J -o $(TEMP_MINIISO) -b boot/boot.img \
> + -c boot/boot.catalog $(TEMP_CD_TREE)
>
> Modified: trunk/installer/build/config/ia64/cdrom.cfg
> ==============================================================================
> --- trunk/installer/build/config/ia64/cdrom.cfg (original)
> +++ trunk/installer/build/config/ia64/cdrom.cfg Wed Aug 11 04:37:29 2004
> @@ -1,5 +1,14 @@
> +FLAVOUR_SUPPORTED = "" 2.6
> +
> MEDIA_TYPE = CD-ROM
>
> -TARGET = $(BOOT)
> +# add the 2.6 images to the boot.img
> +EXTRATARGETS = build_cdrom_2.6
> +INITRD_2.6 = dest/cdrom/2.6/initrd.gz
> +KERNEL_2.6 = dest/cdrom/2.6/vmlinuz
> +TARGET = $(KERNEL) $(INITRD) $(BOOT)
> +EXTRANAME = $(MEDIUM)/
>
> MANIFEST-BOOT = "CDROM image for Itanium systems"
> +MANIFEST-INITRD = "CDROM boot initrd"
> +MANIFEST-KERNEL = "CDROM boot kernel"
>
> Added: trunk/installer/build/config/ia64/cdrom/2.6.cfg
> ==============================================================================
> --- (empty file)
> +++ trunk/installer/build/config/ia64/cdrom/2.6.cfg Wed Aug 11 04:37:29 2004
> @@ -0,0 +1,7 @@
> +KERNELVERSION = $(KERNELVERSION_2.6)
> +KERNELMAJOR = 2.6
> +EXTRANAME = 2.6/
> +INITRD_FS = cramfs
> +
> +EXTRATARGETS =
> +TARGET = $(KERNEL) $(INITRD)
>
> Modified: trunk/installer/build/config/ia64/miniiso.cfg
> ==============================================================================
> --- trunk/installer/build/config/ia64/miniiso.cfg (original)
> +++ trunk/installer/build/config/ia64/miniiso.cfg Wed Aug 11 04:37:29 2004
> @@ -1,15 +1,15 @@
> +FLAVOUR_SUPPORTED = "" 2.6
> +
> MEDIA_TYPE = CD-ROM
>
> TYPE = netboot
>
> +# add the 2.6 images to the boot.img
> +EXTRATARGETS = build_miniiso_2.6
> +INITRD_2.6 = dest/cdrom/2.6/initrd.gz
> +KERNEL_2.6 = dest/cdrom/2.6/vmlinuz
> TARGET = $(TEMP_BOOT) $(MINIISO)
> EXTRANAME = cdrom-
>
> MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
>
> -.PHONY: arch_miniiso arch_boot_screens arch_boot
> -arch_miniiso:
> - -rm -rf $(TEMP_CD_TREE)/*
> - install -m 644 -D $(BASE_TMP)miniiso/boot.img $(TEMP_CD_TREE)/boot/boot.img
> -
> - mkisofs -no-emul-boot -J -o $(TEMP_MINIISO) -b boot/boot.img -c boot/boot.catalog $(TEMP_CD_TREE)
>
> Added: trunk/installer/build/config/ia64/miniiso/2.6.cfg
> ==============================================================================
> --- (empty file)
> +++ trunk/installer/build/config/ia64/miniiso/2.6.cfg Wed Aug 11 04:37:29 2004
> @@ -0,0 +1,7 @@
> +KERNELVERSION = $(KERNELVERSION_2.6)
> +KERNELMAJOR = 2.6
> +EXTRANAME = 2.6/
> +INITRD_FS = cramfs
> +
> +EXTRATARGETS =
> +TARGET = $(KERNEL) $(INITRD)
>
> Modified: trunk/installer/build/config/ia64/netboot.cfg
> ==============================================================================
> --- trunk/installer/build/config/ia64/netboot.cfg (original)
> +++ trunk/installer/build/config/ia64/netboot.cfg Wed Aug 11 04:37:29 2004
> @@ -1,5 +1,11 @@
> +FLAVOUR_SUPPORTED = "" 2.6
> +
> MEDIA_TYPE = netboot image
>
> +# add the 2.6 images to the boot.img
> +EXTRATARGETS = build_netboot_2.6
> +INITRD_2.6 = dest/netboot/2.6/initrd.gz
> +KERNEL_2.6 = dest/netboot/2.6/vmlinuz
> TARGET = $(INITRD) $(KERNEL) $(MISC)
> EXTRANAME = $(MEDIUM)/
>
>
> Added: trunk/installer/build/config/ia64/netboot/2.6.cfg
> ==============================================================================
> --- (empty file)
> +++ trunk/installer/build/config/ia64/netboot/2.6.cfg Wed Aug 11 04:37:29 2004
> @@ -0,0 +1,7 @@
> +KERNELVERSION = $(KERNELVERSION_2.6)
> +KERNELMAJOR = 2.6
> +EXTRANAME = 2.6/
> +INITRD_FS = cramfs
> +
> +EXTRATARGETS =
> +TARGET = $(KERNEL) $(INITRD)
>
--
see shy jo
Attachment:
signature.asc
Description: Digital signature