base-installer

Merge lp:~persia/base-installer/add-lpia into lp:~ubuntu-core-dev/base-installer/ubuntu

  1. add-lpia
  2. Merge into ubuntu
Proposed by Emmet Hikory
Status: Merged
Merged at revision: not available
Proposed branch: lp:~persia/base-installer/add-lpia
Merge into: lp:~ubuntu-core-dev/base-installer/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~persia/base-installer/add-lpia
To post a comment you must log in.
Revision history for this message
Emmet Hikory (persia) wrote :

Successful test completed: see bug #291670

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-03-23 07:14:21 +0000
+++ debian/changelog 2009-03-27 08:19:16 +0000
@@ -1,11 +1,15 @@
1base-installer (1.98ubuntu4) UNRELEASED; urgency=low1base-installer (1.98ubuntu4) UNRELEASED; urgency=low
22
3 [ Michael Casadevall ]
3 * Fixed armel arch_get_kernel() call for Ubuntu/armel4 * Fixed armel arch_get_kernel() call for Ubuntu/armel
4 * Updated the test suite for Ubuntu/armel5 * Updated the test suite for Ubuntu/armel
5 * Added imx51 to armel as a new sub-architecture and added its 6 * Added imx51 to armel as a new sub-architecture and added its
6 test suite (LP: #345534)7 test suite (LP: #345534)
78
8 -- Michael Casadevall <mcasadevall@ubuntu.com> Fri, 20 Mar 2009 08:58:29 -04009 [ Emmet Hikory ]
10 * Add lpia kernel selection and tests (LP: #291670)
11
12 -- Emmet Hikory <persia@ubuntu.com> Fri, 27 Mar 2009 17:18:51 +0900
913
10base-installer (1.98ubuntu3) jaunty; urgency=low14base-installer (1.98ubuntu3) jaunty; urgency=low
1115
1216
=== modified file 'debian/templates-arch'
--- debian/templates-arch 2009-01-29 13:36:34 +0000
+++ debian/templates-arch 2009-03-23 12:33:54 +0000
@@ -48,6 +48,7 @@
48Default[alpha]: false48Default[alpha]: false
49Default[i386]: false49Default[i386]: false
50Default[amd64]: false50Default[amd64]: false
51Default[lpia]: false
51Default[ia64]: false52Default[ia64]: false
52Default[mips]: false53Default[mips]: false
53Default[mipsel]: false54Default[mipsel]: false
5455
=== modified file 'kernel/Makefile'
--- kernel/Makefile 2007-02-14 21:28:51 +0000
+++ kernel/Makefile 2009-03-23 12:33:54 +0000
@@ -1,4 +1,4 @@
1ARCHES = alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc1ARCHES = alpha amd64 arm armeb armel hppa i386 ia64 lpia m68k mips mipsel powerpc ppc64 s390 sparc
22
3test:3test:
4 @STATUS=0; \4 @STATUS=0; \
55
=== added file 'kernel/lpia.sh'
--- kernel/lpia.sh 1970-01-01 00:00:00 +0000
+++ kernel/lpia.sh 2009-03-23 12:33:54 +0000
@@ -0,0 +1,12 @@
1arch_get_kernel_flavour () {
2 echo lpia
3 return 0
4}
5
6arch_check_usable_kernel () {
7 return 0
8}
9
10arch_get_kernel () {
11 echo "linux-image-$1"
12}
013
=== added directory 'kernel/tests/lpia'
=== added file 'kernel/tests/lpia/dennis.cpuinfo'
--- kernel/tests/lpia/dennis.cpuinfo 1970-01-01 00:00:00 +0000
+++ kernel/tests/lpia/dennis.cpuinfo 2009-03-23 12:33:54 +0000
@@ -0,0 +1,48 @@
1processor : 0
2vendor_id : GenuineIntel
3cpu family : 6
4model : 28
5model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
6stepping : 2
7cpu MHz : 800.000
8cache size : 512 KB
9physical id : 0
10siblings : 2
11core id : 0
12cpu cores : 1
13fdiv_bug : no
14hlt_bug : no
15f00f_bug : no
16coma_bug : no
17fpu : yes
18fpu_exception : yes
19cpuid level : 10
20wp : yes
21flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx constant_tsc arch_perfmon pebs bts pni monitor ds_cpl est tm2 ssse3 xtpr lahf_lm
22bogomips : 3196.02
23clflush size : 64
24
25processor : 1
26vendor_id : GenuineIntel
27cpu family : 6
28model : 28
29model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
30stepping : 2
31cpu MHz : 800.000
32cache size : 512 KB
33physical id : 0
34siblings : 2
35core id : 0
36cpu cores : 1
37fdiv_bug : no
38hlt_bug : no
39f00f_bug : no
40coma_bug : no
41fpu : yes
42fpu_exception : yes
43cpuid level : 10
44wp : yes
45flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx constant_tsc arch_perfmon pebs bts pni monitor ds_cpl est tm2 ssse3 xtpr lahf_lm
46bogomips : 3192.22
47clflush size : 64
48
049
=== added file 'kernel/tests/lpia/dennis.test'
--- kernel/tests/lpia/dennis.test 1970-01-01 00:00:00 +0000
+++ kernel/tests/lpia/dennis.test 2009-03-23 12:33:54 +0000
@@ -0,0 +1,8 @@
1cpuinfo dennis.cpuinfo
2machine i686
3flavour lpia
4majors 2.6
5kernel-2.6 \
6 linux-image-lpia
7usable \
8 linux-image-lpia
09
=== added file 'kernel/tests/lpia/qh.cpuinfo'
--- kernel/tests/lpia/qh.cpuinfo 1970-01-01 00:00:00 +0000
+++ kernel/tests/lpia/qh.cpuinfo 2009-03-23 12:33:54 +0000
@@ -0,0 +1,48 @@
1processor : 0
2vendor_id : GenuineIntel
3cpu family : 6
4model : 28
5model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
6stepping : 2
7cpu MHz : 800.000
8cache size : 512 KB
9physical id : 0
10siblings : 2
11core id : 0
12cpu cores : 1
13fdiv_bug : no
14hlt_bug : no
15f00f_bug : no
16coma_bug : no
17fpu : yes
18fpu_exception : yes
19cpuid level : 10
20wp : yes
21flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx constant_tsc arch_perfmon pebs bts pni monitor ds_cpl est tm2 ssse3 xtpr lahf_lm
22bogomips : 3196.17
23clflush size : 64
24
25processor : 1
26vendor_id : GenuineIntel
27cpu family : 6
28model : 28
29model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
30stepping : 2
31cpu MHz : 800.000
32cache size : 512 KB
33physical id : 0
34siblings : 2
35core id : 0
36cpu cores : 1
37fdiv_bug : no
38hlt_bug : no
39f00f_bug : no
40coma_bug : no
41fpu : yes
42fpu_exception : yes
43cpuid level : 10
44wp : yes
45flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx constant_tsc arch_perfmon pebs bts pni monitor ds_cpl est tm2 ssse3 xtpr lahf_lm
46bogomips : 3191.82
47clflush size : 64
48
049
=== added file 'kernel/tests/lpia/qh.test'
--- kernel/tests/lpia/qh.test 1970-01-01 00:00:00 +0000
+++ kernel/tests/lpia/qh.test 2009-03-23 12:33:54 +0000
@@ -0,0 +1,8 @@
1cpuinfo dennis.cpuinfo
2machine i686
3flavour lpia
4majors 2.6
5kernel-2.6 \
6 linux-image-lpia
7usable \
8 linux-image-lpia
09
=== added file 'kernel/tests/lpia/sylvania.cpuinfo'
--- kernel/tests/lpia/sylvania.cpuinfo 1970-01-01 00:00:00 +0000
+++ kernel/tests/lpia/sylvania.cpuinfo 2009-03-23 12:33:54 +0000
@@ -0,0 +1,48 @@
1processor : 0
2vendor_id : GenuineIntel
3cpu family : 6
4model : 28
5model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
6stepping : 2
7cpu MHz : 800.000
8cache size : 512 KB
9physical id : 0
10siblings : 2
11core id : 0
12cpu cores : 1
13fdiv_bug : no
14hlt_bug : no
15f00f_bug : no
16coma_bug : no
17fpu : yes
18fpu_exception : yes
19cpuid level : 10
20wp : yes
21flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe constant_tsc arch_perfmon pebs bts pni monitor ds_cpl est tm2 ssse3 xtpr lahf_lm
22bogomips : 3204.20
23clflush size : 64
24
25processor : 1
26vendor_id : GenuineIntel
27cpu family : 6
28model : 28
29model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
30stepping : 2
31cpu MHz : 800.000
32cache size : 512 KB
33physical id : 0
34siblings : 2
35core id : 0
36cpu cores : 1
37fdiv_bug : no
38hlt_bug : no
39f00f_bug : no
40coma_bug : no
41fpu : yes
42fpu_exception : yes
43cpuid level : 10
44wp : yes
45flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe constant_tsc arch_perfmon pebs bts pni monitor ds_cpl est tm2 ssse3 xtpr lahf_lm
46bogomips : 3200.24
47clflush size : 64
48
049
=== added file 'kernel/tests/lpia/sylvania.test'
--- kernel/tests/lpia/sylvania.test 1970-01-01 00:00:00 +0000
+++ kernel/tests/lpia/sylvania.test 2009-03-23 12:33:54 +0000
@@ -0,0 +1,8 @@
1cpuinfo dennis.cpuinfo
2machine i686
3flavour lpia
4majors 2.6
5kernel-2.6 \
6 linux-image-lpia
7usable \
8 linux-image-lpia

Subscribers

People subscribed via source and target branches

to all changes: