Ubuntu
libvirt package

Merge lp://qastaging/~serge-hallyn/ubuntu/natty/libvirt/fix-ppc-ftbfs-xen into lp://qastaging/ubuntu/natty/libvirt

  1. Natty (11.04)
  2. fix-ppc-ftbfs-xen
  3. Merge into natty
Proposed by Serge Hallyn
Status: Merged
Merge reported by: Jamie Strandboge
Merged at revision: not available
Proposed branch: lp://qastaging/~serge-hallyn/ubuntu/natty/libvirt/fix-ppc-ftbfs-xen
Merge into: lp://qastaging/ubuntu/natty/libvirt
Diff against target: 535 lines (+458/-4)
8 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/9022-build-cleanup-declaration-of-xen-tests.patch/tests/Makefile.am (+392/-0)
.pc/applied-patches (+1/-0)
debian/changelog (+7/-0)
debian/patches/9022-build-cleanup-declaration-of-xen-tests.patch (+49/-0)
debian/patches/series (+1/-0)
tests/Makefile.am (+6/-4)
To merge this branch: bzr merge lp://qastaging/~serge-hallyn/ubuntu/natty/libvirt/fix-ppc-ftbfs-xen
Reviewer Review Type Date Requested Status
Jamie Strandboge Approve
Review via email: mp+40764@code.qastaging.launchpad.net

Description of the change

This version succeeded in compiling on powerpc in a chroot. 2 tests
did fail in the end, but they looked like they might have been due to
running in a chroot.

To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Thanks for the patch. The file tests/Makefile.am was added outside of debian/patches. Based on the commit mentioned in 9022-build-cleanup-declaration-of-xen-tests.patch, this should not be part of this patch.

review: Needs Fixing
Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

@Jamie - I don't understand. What shouldn't be there? Do you mean
that the patch should be against Makefile.in instead of Makefile.am?

Note that Makefile.am is there all along, so tests/Makefile.am must
exist. And so long as we are keeping the quilt patches applied in the
bzr tree, the .pc/9022*/tests/Makefile.am file will exist as well.

Revision history for this message
Jamie Strandboge (jdstrand) wrote :

@Serge - when I did 'bzr merge', this is what I see:
$ bzr merge lp:~serge-hallyn/ubuntu/natty/libvirt/fix-ppc-ftbfs-xen
+N .pc/.quilt_patches
+N .pc/.quilt_series
+N .pc/9022-build-cleanup-declaration-of-xen-tests.patch/
+N .pc/9022-build-cleanup-declaration-of-xen-tests.patch/.timestamp
+N .pc/9022-build-cleanup-declaration-of-xen-tests.patch/tests/
+N .pc/9022-build-cleanup-declaration-of-xen-tests.patch/tests/Makefile.am
+N debian/patches/9022-build-cleanup-declaration-of-xen-tests.patch
 M .pc/applied-patches
 M debian/changelog
 M debian/patches/series
 M tests/Makefile.am
All changes applied successfully.

tests/Makefile.am is modified outside of the debian/ directory, and it should not be.

Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Oh, wait a minute, I misread 9022-build-cleanup-declaration-of-xen-tests.patch. Nevermind. :)

Revision history for this message
Jamie Strandboge (jdstrand) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: