Merge lp:~manjo/ubuntu/trusty/flash-kernel/HPm800Server into lp:ubuntu/trusty/flash-kernel

[Manoj Iyer]

[Brian Murray (brian-murray)]

If you want this SRU'd to Trusty you'll need a corresponding SRU bug.

[Martin Pitt (pitti)]

Uploaded to utopic for now.

review: Approve

=== added file 'bootscript/bootscr.keystone2'
--- bootscript/bootscr.keystone2	1970-01-01 00:00:00 +0000
+++ bootscript/bootscr.keystone2	2014-04-24 22:37:12 +0000
@@ -0,0 +1,31 @@
+setenv interface scsi
+echo Starting Ubuntu...
+if test -n ${fs} && test -n ${interface} && test -n ${device} && test -n ${prefix}; then
+	${fs}load ${interface} ${device} ${kernel_addr_r} ${prefix}uImage
+	${fs}load ${interface} ${device} ${ramdisk_addr_r} ${prefix}uInitrd
+	setenv bootargs ro quiet ${args_vendor} $rootfs
+	bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+else
+	echo boot information not recieved from u-boot, scanning for startup device
+
+	for i in ext2 ext4; do
+		for j in 0 1; do
+			for k in / /boot/; do
+				setenv fs $i;
+				setenv device $j;
+				setenv prefix $k;
+
+				echo Scanning ${fs} ${interface} ${device} on prefix ${prefix} ...;
+
+				if ${fs}load ${interface} ${device} ${script_addr_r} ${prefix}boot.scr; then
+					if iminfo ${script_addr_r}; then
+						echo boot.scr found! Executing ...;
+						source ${script_addr_r};
+					fi;
+				fi;
+			done;
+		done;
+	done;
+fi;
+
+echo No boot device found.;
 
=== modified file 'db/all.db'
--- db/all.db	2014-04-10 04:15:37 +0000
+++ db/all.db	2014-04-24 22:37:12 +0000
@@ -142,6 +142,17 @@
 Boot-Initrd-Path: /boot/uInitrd
 Boot-Script-Path: /boot/boot.scr
 
+Machine: HP ProLiant m800 Server Cartridge
+Kernel-Flavors: keystone
+U-Boot-Kernel-Address: 0x80008000
+U-Boot-Initrd-Address: 0x0
+U-Boot-Script-Address: 0x0
+U-Boot-Script-Name: bootscr.keystone2
+Required-Packages: u-boot-tools
+Boot-Kernel-Path: /boot/uImage
+Boot-Initrd-Path: /boot/uInitrd
+Boot-Script-Path: /boot/boot.scr
+
 Machine: HP t5325 Thin Client
 Kernel-Flavors: kirkwood
 Machine-Id: 2846
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-10 04:15:37 +0000
+++ debian/changelog	2014-04-24 22:37:12 +0000
@@ -1,3 +1,10 @@
+flash-kernel (3.0~rc.4ubuntu50) trusty; urgency=medium
+
+  * Added support for user defined uboot environment variables
+  * Added support for HP ProLiant m800 Server Cartridge
+
+ -- Manoj Iyer <[e-mail]>  Thu, 24 Apr 2014 17:34:28 -0500
+
 flash-kernel (3.0~rc.4ubuntu49) trusty; urgency=medium
 
   * db/all.db: add dummy entries as noops when running on VMs (LP: #1298070)
 
=== modified file 'debian/dirs'
--- debian/dirs	2006-09-25 18:06:07 +0000
+++ debian/dirs	2014-04-24 22:37:12 +0000
@@ -1,1 +1,2 @@
 usr/sbin
+etc/flash-kernel/ubootenv.d
 
=== modified file 'debian/flash-kernel.install'
--- debian/flash-kernel.install	2012-03-11 14:51:15 +0000
+++ debian/flash-kernel.install	2014-04-24 22:37:12 +0000
@@ -6,3 +6,4 @@
 bootscript                      usr/share/flash-kernel
 db                              usr/share/flash-kernel
 functions                       usr/share/flash-kernel
+ubootenv.d                      usr/share/flash-kernel
 
=== modified file 'functions'
--- functions	2013-12-23 14:51:32 +0000
+++ functions	2014-04-24 22:37:12 +0000
@@ -187,6 +187,34 @@
 	} >"$output"
 }
 
+append_ubootvars() {
+	local input="$1"
+	local output="$2"
+	local default_conf_file="/usr/share/flash-kernel/ubootenv.d/default.conf"
+	local user_conf_file="/etc/flash-kernel/ubootenv.d/"
+	local tmp_conf_file="$(dirname "$2")/tmp_conf_file"
+
+	if [ -r "$default_conf_file" ]; then
+		sed -e "/^#/d" < "$default_conf_file" > "$output"
+
+		for files in "$(find $user_conf_file -type f)"; do
+			if [ -r "$files" ]; then
+				sed -e "/^#/d" -e "/^$/d" < "$files" >> "$tmp_conf_file"
+			fi
+		done
+
+		if [ -s "$tmp_conf_file" ]; then
+			while read -r line ; do
+				uservar="$(echo $line | awk '{print $2}')"
+				sed -i "/.*$uservar.*/c$line" "$output"
+				grep -q "$uservar" "$output" || echo "$line" >> "$output"
+			done < "$tmp_conf_file"
+		fi
+	fi
+	cat "$input" >> "$output"
+}
+
+
 append_dtb() {
 	local kernel="$1"
 	local dtb="$2"
@@ -574,7 +602,8 @@
 			case $usname in
 				bootscr*)
 					boot_script_path="$boot_mnt_dir/$boot_script_path"
-					boot_script="$BOOTSCRIPTS_DIR/$usname"
+					append_ubootvars "$BOOTSCRIPTS_DIR/$usname" "$tmpdir/bootscript"
+					boot_script="$tmpdir/bootscript"
 					mkimage_script "$usaddr" "boot script" "$boot_script" \
 						"$tmpdir/boot.scr"
 					boot_script="$tmpdir/boot.scr"
 
=== added directory 'ubootenv.d'
=== added file 'ubootenv.d/default.conf'
--- ubootenv.d/default.conf	1970-01-01 00:00:00 +0000
+++ ubootenv.d/default.conf	2014-04-24 22:37:12 +0000
@@ -0,0 +1,1 @@
+# Enter default uboot environment variables here