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

[Martin Dengler]

On Thu, Jul 09, 2009 at 03:47:32PM +0100, Martin Dengler wrote:
> > 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

The clue is in the error message.  It seems my kernel-firmware commit
(which you merged) was lost in the split of the .spec files.

I'll forward a patch.

> > Enjoy,
> > ~Deepak
> 
> Thanks again.
> 
> Martin

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/6edbd661/attachment.sig>