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

Proposed by dann frazier on 2013-11-04
Status: Work in progress
Proposed branch: lp:~dannf/ubuntu/trusty/base-installer/lp1247601
Merge into: lp:ubuntu/trusty/base-installer
Diff against target: 48 lines (+14/-6)
3 files modified
debian/changelog (+7/-0)
kernel/armel.sh (+1/-1)
library.sh (+6/-5)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/base-installer/lp1247601
Reviewer Review Type Date Requested Status
James Page 2013-11-04 Abstain on 2013-11-18
Review via email: mp+193834@code.launchpad.net
To post a comment you must log in.
James Page (james-page) wrote :

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)

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-11-04 18:56:39 +0000
4@@ -1,3 +1,10 @@
5+base-installer (1.122ubuntu18) UNRELEASED; urgency=low
6+
7+ * Allow installation of kernels from universe (LP: #1247601)
8+ * Add exynos5 subarch kernel support (LP: #1247601)
9+
10+ -- dann frazier <dann.frazier@canonical.com> Fri, 01 Nov 2013 16:20:44 -0600
11+
12 base-installer (1.122ubuntu17) saucy; urgency=low
13
14 * Add generic-lpae the the allowed list of subarches in armhf/armel.
15
16=== modified file 'kernel/armel.sh'
17--- kernel/armel.sh 2013-09-10 15:15:59 +0000
18+++ kernel/armel.sh 2013-11-04 18:56:39 +0000
19@@ -1,6 +1,6 @@
20 arch_get_kernel_flavour () {
21 case "$SUBARCH" in
22- armadaxp|dove|generic-lpae|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
23+ armadaxp|dove|exynos5|generic-lpae|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
24 echo "$SUBARCH"
25 return 0 ;;
26 ads)
27
28=== modified file 'library.sh'
29--- library.sh 2013-07-19 11:30:15 +0000
30+++ library.sh 2013-11-04 18:56:39 +0000
31@@ -330,11 +330,12 @@
32 db_get mirror/$PROTOCOL/directory || mirror_error=1
33 DIRECTORY="$RET"
34
35- if db_get apt-setup/restricted && [ "$RET" = false ]; then
36- COMPONENTS="main"
37- else
38- COMPONENTS="main,restricted"
39- fi
40+ COMPONENTS="main"
41+ for optcomp in universe restricted; do
42+ if db_get apt-setup/$optcomp && [ "$RET" = true ]; then
43+ COMPONENTS="$COMPONENTS,$optcomp"
44+ fi
45+ done
46
47 if [ "$mirror_error" = 1 ] || [ -z "$PROTOCOL" ] || [ -z "$MIRROR" ]; then
48 exit_error base-installer/cannot_install

Subscribers

People subscribed via source and target branches

to all changes: