On 12/20/2012 05:50 AM, Cyril Brulebois wrote:
> reopen 629492
> found 629492 1.129
> thanks
> 
> Hi Milan,
> 
> Milan Kupcevic <mi...@physics.harvard.edu> (06/11/2012):
>> reassign 629492 base-installer
>> tags + pending
>> thanks
> 
>> diff --git a/debian/changelog b/debian/changelog
>> index 7712e5e..c015a71 100644
>> --- a/debian/changelog
>> +++ b/debian/changelog
>> @@ -1,3 +1,9 @@
>> +base-installer (1.129) UNRELEASED; urgency=low
>> +
>> +  * Properly recognize PowerPC SMP machines. Closes: #629492
>> +
>> + -- Milan Kupcevic <mi...@physics.harvard.edu>  Tue, 06 Nov 2012 11:21:07 
>> -0500
>> +
>>  base-installer (1.128) unstable; urgency=low
>>  
>>    * Add support for armhf/vexpress.
>> diff --git a/kernel/powerpc.sh b/kernel/powerpc.sh
>> index d8f09d0..b2b9b93 100644
>> --- a/kernel/powerpc.sh
>> +++ b/kernel/powerpc.sh
>> @@ -29,7 +29,7 @@ arch_check_usable_kernel () {
>>  }
>>  
>>  arch_get_kernel () {
>> -    CPUS="$(grep -ci ^processor "$CPUINFO")" || CPUS=1
>> +    CPUS="$(ls /proc/device-tree/cpus/ | grep -ci @[0-9])" || CPUS=1
>>      if [ "$CPUS" ] && [ "$CPUS" -gt 1 ] && \
>>         [ "$1" != "powerpc64" ] && [ "$1" != "prep" ] ; then
>>              SMP=-smp
> 
> this was merged into base-installer 1.129, and seems to be responsible
> for the build failure, in the test suite:
> 
> FAIL powerpc/powermac_newworld.test arch_get_kernel want 
> 'linux-image-powerpc', got 'linux-image-powerpc-smp linux-image-powerpc'
> powerpc: 113 passes, 1 failures.
> 
> (https://buildd.debian.org/status/fetch.php?pkg=base-installer&arch=powerpc&ver=1.129&stamp=1355061770)
> 
> It looks to me like this is just a matter of registering the smp
> flavour as one of the possible value for kernel-2.6 in
> kernel/tests/powerpc/powermac_newworld.test (it's already known as a
> usable flavour anyway), but a confirmation would be nice.
> 

Hi Cyril,

The trouble was that there was no support for this kind of processor(s)
detection in the test suite. I just did a commit to base-installer with
test suite support for Open Firmware /cpus directory and added a smp
test. Now the package builds fine and passes all tests in my pbuilder.

M






Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to