On Tue, Nov 21, 2006 at 08:35:38PM +0000, Robin Bowes wrote: > Daniel P. Berrange wrote: > > If you want to build a new kernel RPM for testing this patch something along > > the lines of the following should work. > > > > 1. Extract the patch file from mercurial > > > > hg clone http://xenbits.xensource.com/xen-unstable.hg > > cd xen-unstable.hg > > hg log --patch -r 0c0ef61de06b > ~/rpm/SOURCES/large-disks.patch > > > > 2. Grab the latest kernel src.rpm file & install it locally > > > > rpm -ivh kernel-XXXXXX.src.rpm > > cd ~/rpm/SPECS > > > > 3. Edit the kenrel.spec file, incrementing release tag, > > > > Release: %{release}.1xen2tbtest > > > > Add > > > > Patch30000: large-disks.patch > > > > And in the %setup section > > > > %patch30000 -p1 > > > > 4. Rebuild the Xen kernel for i686 > > > > rpmbuild --target i686 --define 'buildup 0' --define 'buildsmp 0' > > --define 'buildkdump 0' -ba kernel-2.6.spec > > I did this, but the patch failed: > > Patch #30000 (large-disks.patch): > + patch -p1 -s > The text leading up to this was: > -------------------------- > |changeset: 12496:0c0ef61de06b > |user: kfraser@xxxxxxxxxxxxxxxxxxxxx > |date: Tue Nov 21 10:16:58 2006 +0000 > |summary: [BLK] Handle block devices with more than 2^32 sectors. > | > |diff -r 82ba3c086e6c -r 0c0ef61de06b > linux-2.6-xen-sparse/drivers/xen/blkback/common.h > |--- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h Tue Nov > 21 09:26:43 2006 +0000 > |+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h Tue Nov > 21 10:16:58 2006 +0000 > -------------------------- > File to patch: > > To be honest, it was creating the patch that I would struggle with - I'm > OK on modifying spec files,etc. > > Any idea what's wrong? Wrong patch stripping I think - it should actually be '-p2' instead of '-p1'. Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=| -- Fedora-xen mailing list Fedora-xen@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-xen