Comment 66 for bug 378240

Revision history for this message
Boris Derzhavets (bderzhavets) wrote : Re: Please merge xen-3.4 (3.4.0-2) from debian unstable

In your output:-
-----------------------------------------------------------------------------
patching file debian/patches-4.0.1rc1/series
patching file debian/patches-4.0.1rc1/grub2-fix.patch
patching file debian/patches-4.0.1rc1/use-python-2.6.diff
patching file debian/patches-4.0.1rc1/misc-docs.diff
Info: ZFS & VHD patching
1 out of 1 hunk FAILED -- saving rejects to file
tools/libfsimage/Rules.mk.rej
1 out of 1 hunk FAILED -- saving rejects to file
------------------------------------------------------------------------------
On the other hand , where the first echo creating subfolder
$WRKD/$DEBDIRNAM/debian disappeared ?
This one =>
echo Info: Patch with debian diff $UDIFNAME ...
   zcat $STARTDIR/$UDIFNAME | patch -p1
echo "Info: ZFS & VHD patching"
        patch -p1 -s -i $WRKD/fsimage-zfs-24.patch1;
        patch -p1 -s -i $WRKD/blktap2_ctrl_func.patch-xen-testing-4.x.patch1;