Merge lp:~dannf/ubuntu/trusty/base-installer/lp1247601 into lp:ubuntu/trusty/base-installer

[dann frazier]

[James Page (james-page)]

Hi Dann

Thanks for the merge proposal; this looks OK but as this touches the base-installer, I'd prefer that someone closer to this package review and merge if its good.

review: Abstain

Unmerged revisions

108. By dann frazier on 2013-11-04

Add exynos5 subarch kernel support (LP: #1247601)

107. By dann frazier on 2013-11-04

Allow installation of kernels from universe (LP: #1247601)

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-10 15:15:59 +0000
+++ debian/changelog	2013-11-04 18:56:39 +0000
@@ -1,3 +1,10 @@
+base-installer (1.122ubuntu18) UNRELEASED; urgency=low
+
+  * Allow installation of kernels from universe (LP: #1247601)
+  * Add exynos5 subarch kernel support (LP: #1247601)
+
+ -- dann frazier <[e-mail]>  Fri, 01 Nov 2013 16:20:44 -0600
+
 base-installer (1.122ubuntu17) saucy; urgency=low
 
   * Add generic-lpae the the allowed list of subarches in armhf/armel.
 
=== modified file 'kernel/armel.sh'
--- kernel/armel.sh	2013-09-10 15:15:59 +0000
+++ kernel/armel.sh	2013-11-04 18:56:39 +0000
@@ -1,6 +1,6 @@
 arch_get_kernel_flavour () {
 	case "$SUBARCH" in
-	    armadaxp|dove|generic-lpae|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
+	    armadaxp|dove|exynos5|generic-lpae|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
 		echo "$SUBARCH"
 		return 0 ;;
 	    ads)
 
=== modified file 'library.sh'
--- library.sh	2013-07-19 11:30:15 +0000
+++ library.sh	2013-11-04 18:56:39 +0000
@@ -330,11 +330,12 @@
 		db_get mirror/$PROTOCOL/directory || mirror_error=1
 		DIRECTORY="$RET"
 
-		if db_get apt-setup/restricted && [ "$RET" = false ]; then
-			COMPONENTS="main"
-		else
-			COMPONENTS="main,restricted"
-		fi
+		COMPONENTS="main"
+		for optcomp in universe restricted; do
+			if db_get apt-setup/$optcomp && [ "$RET" = true ]; then
+				COMPONENTS="$COMPONENTS,$optcomp"
+			fi
+		done
 
 		if [ "$mirror_error" = 1 ] || [ -z "$PROTOCOL" ] || [ -z "$MIRROR" ]; then
 			exit_error base-installer/cannot_install