[Libguestfs] [PATCH 1/3] builder: Don't use configure to generate test-index file.

Richard W.M. Jones rjones at redhat.com
Thu Apr 3 07:59:46 UTC 2014


The file contained no replacement patterns so generating it
with configure did nothing.
---
 .gitignore            |  1 -
 builder/Makefile.am   |  1 +
 builder/test-index    | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
 builder/test-index.in | 66 ---------------------------------------------------
 configure.ac          |  1 -
 5 files changed, 67 insertions(+), 68 deletions(-)
 create mode 100644 builder/test-index
 delete mode 100644 builder/test-index.in

diff --git a/.gitignore b/.gitignore
index 1d3311a..dc8aaf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,6 @@ Makefile.in
 /builder/stamp-virt-builder.pod
 /builder/stamp-virt-index-validate.pod
 /builder/test-config/virt-builder/repos.d/test-index.conf
-/builder/test-index
 /builder/test-website/virt-builder/repos.d/libguestfs.conf
 /builder/virt-builder
 /builder/virt-builder.1
diff --git a/builder/Makefile.am b/builder/Makefile.am
index 3be547c..92a09bc 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -29,6 +29,7 @@ AM_CFLAGS = \
 EXTRA_DIST = \
 	$(SOURCES) \
 	libguestfs.gpg \
+	test-index \
 	virt-builder.pod \
 	virt-index-validate.pod \
 	test-virt-builder.sh \
diff --git a/builder/test-index b/builder/test-index
new file mode 100644
index 0000000..3efebc4
--- /dev/null
+++ b/builder/test-index
@@ -0,0 +1,66 @@
+[phony-debian]
+name=Phony Debian
+arch=x86_64
+file=debian.xz
+format=raw
+size=536870912
+expand=/dev/sda2
+lvexpand=/dev/debian/root
+notes=Phony Debian look-alike used for testing.
+
+[phony-fedora]
+name=Phony Fedora
+arch=x86_64
+file=fedora.xz
+format=raw
+size=1073741824
+expand=/dev/sda2
+lvexpand=/dev/VG/Root
+notes=Phony Fedora look-alike used for testing.
+
+[phony-fedora-qcow2]
+name=Phony Fedora qcow2
+arch=x86_64
+file=fedora.qcow2.xz
+format=qcow2
+size=1073741824
+expand=/dev/sda2
+lvexpand=/dev/VG/Root
+notes=Phony Fedora look-alike used for testing.
+
+[phony-fedora-qcow2-uncompressed]
+name=Phony Fedora qcow2 uncompressed
+arch=x86_64
+file=fedora.qcow2
+format=qcow2
+size=1073741824
+expand=/dev/sda2
+lvexpand=/dev/VG/Root
+notes=Phony Fedora look-alike used for testing.
+
+[phony-fedora-no-format]
+name=Phony Fedora
+arch=x86_64
+file=fedora.qcow2.xz
+size=1073741824
+expand=/dev/sda2
+lvexpand=/dev/VG/Root
+notes=Phony Fedora look-alike used for testing.
+
+[phony-ubuntu]
+name=Phony Ubuntu
+arch=x86_64
+file=ubuntu.xz
+format=raw
+size=536870912
+expand=/dev/sda2
+notes=Phony Ubuntu look-alike used for testing.
+
+[phony-windows]
+name=Phony Windows
+arch=x86_64
+file=windows.xz
+format=raw
+size=536870912
+expand=/dev/sda2
+notes=Phony Windows look-alike used for testing.
diff --git a/builder/test-index.in b/builder/test-index.in
deleted file mode 100644
index 3efebc4..0000000
--- a/builder/test-index.in
+++ /dev/null
@@ -1,66 +0,0 @@
-[phony-debian]
-name=Phony Debian
-arch=x86_64
-file=debian.xz
-format=raw
-size=536870912
-expand=/dev/sda2
-lvexpand=/dev/debian/root
-notes=Phony Debian look-alike used for testing.
-
-[phony-fedora]
-name=Phony Fedora
-arch=x86_64
-file=fedora.xz
-format=raw
-size=1073741824
-expand=/dev/sda2
-lvexpand=/dev/VG/Root
-notes=Phony Fedora look-alike used for testing.
-
-[phony-fedora-qcow2]
-name=Phony Fedora qcow2
-arch=x86_64
-file=fedora.qcow2.xz
-format=qcow2
-size=1073741824
-expand=/dev/sda2
-lvexpand=/dev/VG/Root
-notes=Phony Fedora look-alike used for testing.
-
-[phony-fedora-qcow2-uncompressed]
-name=Phony Fedora qcow2 uncompressed
-arch=x86_64
-file=fedora.qcow2
-format=qcow2
-size=1073741824
-expand=/dev/sda2
-lvexpand=/dev/VG/Root
-notes=Phony Fedora look-alike used for testing.
-
-[phony-fedora-no-format]
-name=Phony Fedora
-arch=x86_64
-file=fedora.qcow2.xz
-size=1073741824
-expand=/dev/sda2
-lvexpand=/dev/VG/Root
-notes=Phony Fedora look-alike used for testing.
-
-[phony-ubuntu]
-name=Phony Ubuntu
-arch=x86_64
-file=ubuntu.xz
-format=raw
-size=536870912
-expand=/dev/sda2
-notes=Phony Ubuntu look-alike used for testing.
-
-[phony-windows]
-name=Phony Windows
-arch=x86_64
-file=windows.xz
-format=raw
-size=536870912
-expand=/dev/sda2
-notes=Phony Windows look-alike used for testing.
diff --git a/configure.ac b/configure.ac
index 2b92058..70d5afc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1614,7 +1614,6 @@ AC_CONFIG_FILES([Makefile
                  builder/Makefile
                  builder/libguestfs.conf
                  builder/test-config/virt-builder/repos.d/test-index.conf
-                 builder/test-index
                  builder/test-website/virt-builder/repos.d/libguestfs.conf
                  builder/website/Makefile
                  cat/Makefile
-- 
1.8.5.3




More information about the Libguestfs mailing list