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

Proposed by dann frazier on 2013-12-23
Status: Merged
Merge reported by: Colin Watson
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/base-installer/arm64
Merge into: lp:ubuntu/trusty/base-installer
Diff against target: 31 lines (+19/-0)
2 files modified
debian/changelog (+6/-0)
kernel/arm64.sh (+13/-0)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/base-installer/arm64
Reviewer Review Type Date Requested Status
Colin Watson 2014-02-11 Approve on 2014-02-14
Ubuntu branches 2013-12-23 Pending
Review via email: mp+199972@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) wrote :

Looks OK, thanks. Tests would be nice at some point if there are machines whose cpuinfo we can post publicly.

review: Approve
Colin Watson (cjwatson) wrote :

Merged, though to lp:~ubuntu-core-dev/base-installer/ubuntu rather than to your target branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-09-10 15:15:59 +0000
3+++ debian/changelog 2013-12-23 19:42:52 +0000
4@@ -1,3 +1,9 @@
5+base-installer (1.122ubuntu18) UNRELEASED; urgency=low
6+
7+ * Add arm64 kernel detection (LP: #1263756)
8+
9+ -- dann frazier <dann.frazier@canonical.com> Mon, 23 Dec 2013 12:41:34 -0700
10+
11 base-installer (1.122ubuntu17) saucy; urgency=low
12
13 * Add generic-lpae the the allowed list of subarches in armhf/armel.
14
15=== added file 'kernel/arm64.sh'
16--- kernel/arm64.sh 1970-01-01 00:00:00 +0000
17+++ kernel/arm64.sh 2013-12-23 19:42:52 +0000
18@@ -0,0 +1,13 @@
19+arch_get_kernel_flavour () {
20+ echo "$MACHINE"
21+ return 0
22+}
23+
24+arch_check_usable_kernel () {
25+ return 0
26+}
27+
28+arch_get_kernel () {
29+ echo "linux-generic"
30+ echo "linux-image-generic"
31+}

Subscribers

People subscribed via source and target branches

to all changes: