New kernel branch for XO-1 and XO-1.5 development

[Martin Dengler]

On Wed, Jul 08, 2009 at 01:43:31PM -0700, Deepak Saxena wrote:
> 
> I've spent some time merging the XO-1 and XO-1.5 kernels into a new
> branch and made some tweaks to the in-kernel RPM build scripts.

Very cool, thanks.  I've built new kernel rpms to a yum repo:
http://dev.laptop.org/~mdengler/xo-1

But...

> To differentiate between an XO-1 and XO-1.5 RPM, the generation
> name is now inserted into the RPM name. For example:
> 
> kernel-2.6.30_xo1-20090708.1.olpc.1fd3a66.i586.rpm   <- XO-1 RPM
> kernel-2.6.30_xo1.5-20090708.1.olpc.1fd3a66.i586.rpm <- XO-1.5 RPM

Is this going to cause problems?  When I try to install the kernel
(via livecd-creator), I get (apologies for the rubbish formatting):

Error creating Live CD : Unable to install: [('file
/lib/firmware/kaweth/new_code.bin conflicts between attempted installs
of kernel-2.6.30_xo1-20090709.1.olpc.d990c35.i586 and
kernel-firmware-2.6.29.5-191.fc11.noarch', (6,
'/lib/firmware/kaweth/new_code.bin', 0L)), ('file
/lib/firmware/kaweth/new_code_fix.bin conflicts between attempted
installs of kernel-2.6.30_xo1-20090709.1.olpc.d990c35.i586 and
kernel-firmware-2.6.29.5-191.fc11.noarch', (6,
'/lib/firmware/kaweth/new_code_fix.bin', 0L)), ('file
/lib/firmware/kaweth/trigger_code.bin conflicts between attempted
installs of kernel-2.6.30_xo1-20090709.1.olpc.d990c35.i586 and
kernel-firmware-2.6.29.5-191.fc11.noarch', (6,
'/lib/firmware/kaweth/trigger_code.bin', 0L)), ('file
/lib/firmware/kaweth/trigger_code_fix.bin conflicts between attempted
installs of kernel-2.6.30_xo1-20090709.1.olpc.d990c35.i586 and
kernel-firmware-2.6.29.5-191.fc11.noarch', (6,
'/lib/firmware/kaweth/trigger_code_fix.bin', 0L))]


> Enjoy,
> ~Deepak

Thanks again.

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.laptop.org/pipermail/devel/attachments/20090709/2084f210/attachment.sig>