------------------------------------------------------------ revno: 1708 tags: 20101020ubuntu148 fixes bug: https://launchpad.net/bugs/1010708 committer: Adam Conrad <[email protected]> branch nick: ubuntu timestamp: Sat 2012-06-09 00:03:39 -0600 message: * Fix armadaxp netboot uImage/uInitrd install paths (LP: #1010708) * Bring armadaxp and highbank netboot.cfg in line with other arches modified: build/config/armel/armadaxp/netboot.cfg build/config/armel/highbank/netboot.cfg debian/changelog
-- lp:~ubuntu-core-dev/debian-installer/ubuntu https://code.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu Your team Tieto is subscribed to branch lp:~ubuntu-core-dev/debian-installer/ubuntu. To unsubscribe from this branch go to https://code.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu/+edit-subscription
=== modified file 'build/config/armel/armadaxp/netboot.cfg' --- build/config/armel/armadaxp/netboot.cfg 2012-02-27 11:43:39 +0000 +++ build/config/armel/armadaxp/netboot.cfg 2012-06-09 06:03:39 +0000 @@ -1,5 +1,6 @@ MEDIA_TYPE = netboot image TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) armadaxp +EXTRANAME = $(MEDIUM)/ INITRD_FS = initramfs MANIFEST-INITRD = "netboot initrd" @@ -9,6 +10,6 @@ mkdir -p $(SOME_DEST)/$(EXTRANAME)/ mkimage -A arm -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/uImage mkimage -A arm -O linux -T ramdisk -C gzip -a 0x20000000 -e 0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/uInitrd - update-manifest $(SOME_DEST)/uImage "Linux kernel for Marvell ArmadaXP" - update-manifest $(SOME_DEST)/uInitrd "initrd for Marvell ArmadaXP" + update-manifest $(SOME_DEST)/$(EXTRANAME)uImage "Linux kernel for Marvell ArmadaXP" + update-manifest $(SOME_DEST)/$(EXTRANAME)uInitrd "initrd for Marvell ArmadaXP" === modified file 'build/config/armel/highbank/netboot.cfg' --- build/config/armel/highbank/netboot.cfg 2012-06-08 17:32:54 +0000 +++ build/config/armel/highbank/netboot.cfg 2012-06-09 06:03:39 +0000 @@ -1,10 +1,8 @@ MEDIA_TYPE = netboot image TARGET = $(INITRD) $(KERNEL) +EXTRANAME = $(MEDIUM)/ INITRD_FS = initramfs -TYPE = netboot -EXTRANAME = $(TYPE)/ - MANIFEST-INITRD = "netboot initrd" MANIFEST-KERNEL = "kernel image to netboot" === modified file 'debian/changelog' --- debian/changelog 2012-06-08 17:31:53 +0000 +++ debian/changelog 2012-06-09 06:03:39 +0000 @@ -1,3 +1,10 @@ +debian-installer (20101020ubuntu148) quantal; urgency=low + + * Fix armadaxp netboot uImage/uInitrd install paths (LP: #1010708) + * Bring armadaxp and highbank netboot.cfg in line with other arches + + -- Adam Conrad <[email protected]> Fri, 08 Jun 2012 16:41:44 -0600 + debian-installer (20101020ubuntu147) quantal; urgency=low * Add Calxeda Highbank netboot images (LP: #1004018).
-- Mailing list: https://launchpad.net/~tieto Post to : [email protected] Unsubscribe : https://launchpad.net/~tieto More help : https://help.launchpad.net/ListHelp
