12:53 p.m.
* src/Makefile.am (EXTRA_DIST): Add THREADS.txt.
---
I noticed this while working on back-porting a patch to RHEL-6 - the
qemu tree in my git repository had more files than were in the
unpacked 0.8.1 tarball.
src/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 889de8e..4c9fdf8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -588,7 +588,8 @@ augeas_DATA += qemu/libvirtd_qemu.aug
augeastest_DATA += qemu/test_libvirtd_qemu.aug
endif
-EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug qemu/test_libvirtd_qemu.aug
+EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \
+ qemu/test_libvirtd_qemu.aug qemu/THREADS.txt
if WITH_LXC
--
1.7.0.1
2:27 p.m.
Eric Blake wrote:
* src/Makefile.am (EXTRA_DIST): Add THREADS.txt.
---
I noticed this while working on back-porting a patch to RHEL-6 - the
qemu tree in my git repository had more files than were in the
unpacked 0.8.1 tarball.
src/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 889de8e..4c9fdf8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -588,7 +588,8 @@ augeas_DATA += qemu/libvirtd_qemu.aug
augeastest_DATA += qemu/test_libvirtd_qemu.aug
endif
-EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug qemu/test_libvirtd_qemu.aug
+EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \
+ qemu/test_libvirtd_qemu.aug qemu/THREADS.txt
Obviously correct.
Though if you add THREADS.txt, maybe you want to add
daemon/THREADING.txt, too:
$ git ls-files|grep THREAD
daemon/THREADING.txt
src/qemu/THREADS.txt
$ grep THREA daemon/M*.am
[Exit 1]
$
ACK either way.
5:15 p.m.
On 05/19/2010 01:27 PM, Jim Meyering wrote:
Eric Blake wrote:
> * src/Makefile.am (EXTRA_DIST): Add THREADS.txt.
> ---
>
> I noticed this while working on back-porting a patch to RHEL-6 - the
> qemu tree in my git repository had more files than were in the
> unpacked 0.8.1 tarball.
>
Obviously correct.
Though if you add THREADS.txt, maybe you want to add
daemon/THREADING.txt, too:
$ git ls-files|grep THREAD
daemon/THREADING.txt
src/qemu/THREADS.txt
$ grep THREA daemon/M*.am
[Exit 1]
$
ACK either way.
Pushing soon with the addition of daemon/THREADS.txt.
A 'make distcheck' found one other bug; which I will be fixing as
obvious shortly in an independent patch:
tests/qemuhelpdata/qemu-kvm-0.12.3 needs to be in the tarball.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
5:19 p.m.
New subject: [libvirt] [PATCH] build: distribute missing file
Commit f30ccb2458829 was incomplete.
* .gitignore: Ignore intermediate directory during failed 'make
distcheck'.
* tests/Makefile.am (qemuhelpdata): Distribute new file.
---
Pushing as obvious, once a successful 'make distcheck' completes
a few minutes from when I write this.
.gitignore | 1 +
tests/Makefile.am | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4faf384..39ed671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
.git-module-status
.sc-start-sc_*
/GNUmakefile
+/libvirt-[0-9]*
/maint.mk
ABOUT-NLS
COPYING
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b5e09e3..c5e52e3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,8 @@ qemuhelpdata = \
qemu-0.10.5 \
qemu-0.12.1 \
qemu-kvm-0.10.5 \
- qemu-kvm-0.11.0-rc2
+ qemu-kvm-0.11.0-rc2 \
+ qemu-kvm-0.12.3
EXTRA_DIST = \
oomtrace.pl \
--
1.7.0.1
5:42 p.m.
New subject: [libvirt] [PATCH] build: distribute missing file
2010/5/20 Eric Blake <eblake(a)redhat.com>:
Commit f30ccb2458829 was incomplete.
* .gitignore: Ignore intermediate directory during failed 'make
distcheck'.
* tests/Makefile.am (qemuhelpdata): Distribute new file.
---
Pushing as obvious, once a successful 'make distcheck' completes
a few minutes from when I write this.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b5e09e3..c5e52e3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,8 @@ qemuhelpdata = \
qemu-0.10.5 \
qemu-0.12.1 \
qemu-kvm-0.10.5 \
- qemu-kvm-0.11.0-rc2
+ qemu-kvm-0.11.0-rc2 \
+ qemu-kvm-0.12.3
EXTRA_DIST = \
oomtrace.pl \
--
1.7.0.1
Maybe we should just apply this patch instead and distribute the
qemuhelpdata directory content like every other directory in the tests
directory. Or is there any special reason for treating qemuhelpdata
differently, making it more error prone?
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b5e09e3..802a62f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,15 +39,6 @@ LDADDS = \
$(LIBSOCKET) \
$(COVERAGE_LDFLAGS)
-qemuhelpdata = \
- kvm-74 \
- kvm-86 \
- qemu-0.9.1 \
- qemu-0.10.5 \
- qemu-0.12.1 \
- qemu-kvm-0.10.5 \
- qemu-kvm-0.11.0-rc2
-
EXTRA_DIST = \
oomtrace.pl \
test-lib.sh \
@@ -75,7 +66,7 @@ EXTRA_DIST = \
nwfilterxml2xmlout \
nwfilterxml2xmlin \
nwfilterschematest \
- $(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
+ qemuhelpdata
noinst_PROGRAMS = virshtest conftest \
nodeinfotest statstest qparamtest
Matthias
6:09 p.m.
New subject: [libvirt] [PATCH] build: distribute missing file
On 05/19/2010 04:42 PM, Matthias Bolte wrote:
> @@ -46,7 +46,8 @@ qemuhelpdata = \
> qemu-0.10.5 \
> qemu-0.12.1 \
> qemu-kvm-0.10.5 \
> - qemu-kvm-0.11.0-rc2
> + qemu-kvm-0.11.0-rc2 \
> + qemu-kvm-0.12.3
>
> EXTRA_DIST = \
> oomtrace.pl \
> --
> 1.7.0.1
Maybe we should just apply this patch instead and distribute the
qemuhelpdata directory content like every other directory in the tests
directory. Or is there any special reason for treating qemuhelpdata
differently, making it more error prone?
My patch is the minimal needed for backporting to 0.8.1 sources, but
your patch is indeed better for mainline.
ACK.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
1:09 p.m.
New subject: [libvirt] [PATCH] build: distribute missing file
2010/5/20 Eric Blake <eblake(a)redhat.com>:
On 05/19/2010 04:42 PM, Matthias Bolte wrote:
>> @@ -46,7 +46,8 @@ qemuhelpdata = \
>> qemu-0.10.5 \
>> qemu-0.12.1 \
>> qemu-kvm-0.10.5 \
>> - qemu-kvm-0.11.0-rc2
>> + qemu-kvm-0.11.0-rc2 \
>> + qemu-kvm-0.12.3
>>
>> EXTRA_DIST = \
>> oomtrace.pl \
>> --
>> 1.7.0.1
>
> Maybe we should just apply this patch instead and distribute the
> qemuhelpdata directory content like every other directory in the tests
> directory. Or is there any special reason for treating qemuhelpdata
> differently, making it more error prone?
My patch is the minimal needed for backporting to 0.8.1 sources, but
your patch is indeed better for mainline.
ACK.
Okay, pushed it.
Matthias
5300
days inactive
5302
days old
6 comments
3 participants
participants (3)
-
Eric Blake -
Jim Meyering -
Matthias Bolte