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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-03-23 07:14:21 +0000
3+++ debian/changelog 2009-03-27 08:19:16 +0000
4@@ -1,11 +1,15 @@
5 base-installer (1.98ubuntu4) UNRELEASED; urgency=low
6
7+ [ Michael Casadevall ]
8 * Fixed armel arch_get_kernel() call for Ubuntu/armel
9 * Updated the test suite for Ubuntu/armel
10 * Added imx51 to armel as a new sub-architecture and added its
11 test suite (LP: #345534)
12
13- -- Michael Casadevall <mcasadevall@ubuntu.com> Fri, 20 Mar 2009 08:58:29 -0400
14+ [ Emmet Hikory ]
15+ * Add lpia kernel selection and tests (LP: #291670)
16+
17+ -- Emmet Hikory <persia@ubuntu.com> Fri, 27 Mar 2009 17:18:51 +0900
18
19 base-installer (1.98ubuntu3) jaunty; urgency=low
20
21
22=== modified file 'debian/templates-arch'
23--- debian/templates-arch 2009-01-29 13:36:34 +0000
24+++ debian/templates-arch 2009-03-23 12:33:54 +0000
25@@ -48,6 +48,7 @@
26 Default[alpha]: false
27 Default[i386]: false
28 Default[amd64]: false
29+Default[lpia]: false
30 Default[ia64]: false
31 Default[mips]: false
32 Default[mipsel]: false
33
34=== modified file 'kernel/Makefile'
35--- kernel/Makefile 2007-02-14 21:28:51 +0000
36+++ kernel/Makefile 2009-03-23 12:33:54 +0000
37@@ -1,4 +1,4 @@
38-ARCHES = alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc
39+ARCHES = alpha amd64 arm armeb armel hppa i386 ia64 lpia m68k mips mipsel powerpc ppc64 s390 sparc
40
41 test:
42 @STATUS=0; \
43
44=== added file 'kernel/lpia.sh'
45--- kernel/lpia.sh 1970-01-01 00:00:00 +0000
46+++ kernel/lpia.sh 2009-03-23 12:33:54 +0000
47@@ -0,0 +1,12 @@
48+arch_get_kernel_flavour () {
49+ echo lpia
50+ return 0
51+}
52+
53+arch_check_usable_kernel () {
54+ return 0
55+}
56+
57+arch_get_kernel () {
58+ echo "linux-image-$1"
59+}
60
61=== added directory 'kernel/tests/lpia'
62=== added file 'kernel/tests/lpia/dennis.cpuinfo'
63--- kernel/tests/lpia/dennis.cpuinfo 1970-01-01 00:00:00 +0000
64+++ kernel/tests/lpia/dennis.cpuinfo 2009-03-23 12:33:54 +0000
65@@ -0,0 +1,48 @@
66+processor : 0
67+vendor_id : GenuineIntel
68+cpu family : 6
69+model : 28
70+model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
71+stepping : 2
72+cpu MHz : 800.000
73+cache size : 512 KB
74+physical id : 0
75+siblings : 2
76+core id : 0
77+cpu cores : 1
78+fdiv_bug : no
79+hlt_bug : no
80+f00f_bug : no
81+coma_bug : no
82+fpu : yes
83+fpu_exception : yes
84+cpuid level : 10
85+wp : yes
86+flags : 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
87+bogomips : 3196.02
88+clflush size : 64
89+
90+processor : 1
91+vendor_id : GenuineIntel
92+cpu family : 6
93+model : 28
94+model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
95+stepping : 2
96+cpu MHz : 800.000
97+cache size : 512 KB
98+physical id : 0
99+siblings : 2
100+core id : 0
101+cpu cores : 1
102+fdiv_bug : no
103+hlt_bug : no
104+f00f_bug : no
105+coma_bug : no
106+fpu : yes
107+fpu_exception : yes
108+cpuid level : 10
109+wp : yes
110+flags : 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
111+bogomips : 3192.22
112+clflush size : 64
113+
114
115=== added file 'kernel/tests/lpia/dennis.test'
116--- kernel/tests/lpia/dennis.test 1970-01-01 00:00:00 +0000
117+++ kernel/tests/lpia/dennis.test 2009-03-23 12:33:54 +0000
118@@ -0,0 +1,8 @@
119+cpuinfo dennis.cpuinfo
120+machine i686
121+flavour lpia
122+majors 2.6
123+kernel-2.6 \
124+ linux-image-lpia
125+usable \
126+ linux-image-lpia
127
128=== added file 'kernel/tests/lpia/qh.cpuinfo'
129--- kernel/tests/lpia/qh.cpuinfo 1970-01-01 00:00:00 +0000
130+++ kernel/tests/lpia/qh.cpuinfo 2009-03-23 12:33:54 +0000
131@@ -0,0 +1,48 @@
132+processor : 0
133+vendor_id : GenuineIntel
134+cpu family : 6
135+model : 28
136+model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
137+stepping : 2
138+cpu MHz : 800.000
139+cache size : 512 KB
140+physical id : 0
141+siblings : 2
142+core id : 0
143+cpu cores : 1
144+fdiv_bug : no
145+hlt_bug : no
146+f00f_bug : no
147+coma_bug : no
148+fpu : yes
149+fpu_exception : yes
150+cpuid level : 10
151+wp : yes
152+flags : 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
153+bogomips : 3196.17
154+clflush size : 64
155+
156+processor : 1
157+vendor_id : GenuineIntel
158+cpu family : 6
159+model : 28
160+model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
161+stepping : 2
162+cpu MHz : 800.000
163+cache size : 512 KB
164+physical id : 0
165+siblings : 2
166+core id : 0
167+cpu cores : 1
168+fdiv_bug : no
169+hlt_bug : no
170+f00f_bug : no
171+coma_bug : no
172+fpu : yes
173+fpu_exception : yes
174+cpuid level : 10
175+wp : yes
176+flags : 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
177+bogomips : 3191.82
178+clflush size : 64
179+
180
181=== added file 'kernel/tests/lpia/qh.test'
182--- kernel/tests/lpia/qh.test 1970-01-01 00:00:00 +0000
183+++ kernel/tests/lpia/qh.test 2009-03-23 12:33:54 +0000
184@@ -0,0 +1,8 @@
185+cpuinfo dennis.cpuinfo
186+machine i686
187+flavour lpia
188+majors 2.6
189+kernel-2.6 \
190+ linux-image-lpia
191+usable \
192+ linux-image-lpia
193
194=== added file 'kernel/tests/lpia/sylvania.cpuinfo'
195--- kernel/tests/lpia/sylvania.cpuinfo 1970-01-01 00:00:00 +0000
196+++ kernel/tests/lpia/sylvania.cpuinfo 2009-03-23 12:33:54 +0000
197@@ -0,0 +1,48 @@
198+processor : 0
199+vendor_id : GenuineIntel
200+cpu family : 6
201+model : 28
202+model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
203+stepping : 2
204+cpu MHz : 800.000
205+cache size : 512 KB
206+physical id : 0
207+siblings : 2
208+core id : 0
209+cpu cores : 1
210+fdiv_bug : no
211+hlt_bug : no
212+f00f_bug : no
213+coma_bug : no
214+fpu : yes
215+fpu_exception : yes
216+cpuid level : 10
217+wp : yes
218+flags : 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
219+bogomips : 3204.20
220+clflush size : 64
221+
222+processor : 1
223+vendor_id : GenuineIntel
224+cpu family : 6
225+model : 28
226+model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
227+stepping : 2
228+cpu MHz : 800.000
229+cache size : 512 KB
230+physical id : 0
231+siblings : 2
232+core id : 0
233+cpu cores : 1
234+fdiv_bug : no
235+hlt_bug : no
236+f00f_bug : no
237+coma_bug : no
238+fpu : yes
239+fpu_exception : yes
240+cpuid level : 10
241+wp : yes
242+flags : 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
243+bogomips : 3200.24
244+clflush size : 64
245+
246
247=== added file 'kernel/tests/lpia/sylvania.test'
248--- kernel/tests/lpia/sylvania.test 1970-01-01 00:00:00 +0000
249+++ kernel/tests/lpia/sylvania.test 2009-03-23 12:33:54 +0000
250@@ -0,0 +1,8 @@
251+cpuinfo dennis.cpuinfo
252+machine i686
253+flavour lpia
254+majors 2.6
255+kernel-2.6 \
256+ linux-image-lpia
257+usable \
258+ linux-image-lpia

Subscribers

People subscribed via source and target branches

to all changes: