Merge lp:~dannf/base-installer/use-generic-instead-of-highbank into lp:~ubuntu-core-dev/base-installer/ubuntu

Proposed by dann frazier on 2013-04-09
Status: Merged
Merged at revision: 992
Proposed branch: lp:~dannf/base-installer/use-generic-instead-of-highbank
Merge into: lp:~ubuntu-core-dev/base-installer/ubuntu
Diff against target: 25 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
kernel/armel.sh (+1/-1)
To merge this branch: bzr merge lp:~dannf/base-installer/use-generic-instead-of-highbank
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2013-04-09 Pending
Review via email: mp+157798@code.launchpad.net
To post a comment you must log in.

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 2012-11-16 16:02:58 +0000
3+++ debian/changelog 2013-04-09 06:08:19 +0000
4@@ -1,3 +1,9 @@
5+base-installer (1.122ubuntu15) UNRELEASED; urgency=low
6+
7+ * Replace "highbank" flavor with "generic" (LP: #1166597)
8+
9+ -- dann frazier <dann.frazier@canonical.com> Tue, 09 Apr 2013 00:01:08 -0600
10+
11 base-installer (1.122ubuntu14) raring; urgency=low
12
13 [ Ben Collins ]
14
15=== modified file 'kernel/armel.sh'
16--- kernel/armel.sh 2012-05-16 15:25:48 +0000
17+++ kernel/armel.sh 2013-04-09 06:08:19 +0000
18@@ -1,6 +1,6 @@
19 arch_get_kernel_flavour () {
20 case "$SUBARCH" in
21- armadaxp|dove|highbank|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
22+ armadaxp|dove|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
23 echo "$SUBARCH"
24 return 0 ;;
25 ads)

Subscribers

People subscribed via source and target branches

to all changes: