Merge lp:~dannf/ubuntu/trusty/base-installer/arm64+calxeda-subarches into lp:ubuntu/trusty/base-installer

[dann frazier]

[Colin Watson (cjwatson)]

I believe the highbank/midway changes in libd-i didn't actually work out that way (they seem to be generic now), so rejecting this in favour of https://code.launchpad.net/~dannf/ubuntu/trusty/base-installer/arm64/+merge/199972. Let me know if that's wrong.

review: Disapprove

Unmerged revisions

108. By dann frazier on 2013-12-23

libdebian-installer is being changed to expose the "highbank" and "midway"
subarchitectures instead of bucketing them as "generic" and "generic-lpae".
Add kernel detection support for them.

107. By dann frazier on 2013-12-23

Add arm64 kernel detection (LP: #1263756)

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-10 15:15:59 +0000
+++ debian/changelog	2013-12-23 21:01:15 +0000
@@ -1,3 +1,12 @@
+base-installer (1.122ubuntu18) UNRELEASED; urgency=low
+
+  * Add arm64 kernel detection (LP: #1263756)
+  * libdebian-installer is being changed to expose the "highbank" and "midway"
+    subarchitectures instead of bucketing them as "generic" and "generic-lpae".
+    Add kernel detection support for them.
+
+ -- dann frazier <[e-mail]>  Mon, 23 Dec 2013 12:41:34 -0700
+
 base-installer (1.122ubuntu17) saucy; urgency=low
 
   * Add generic-lpae the the allowed list of subarches in armhf/armel.

=== added file 'kernel/arm64.sh'
--- kernel/arm64.sh	1970-01-01 00:00:00 +0000
+++ kernel/arm64.sh	2013-12-23 21:01:15 +0000
@@ -0,0 +1,13 @@
+arch_get_kernel_flavour () {
+	echo "$MACHINE"
+	return 0
+}
+
+arch_check_usable_kernel () {
+	return 0
+}
+
+arch_get_kernel () {
+	echo "linux-generic"
+	echo "linux-image-generic"
+}

=== modified file 'kernel/armel.sh'
--- kernel/armel.sh	2013-09-10 15:15:59 +0000
+++ kernel/armel.sh	2013-12-23 21:01:15 +0000
@@ -8,6 +8,12 @@
 		# easier to offer unofficial support from a private apt-archive
 		echo "ads"
 		return 0 ;;
+	    highbank)
+		echo "generic"
+		return 0 ;;
+	    midway)
+		echo "generic-lpae"
+		return 0 ;;
 	    *)
 		warning "Unknown $ARCH subarchitecture '$SUBARCH'."
 		return 1 ;;