debian-installer

Merge lp:~persia/debian-installer/publish-omap-spl into lp:~ubuntu-core-dev/debian-installer/ubuntu

  1. publish-omap-spl
  2. Merge into ubuntu
Proposed by Emmet Hikory
Status: Merged
Merged at revision: 1492
Proposed branch: lp:~persia/debian-installer/publish-omap-spl
Merge into: lp:~ubuntu-core-dev/debian-installer/ubuntu
Diff against target: 65 lines (+21/-0) (has conflicts)
3 files modified
build/config/armel/omap/netboot.cfg (+6/-0)
build/config/armel/omap4/netboot.cfg (+6/-0)
debian/changelog (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~persia/debian-installer/publish-omap-spl
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+67575@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/config/armel/omap/netboot.cfg'
--- build/config/armel/omap/netboot.cfg 2011-06-09 11:08:52 +0000
+++ build/config/armel/omap/netboot.cfg 2011-07-11 16:14:29 +0000
@@ -33,6 +33,10 @@
33 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-fb $(INSTALL_PATH)/boot.img-fb33 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-fb $(INSTALL_PATH)/boot.img-fb
34 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-serial $(INSTALL_PATH)/boot.img-serial34 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-serial $(INSTALL_PATH)/boot.img-serial
3535
36 # Publish SPL
37 cp /usr/lib/x-loader/omap3530beagle/MLO $(INSTALL_PATH)/MLO
38 cp /usr/lib/u-boot/omap3_beagle/u-boot.bin $(INSTALL_PATH)/u-boot.bin
39
36 # Generate manifests40 # Generate manifests
37 update-manifest $(INSTALL_PATH)/uImage "Linux kernel for OMAP Boards"41 update-manifest $(INSTALL_PATH)/uImage "Linux kernel for OMAP Boards"
38 update-manifest $(INSTALL_PATH)/uInitrd "initrd for OMAP Boards"42 update-manifest $(INSTALL_PATH)/uInitrd "initrd for OMAP Boards"
@@ -40,3 +44,5 @@
40 update-manifest $(INSTALL_PATH)/boot.scr-serial "Boot script for booting OMAP netinstall initrd and kernel from SD card. Uses serial output"44 update-manifest $(INSTALL_PATH)/boot.scr-serial "Boot script for booting OMAP netinstall initrd and kernel from SD card. Uses serial output"
41 update-manifest $(INSTALL_PATH)/boot.img-serial "Boot image for booting OMAP netinstall. Uses serial output"45 update-manifest $(INSTALL_PATH)/boot.img-serial "Boot image for booting OMAP netinstall. Uses serial output"
42 update-manifest $(INSTALL_PATH)/boot.img-fb "Boot image for booting OMAP netinstall. Uses framebuffer output"46 update-manifest $(INSTALL_PATH)/boot.img-fb "Boot image for booting OMAP netinstall. Uses framebuffer output"
47 update-manifest $(INSTALL_PATH)/MLO "MMC Loader for OMAP3 Beagleboards"
48 update-manifest $(INSTALL_PATH)/u-boot.bin "Universal Bootloader for OMAP3 Beagleboards"
4349
=== modified file 'build/config/armel/omap4/netboot.cfg'
--- build/config/armel/omap4/netboot.cfg 2011-06-09 11:08:52 +0000
+++ build/config/armel/omap4/netboot.cfg 2011-07-11 16:14:29 +0000
@@ -33,6 +33,10 @@
33 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-fb $(INSTALL_PATH)/boot.img-fb33 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-fb $(INSTALL_PATH)/boot.img-fb
34 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-serial $(INSTALL_PATH)/boot.img-serial34 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-serial $(INSTALL_PATH)/boot.img-serial
3535
36 # Publish SPL
37 cp /usr/lib/x-loader/omap4430panda/MLO $(INSTALL_PATH)/MLO
38 cp /usr/lib/u-boot/omap4_panda/u-boot.bin $(INSTALL_PATH)/u-boot.bin
39
36 # Generate manifests40 # Generate manifests
37 update-manifest $(INSTALL_PATH)/uImage "Linux kernel for OMAP Boards"41 update-manifest $(INSTALL_PATH)/uImage "Linux kernel for OMAP Boards"
38 update-manifest $(INSTALL_PATH)/uInitrd "initrd for OMAP Boards"42 update-manifest $(INSTALL_PATH)/uInitrd "initrd for OMAP Boards"
@@ -40,3 +44,5 @@
40 update-manifest $(INSTALL_PATH)/boot.scr-serial "Boot script for booting OMAP netinstall initrd and kernel from SD card. Uses serial output"44 update-manifest $(INSTALL_PATH)/boot.scr-serial "Boot script for booting OMAP netinstall initrd and kernel from SD card. Uses serial output"
41 update-manifest $(INSTALL_PATH)/boot.img-serial "Boot image for booting OMAP netinstall. Uses serial output"45 update-manifest $(INSTALL_PATH)/boot.img-serial "Boot image for booting OMAP netinstall. Uses serial output"
42 update-manifest $(INSTALL_PATH)/boot.img-fb "Boot image for booting OMAP netinstall. Uses framebuffer output"46 update-manifest $(INSTALL_PATH)/boot.img-fb "Boot image for booting OMAP netinstall. Uses framebuffer output"
47 update-manifest $(INSTALL_PATH)/MLO "MMC Loader for OMAP4 Pandaboards"
48 update-manifest $(INSTALL_PATH)/u-boot.bin "Universal Bootloader for OMAP4 Pandaboards"
4349
=== modified file 'debian/changelog'
--- debian/changelog 2011-07-11 15:35:24 +0000
+++ debian/changelog 2011-07-11 16:14:29 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1debian-installer (20101020ubuntu46) UNRELEASED; urgency=low2debian-installer (20101020ubuntu46) UNRELEASED; urgency=low
23
3 * Update minimum disk space requirements for installing Ubuntu. Thanks to4 * Update minimum disk space requirements for installing Ubuntu. Thanks to
@@ -5,6 +6,14 @@
56
6 -- Brian Murray <brian@ubuntu.com> Mon, 11 Jul 2011 07:58:33 -07007 -- Brian Murray <brian@ubuntu.com> Mon, 11 Jul 2011 07:58:33 -0700
78
9=======
10debian-installer (20101020ubuntu46) UNRELEASED; urgency=low
11
12 * Publish MLO and u-boot.bin for omap netboot targets (LP:#808810)
13
14 -- Emmet Hikory <persia@ubuntu.com> Mon, 11 Jul 2011 23:47:22 +0900
15
16>>>>>>> MERGE-SOURCE
8debian-installer (20101020ubuntu45) oneiric; urgency=low17debian-installer (20101020ubuntu45) oneiric; urgency=low
918
10 * Move to 3.0.0-4 kernels.19 * Move to 3.0.0-4 kernels.

Subscribers

People subscribed via source and target branches