Merge lp:~manjo/ubuntu/utopic/flash-kernel/filter-useable-kernels into lp:ubuntu/utopic/flash-kernel

[Manoj Iyer]

https://bugs.launchpad.net/lomond/+bug/1356569

Submitting merge proposal for smoser's patch to filter useable kernels for platform. Currently if the platform uses flavor kernels, and the cloud image has a -generic version that is newer than the flavor version, nothing gets installed and boot.scr is not generated. With this patch, the latest useable flavor kernel is discovered and written to /boot and boot.scr is generated.

[Scott Moser (smoser)]

uploaded to utopic
https://lists.canonical.com/archives/utopic-changes/2014-August/008898.html

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-24 17:34:28 +0000
+++ debian/changelog	2014-08-19 19:39:23 +0000
@@ -1,3 +1,9 @@
+flash-kernel (3.0~rc.4ubuntu51) utopic; urgency=medium
+
+  * Filter the selection of latest useable kernel through the whitelist.
+
+ -- Manoj Iyer <[e-mail]>  Tue, 19 Aug 2014 14:27:33 -0500
+
 flash-kernel (3.0~rc.4ubuntu50) utopic; urgency=medium
 
   * Added support for user defined uboot environment variables

=== modified file 'functions'
--- functions	2014-04-24 17:34:28 +0000
+++ functions	2014-08-19 19:39:23 +0000
@@ -351,6 +351,29 @@
 	fi
 }
 
+include_only_flavors() {
+	# include_only_flavors(flav1, flav2, flav3)
+	# filter lines of input in uname -r format (X.Y.Z-N-flavor)
+	# and filter-out anything that is not in the listed input
+	# if exactly zero flavors are given, then assume everything is a match
+	local cur_uname cur_flav allowed_flav
+	while read cur_uname; do
+		if [ $# -eq 0 ]; then
+			echo "$cur_uname"
+		else
+			# could use cur_flav=$(get_kfile_suffix "$cur_uname")
+			# but this is much faster.
+			cur_flav=${cur_uname#*-*-}
+			for allowed_flav in "$@"; do
+				if [ "${cur_flav}" = "${allowed_flav}" ]; then
+					echo "$cur_uname"
+					break
+				fi
+			done
+		fi
+	done
+}
+
 main() {
 if [ "x$1" = "x--machine" ]; then
 	machine="$2"
@@ -369,7 +392,9 @@
 # kernel + initrd installation/upgrade mode, with optional version
 
 kvers="$1"
-latest_version=$(linux-version list | linux-version sort | tail -1)
+
+kflavors="$(get_machine_field "$machine" "Kernel-Flavors")"
+latest_version=$(linux-version list | include_only_flavors $kflavors | linux-version sort | tail -1)
 if [ -n "$kvers" ] && [ "$kvers" != "$latest_version" ]; then
 	echo "Ignoring old or unknown version $kvers (latest is $latest_version)" >&2
 	exit 0
@@ -412,7 +437,7 @@
 	error "Unsupported platform."
 fi
 
-if kflavors="$(get_machine_field "$machine" "Kernel-Flavors")"; then
+if [ -n "$kflavors" ]; then
 	if ! check_kflavors "$kfile_suffix" $kflavors; then
 		echo "Kernel suffix $kfile_suffix does not match any of the expected flavors ($kflavors), therefore not writing it to flash." >&2
 		exit 0