[Libguestfs] [PATCH 5/6] contrib: move p2v files within p2v
---
Makefile.am | 5 -----
p2v/Makefile.am | 5 +++++
{contrib/p2v => p2v/contrib}/aux-scripts/do-build.sh | 0
{contrib/p2v => p2v/contrib}/build-p2v-iso.sh | 0
...HEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch | 0
.../0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch | 0
{contrib/p2v => p2v/contrib}/test-p2v-iso.sh | 0
7 files changed, 5 insertions(+), 5 deletions(-)
rename {contrib/p2v => p2v/contrib}/aux-scripts/do-build.sh (100%)
rename {contrib/p2v => p2v/contrib}/build-p2v-iso.sh (100%)
rename {contrib/p2v =>
p2v/contrib}/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch
(100%)
rename {contrib/p2v =>
p2v/contrib}/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch (100%)
rename {contrib/p2v => p2v/contrib}/test-p2v-iso.sh (100%)
diff --git a/Makefile.am b/Makefile.am
index b5f33f62b..e76ea6daf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -229,11 +229,6 @@ EXTRA_DIST = \
contrib/intro/vmm-icons-t.png \
contrib/intro/vmm-icons.png \
contrib/intro/win7.xml \
- contrib/p2v/aux-scripts/do-build.sh \
- contrib/p2v/build-p2v-iso.sh \
- contrib/p2v/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch \
- contrib/p2v/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch \
- contrib/p2v/test-p2v-iso.sh \
contrib/README \
contrib/visualize-alignment/.gitignore \
contrib/visualize-alignment/guestfish-add-mount.qtr \
diff --git a/p2v/Makefile.am b/p2v/Makefile.am
index 20e00fcc0..1545490d2 100644
--- a/p2v/Makefile.am
+++ b/p2v/Makefile.am
@@ -26,6 +26,11 @@ BUILT_SOURCES = \
EXTRA_DIST = \
$(BUILT_SOURCES) \
$(TESTS) $(SLOW_TESTS) \
+ contrib/aux-scripts/do-build.sh \
+ contrib/build-p2v-iso.sh \
+ contrib/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch \
+ contrib/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch \
+ contrib/test-p2v-iso.sh \
dependencies.m4 \
generate-p2v-authors.pl \
generate-p2v-config.pl \
diff --git a/contrib/p2v/aux-scripts/do-build.sh b/p2v/contrib/aux-scripts/do-build.sh
similarity index 100%
rename from contrib/p2v/aux-scripts/do-build.sh
rename to p2v/contrib/aux-scripts/do-build.sh
diff --git a/contrib/p2v/build-p2v-iso.sh b/p2v/contrib/build-p2v-iso.sh
similarity index 100%
rename from contrib/p2v/build-p2v-iso.sh
rename to p2v/contrib/build-p2v-iso.sh
diff --git
a/contrib/p2v/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch
b/p2v/contrib/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch
similarity index 100%
rename from
contrib/p2v/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch
rename to
p2v/contrib/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch
diff --git a/contrib/p2v/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch
b/p2v/contrib/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch
similarity index 100%
rename from contrib/p2v/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch
rename to p2v/contrib/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch
diff --git a/contrib/p2v/test-p2v-iso.sh b/p2v/contrib/test-p2v-iso.sh
similarity index 100%
rename from contrib/p2v/test-p2v-iso.sh
rename to p2v/contrib/test-p2v-iso.sh
--
2.21.0