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
1=== modified file 'build/config/armel/omap/netboot.cfg'
2--- build/config/armel/omap/netboot.cfg 2011-06-09 11:08:52 +0000
3+++ build/config/armel/omap/netboot.cfg 2011-07-11 16:14:29 +0000
4@@ -33,6 +33,10 @@
5 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-fb $(INSTALL_PATH)/boot.img-fb
6 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-serial $(INSTALL_PATH)/boot.img-serial
7
8+ # Publish SPL
9+ cp /usr/lib/x-loader/omap3530beagle/MLO $(INSTALL_PATH)/MLO
10+ cp /usr/lib/u-boot/omap3_beagle/u-boot.bin $(INSTALL_PATH)/u-boot.bin
11+
12 # Generate manifests
13 update-manifest $(INSTALL_PATH)/uImage "Linux kernel for OMAP Boards"
14 update-manifest $(INSTALL_PATH)/uInitrd "initrd for OMAP Boards"
15@@ -40,3 +44,5 @@
16 update-manifest $(INSTALL_PATH)/boot.scr-serial "Boot script for booting OMAP netinstall initrd and kernel from SD card. Uses serial output"
17 update-manifest $(INSTALL_PATH)/boot.img-serial "Boot image for booting OMAP netinstall. Uses serial output"
18 update-manifest $(INSTALL_PATH)/boot.img-fb "Boot image for booting OMAP netinstall. Uses framebuffer output"
19+ update-manifest $(INSTALL_PATH)/MLO "MMC Loader for OMAP3 Beagleboards"
20+ update-manifest $(INSTALL_PATH)/u-boot.bin "Universal Bootloader for OMAP3 Beagleboards"
21
22=== modified file 'build/config/armel/omap4/netboot.cfg'
23--- build/config/armel/omap4/netboot.cfg 2011-06-09 11:08:52 +0000
24+++ build/config/armel/omap4/netboot.cfg 2011-07-11 16:14:29 +0000
25@@ -33,6 +33,10 @@
26 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-fb $(INSTALL_PATH)/boot.img-fb
27 boot/arm/generate-partitioned-filesystem $(INSTALL_PATH)/boot.img-fat-serial $(INSTALL_PATH)/boot.img-serial
28
29+ # Publish SPL
30+ cp /usr/lib/x-loader/omap4430panda/MLO $(INSTALL_PATH)/MLO
31+ cp /usr/lib/u-boot/omap4_panda/u-boot.bin $(INSTALL_PATH)/u-boot.bin
32+
33 # Generate manifests
34 update-manifest $(INSTALL_PATH)/uImage "Linux kernel for OMAP Boards"
35 update-manifest $(INSTALL_PATH)/uInitrd "initrd for OMAP Boards"
36@@ -40,3 +44,5 @@
37 update-manifest $(INSTALL_PATH)/boot.scr-serial "Boot script for booting OMAP netinstall initrd and kernel from SD card. Uses serial output"
38 update-manifest $(INSTALL_PATH)/boot.img-serial "Boot image for booting OMAP netinstall. Uses serial output"
39 update-manifest $(INSTALL_PATH)/boot.img-fb "Boot image for booting OMAP netinstall. Uses framebuffer output"
40+ update-manifest $(INSTALL_PATH)/MLO "MMC Loader for OMAP4 Pandaboards"
41+ update-manifest $(INSTALL_PATH)/u-boot.bin "Universal Bootloader for OMAP4 Pandaboards"
42
43=== modified file 'debian/changelog'
44--- debian/changelog 2011-07-11 15:35:24 +0000
45+++ debian/changelog 2011-07-11 16:14:29 +0000
46@@ -1,3 +1,4 @@
47+<<<<<<< TREE
48 debian-installer (20101020ubuntu46) UNRELEASED; urgency=low
49
50 * Update minimum disk space requirements for installing Ubuntu. Thanks to
51@@ -5,6 +6,14 @@
52
53 -- Brian Murray <brian@ubuntu.com> Mon, 11 Jul 2011 07:58:33 -0700
54
55+=======
56+debian-installer (20101020ubuntu46) UNRELEASED; urgency=low
57+
58+ * Publish MLO and u-boot.bin for omap netboot targets (LP:#808810)
59+
60+ -- Emmet Hikory <persia@ubuntu.com> Mon, 11 Jul 2011 23:47:22 +0900
61+
62+>>>>>>> MERGE-SOURCE
63 debian-installer (20101020ubuntu45) oneiric; urgency=low
64
65 * Move to 3.0.0-4 kernels.

Subscribers

People subscribed via source and target branches