| Re: [andrex@alumni.utexas.net: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linu [message #4539 is a reply to message #4537] |
Thu, 13 July 2006 21:03   |
Ola Lundqvist
Messages: 15
Registered: April 2006
|
Junior Member |
|
|
Hi
On Fri, Jul 14, 2006 at 12:56:15AM +0400, Kir Kolyshkin wrote:
> Where can we get the differences from "vanilla" 2.6.16 to Debian's 2.6.16?
ftp://ftp.se.debian.org/debian/pool/main/l/linux-2.6.16
The best way is to install the linux-source-2.6.16_2.6.16-16_all.deb pacakge,
unpack the /usr/src/linux-2.6.16.tar.bz2 file, and diff the tree against
the vanilla kernel.
However I think the following file in that directory give the same output:
linux-2.6.16_2.6.16-16.diff.gz
Regards,
// Ola
> Ola Lundqvist wrote:
> > forwarded 377707 devel@openvz.org
> > tags 377707 + upstream
> > thanks
> >
> > Hi
> >
> > I have got the following bugreport and it seems that the patch provided do not
> > apply cleanly against the Debian kernel. Can you help me with this?
> >
> > Regards,
> >
> > // Ola
> >
> > ----- Forwarded message from Andrew Schulman <andrex@alumni.utexas.net> -----
> >
> > Envelope-to: ola@opalsys.net
> > Delivery-date: Mon, 10 Jul 2006 21:52:54 +0200
> > Subject: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linux-source-2.6.16
> > Reply-To: Andrew Schulman <andrex@alumni.utexas.net>,
> > 377707@bugs.debian.org
> > Resent-From: Andrew Schulman <andrex@alumni.utexas.net>
> > Resent-To: debian-bugs-dist@lists.debian.org
> > Resent-CC: Ola Lundqvist <opal@debian.org>
> > Resent-Date: Mon, 10 Jul 2006 19:48:54 UTC
> > Resent-Message-ID: <handler.377707.B.115255997716772@bugs.debian.org>
> > X-Debian-PR-Message: report 377707
> > X-Debian-PR-Package: kernel-patch-openvz
> > X-Debian-PR-Keywords:
> > From: Andrew Schulman <andrex@alumni.utexas.net>
> > To: Debian Bug Tracking System <submit@bugs.debian.org>
> > X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
> > (1.212-2003-09-23-exp) on spohr.debian.org
> > X-Spam-Level:
> > X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE,
> > RCVD_IN_SORBS autolearn=no version=2.60-bugs.debian.org_2005_01_02
> > Resent-Sender: Debian BTS <debbugs@bugs.debian.org>
> > Resent-Date: Mon, 10 Jul 2006 12:49:06 -0700
> > X-Spam-Score: 1.0 (+)
> > X-Spamcheck-provider: Checked for spam by opalsys.net, postmaster@opalsys.net
> >
> > Package: kernel-patch-openvz
> > Version: 026test015-1
> > Severity: important
> >
> > The supplied patch doesn't apply cleanly to Debian kernel source:
> >
> > # cd /usr/src
> > # rm -rf linux-source-2.6.16
> > # tar -jxf linux-source-2.6.16.tar.bz2
> > # cd linux-source-2.6.16
> > # make-kpkg --added-patches openvz configure
> > exec make -f /usr/share/kernel-package/ruleset/minimal.mk debian KPKG_SELECTED_PATCHES="openvz"
> > ====== making target minimal_debian [new prereqs: ]======
> > This is kernel package version .
> > test -d debian || mkdir debian
> > test ! -e stamp-building || rm -f stamp-building
> > test -f debian/control || sed -e 's/=V/2.6.16/g' \
> > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \
> > -e 's/=SA//g' -e 's/=L/ /g' \
> > -e 's/=I//g' \
> > -e 's/=CV/2.6/g' \
> > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \
> > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \
> > /usr/share/kernel-package/Control > debian/control
> > test -f debian/changelog || sed -e 's/=V/2.6.16/g' \
> > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \
> > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \
> > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \
> > /usr/share/kernel-package/changelog > debian/changelog
> > install -p -m 755 /usr/share/kernel-package/rules debian/rules
> > for file in ChangeLog Control Control.bin86 config templates.in rules; do \
> > cp -f /usr/share/kernel-package/$file ./debian/; \
> > done
> > for dir in Config docs examples ruleset scripts pkg po; do \
> > cp -af /usr/share/kernel-package/$dir ./debian/; \
> > done
> > test -d ./debian/stamps || mkdir debian/stamps
> > exec debian/rules KPKG_SELECTED_PATCHES="openvz" configure
> >
> > ====== making target CONFIG-common [new prereqs: testdir]======
> >
> > ====== making target debian/stamp-conf [new prereqs: ]======
> > # work around idiocy in recent kernel versions
> > test ! -e scripts/package/builddeb || \
> > mv -f scripts/package/builddeb scripts/package/builddeb.dist
> > test ! -e scripts/package/Makefile || \
> > (mv -f scripts/package/Makefile scripts/package/Makefile.dist && \
> > (echo "# Dummy file "; echo "help:") > scripts/package/Makefile)
> > test -d debian || mkdir ./debian
> > test ! -e stamp-building || rm -f stamp-building
> > test ! -f ./debian || test -f stamp-debian || test -f debian/official || \
> > (rm -rf ./debian && mkdir ./debian)
> > test ! -f applied_patches || rm -f applied_patches
> > for patch in /usr/src/kernel-patches/all/apply/openvz ; do \
> > if test -x $patch; then \
> > if $patch; then \
> > echo "Patch $patch processed fine"; \
> > echo "$patch" >> applied_patches; \
> > else \
> > echo "Patch $patch failed."; \
> > echo "Hit return to Continue"; \
> > read ans; \
> > fi; \
> > fi; \
> > done
> > START applying openvz patch (OpenVZ kernel patch for virtual server support)
> > Testing whether "OpenVZ kernel patch for virtual server support" patch for 2.6.16 applies (dry run):
> > 2 out of 2 hunks FAILED -- saving rejects to file Documentation/dvb/get_dvb_firmware.rej
> > 1 out of 2 hunks FAILED -- saving rejects to file arch/alpha/kernel/setup.c.rej
> > 3 out of 3 hunks FAILED -- saving rejects to file arch/alpha/kernel/smp.c.rej
> > 2 out of 2 hunks FAILED -- saving rejects to file arch/alpha/lib/strncpy.S.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/apm.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/p4-clockmod.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/speedstep-smi.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/dmi_scan.c.rej
> > 3 out of 3 hunks FAILED -- saving rejects to file arch/i386/kernel/vm86.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/kernel/m32r_ksyms.c.rej
> > 3 out of 3 hunks FAILED -- saving rejects to file arch/m32r/kernel/setup.c.rej
> > 7 out of 7 hunks FAILED -- saving rejects to file arch/m32r/kernel/smpboot.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/lib/Makefile.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/kernel/branch.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/mm/c-r4k.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/pci_64.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/setup_64.c.rej
> > 2 out of 3 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_32.c.rej
> > 2 out of 2 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_64.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/platforms/powermac/setup.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/ia32/Makefile.rej
> > 4 out of 8 hunks FAILED -- saving rejects to file arch/x86_64/kernel/entry.S.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/kernel/pci-gart.c.rej
> > 2 out of 6 hunks FAILED -- saving rejects to file arch/x86_64/kernel/process.c.rej
> > 3 out of 7 hunks FAILED -- saving rejects to file arch/x86_64/kernel/traps.c.rej
> > 3 out of 5 hunks FAILED -- saving rejects to file block/elevator.c.rej
> > 2 out of 3 hunks FAILED -- saving rejects to file block/genhd.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file block/ll_rw_blk.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/cpu.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/firmware_class.c.rej
> > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/node.c.rej
> > 3 out of 5 hunks FAILED -- saving rejects to file drivers/block/cciss.c.rej
> > 4 out of 4 hunks FAILED -- saving rejects to file drivers/block/ub.c.rej
> > 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/agp/efficeon-agp.c.rej
> > 1 out
...
|
|
|
|
OpenVZ Forum
Members
Search
Help
Register
Login
Home
