[libvirt] [PATCH 0/2] First round of out-of-tree build fixes
Some low hanging fruit here. There are more serious issues that I yet have to figure out: 1) docs/ is broken. Just open any site from your build directory. Our main.js lives in the source dir but we are trying to load it relative to build dir 2) Generation of acl.html is broken - it assumes aclperms.htmlinc file lives under $srcdir which is not true anymore => page that's generated is useless 3) I've tried to update Gentoo live ebuild, but it failed to compile: Making all in src make[2]: Entering directory '/var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999_build/src' ... /usr/bin/perl /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/genpolkit.pl < /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/viraccessperm.h > access/org.libvirt.api.policy || rm -f access/org.libvirt.api.policy /usr/bin/perl -w /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/remote/remote_protocol.x \
access/viraccessapicheck.h /bin/sh: access/org.libvirt.api.policy: No such file or directory
The libvirt-9999_build/src/access dir doesn't exist (I'm surprised it wasn't created automatically by autotools since src/ was). I'll have to investigate further. Michal Prívozník (2): src: Make check-aclrules work again make check-driverimpls work again src/Makefile.am | 7 ++----- src/bhyve/Makefile.inc.am | 4 ++-- src/esx/Makefile.inc.am | 2 +- src/hyperv/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 4 ++-- src/libxl/Makefile.inc.am | 4 ++-- src/lxc/Makefile.inc.am | 4 ++-- src/network/Makefile.inc.am | 4 ++-- src/node_device/Makefile.inc.am | 8 ++++---- src/nwfilter/Makefile.inc.am | 4 ++-- src/openvz/Makefile.inc.am | 2 +- src/phyp/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 4 ++-- src/remote/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 4 ++-- src/storage/Makefile.inc.am | 4 ++-- src/test/Makefile.inc.am | 2 +- src/vbox/Makefile.inc.am | 4 ++-- src/vmware/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 4 ++-- 20 files changed, 35 insertions(+), 38 deletions(-) -- 2.23.0
Previously we generated all source files into $srcdir which is no longer true. This means that we can't just blindly prepend each source file with $srcdir. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 2 +- src/bhyve/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 2 +- src/libxl/Makefile.inc.am | 2 +- src/lxc/Makefile.inc.am | 2 +- src/network/Makefile.inc.am | 2 +- src/node_device/Makefile.inc.am | 2 +- src/nwfilter/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 2 +- src/storage/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4a0c121a7d..b3a6be04ff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -350,7 +350,7 @@ check-driverimpls: check-aclrules: $(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \ $(REMOTE_PROTOCOL) \ - $(addprefix $(srcdir)/,$(filter-out /%,$(STATEFUL_DRIVER_SOURCE_FILES))) + $(STATEFUL_DRIVER_SOURCE_FILES) check-aclperms: $(AM_V_GEN)$(PERL) $(srcdir)/check-aclperms.pl \ diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 1fc100d5ab..e2b0454b31 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -23,7 +23,7 @@ BHYVE_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) EXTRA_DIST += $(BHYVE_DRIVER_SOURCES) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 5f22b90cb4..78951d4725 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -9,7 +9,7 @@ INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) EXTRA_DIST += \ $(INTERFACE_DRIVER_SOURCES) \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 8686e78a5d..0b4ce12c04 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -23,7 +23,7 @@ LIBXL_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) EXTRA_DIST += \ $(LIBXL_DRIVER_SOURCES) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 6aaec09fb4..bfb4969bdf 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -65,7 +65,7 @@ DRIVER_SOURCE_FILES += \ STATEFUL_DRIVER_SOURCE_FILES += \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ - $(LXC_DRIVER_SOURCES) + $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) EXTRA_DIST += \ $(LXC_DRIVER_SOURCES) \ $(LXC_MONITOR_PROTOCOL) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 58dd90c23b..93a4fc5928 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -17,7 +17,7 @@ NETWORK_LEASES_HELPER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) EXTRA_DIST += \ $(NETWORK_DRIVER_SOURCES) \ $(NETWORK_DRIVER_PLATFORM_INC) \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 2a8c437e7b..80dc4b5c46 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -22,7 +22,7 @@ DRIVER_SOURCE_FILES += \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ + $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) EXTRA_DIST += \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index c320b75f78..3a5fb09059 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -19,7 +19,7 @@ NWFILTER_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) if WITH_NWFILTER diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 3f3476b2b4..234b3fa3fa 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -74,7 +74,7 @@ QEMU_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) EXTRA_DIST += $(QEMU_DRIVER_SOURCES) if WITH_QEMU diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 3d77366d3c..eecc4d885e 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -12,7 +12,7 @@ SECRET_UTIL_SOURCES = \ DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) EXTRA_DIST += \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 1dfe48668f..434911f62c 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -89,7 +89,7 @@ STORAGE_HELPER_DISK_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) EXTRA_DIST += \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index acada11148..d3e6e17ab6 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -11,7 +11,7 @@ VZ_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) EXTRA_DIST += $(VZ_DRIVER_SOURCES) -- 2.23.0
On Mon, Nov 11, 2019 at 02:22:20PM +0100, Michal Privoznik wrote:
Previously we generated all source files into $srcdir which is no longer true. This means that we can't just blindly prepend each source file with $srcdir.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 2 +- src/bhyve/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 2 +- src/libxl/Makefile.inc.am | 2 +- src/lxc/Makefile.inc.am | 2 +- src/network/Makefile.inc.am | 2 +- src/node_device/Makefile.inc.am | 2 +- src/nwfilter/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 2 +- src/storage/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Previously we generated all source files into $srcdir which is no longer true. This means that we can't just blindly prepend each source file with $srcdir. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 5 +---- src/bhyve/Makefile.inc.am | 2 +- src/esx/Makefile.inc.am | 2 +- src/hyperv/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 2 +- src/libxl/Makefile.inc.am | 2 +- src/lxc/Makefile.inc.am | 2 +- src/network/Makefile.inc.am | 2 +- src/node_device/Makefile.inc.am | 6 +++--- src/nwfilter/Makefile.inc.am | 2 +- src/openvz/Makefile.inc.am | 2 +- src/phyp/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 2 +- src/remote/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 2 +- src/storage/Makefile.inc.am | 2 +- src/test/Makefile.inc.am | 2 +- src/vbox/Makefile.inc.am | 4 ++-- src/vmware/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 2 +- 20 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b3a6be04ff..1c137048a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -342,10 +342,7 @@ EXTRA_DIST += check-drivername.pl check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ - $(filter /%,$(DRIVER_SOURCE_FILES)) \ - $(filter $(srcdir)/%,$(DRIVER_SOURCE_FILES)) \ - $(addprefix $(srcdir)/,$(filter-out $(srcdir)/%, \ - $(filter-out /%,$(DRIVER_SOURCE_FILES)))) + $(DRIVER_SOURCE_FILES) check-aclrules: $(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \ diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index e2b0454b31..2a01a0e5a5 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -22,7 +22,7 @@ BHYVE_DRIVER_SOURCES = \ bhyve/bhyve_utils.h \ $(NULL) -DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) EXTRA_DIST += $(BHYVE_DRIVER_SOURCES) diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 6b10755b7e..78b80dfddf 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -48,7 +48,7 @@ ESX_DRIVER_EXTRA_DIST = \ ESX_GENERATED_STAMP = .esx_vi_generator.stamp -DRIVER_SOURCE_FILES += $(ESX_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(ESX_DRIVER_SOURCES)) EXTRA_DIST += \ $(ESX_DRIVER_SOURCES) \ diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index b71602c971..cdd3d9ab48 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -26,7 +26,7 @@ HYPERV_DRIVER_EXTRA_DIST = \ hyperv/hyperv_wmi_generator.py \ $(NULL) -DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(HYPERV_DRIVER_SOURCES)) EXTRA_DIST += \ $(HYPERV_DRIVER_SOURCES) \ diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 78951d4725..7353bc4c82 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -8,7 +8,7 @@ INTERFACE_DRIVER_SOURCES = \ INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c -DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) EXTRA_DIST += \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 0b4ce12c04..03b4d2fad4 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -22,7 +22,7 @@ LIBXL_DRIVER_SOURCES = \ libxl/libxl_migration.h \ $(NULL) -DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) EXTRA_DIST += \ $(LIBXL_DRIVER_SOURCES) \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index bfb4969bdf..5eb0bb9ad7 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -61,7 +61,7 @@ LXC_CONTROLLER_SOURCES = \ DRIVER_SOURCE_FILES += \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ - $(LXC_DRIVER_SOURCES) + $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 93a4fc5928..354c130f35 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -16,7 +16,7 @@ NETWORK_LEASES_HELPER_SOURCES = \ network/leaseshelper.c \ $(NULL) -DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) EXTRA_DIST += \ $(NETWORK_DRIVER_SOURCES) \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 80dc4b5c46..58077ebddd 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -16,9 +16,9 @@ NODE_DEVICE_DRIVER_UDEV_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ + $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_HAL_SOURCES)) \ + $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_UDEV_SOURCES)) \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 3a5fb09059..7b57df3813 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -18,7 +18,7 @@ NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_learnipaddr.h \ $(NULL) -DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am index 93bf3b9c96..7ceb4e6095 100644 --- a/src/openvz/Makefile.inc.am +++ b/src/openvz/Makefile.inc.am @@ -9,7 +9,7 @@ OPENVZ_DRIVER_SOURCES = \ openvz/openvz_util.h \ $(NULL) -DRIVER_SOURCE_FILES += $(OPENVZ_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(OPENVZ_DRIVER_SOURCES)) EXTRA_DIST += $(OPENVZ_DRIVER_SOURCES) diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am index 315f1c36ee..af556e8589 100644 --- a/src/phyp/Makefile.inc.am +++ b/src/phyp/Makefile.inc.am @@ -5,7 +5,7 @@ PHYP_DRIVER_SOURCES = \ phyp/phyp_driver.h \ $(NULL) -DRIVER_SOURCE_FILES += $(PHYP_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(PHYP_DRIVER_SOURCES)) EXTRA_DIST += $(PHYP_DRIVER_SOURCES) if WITH_PHYP diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 234b3fa3fa..54f47c9fba 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -73,7 +73,7 @@ QEMU_DRIVER_SOURCES = \ $(NULL) -DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) EXTRA_DIST += $(QEMU_DRIVER_SOURCES) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index f5de92be23..718d345b2d 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -140,7 +140,7 @@ REMOTE_DRIVER_PROTOCOL = \ DRIVER_SOURCE_FILES += \ $(REMOTE_DRIVER_GENERATED) \ - $(REMOTE_DRIVER_SOURCES) + $(addprefix $(srcdir)/,$(REMOTE_DRIVER_SOURCES)) EXTRA_DIST += \ $(REMOTE_DRIVER_PROTOCOL) \ diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index eecc4d885e..1ecea1ed4a 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -11,7 +11,7 @@ SECRET_UTIL_SOURCES = \ $(NULL) -DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) EXTRA_DIST += \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 434911f62c..588df60652 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -88,7 +88,7 @@ STORAGE_HELPER_DISK_SOURCES = \ storage/parthelper.c \ $(NULL) -DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) EXTRA_DIST += \ $(STORAGE_DRIVER_SOURCES) \ diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am index c20541a368..b84ab520bb 100644 --- a/src/test/Makefile.inc.am +++ b/src/test/Makefile.inc.am @@ -6,7 +6,7 @@ TEST_DRIVER_SOURCES = \ $(NULL) TEST_DRIVER_ASSETS = test/test-screenshot.png -DRIVER_SOURCE_FILES += $(TEST_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(TEST_DRIVER_SOURCES)) EXTRA_DIST += \ $(TEST_DRIVER_SOURCES) \ diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 551189c0f5..37da9b0aae 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -31,8 +31,8 @@ VBOX_DRIVER_EXTRA_DIST = \ $(NULL) DRIVER_SOURCE_FILES += \ - $(VBOX_DRIVER_SOURCES) \ - vbox/vbox_tmpl.c \ + $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ + $(srcdir)/vbox/vbox_tmpl.c \ $(NULL) EXTRA_DIST += \ diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am index 2c8c2d9884..10057343a6 100644 --- a/src/vmware/Makefile.inc.am +++ b/src/vmware/Makefile.inc.am @@ -7,7 +7,7 @@ VMWARE_DRIVER_SOURCES = \ vmware/vmware_conf.h \ $(NULL) -DRIVER_SOURCE_FILES += $(VMWARE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VMWARE_DRIVER_SOURCES)) EXTRA_DIST += $(VMWARE_DRIVER_SOURCES) diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index d3e6e17ab6..7dd20e8013 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -10,7 +10,7 @@ VZ_DRIVER_SOURCES = \ $(NULL) -DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) EXTRA_DIST += $(VZ_DRIVER_SOURCES) -- 2.23.0
On Mon, Nov 11, 2019 at 02:22:21PM +0100, Michal Privoznik wrote:
Previously we generated all source files into $srcdir which is no longer true. This means that we can't just blindly prepend each source file with $srcdir.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 5 +---- src/bhyve/Makefile.inc.am | 2 +- src/esx/Makefile.inc.am | 2 +- src/hyperv/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 2 +- src/libxl/Makefile.inc.am | 2 +- src/lxc/Makefile.inc.am | 2 +- src/network/Makefile.inc.am | 2 +- src/node_device/Makefile.inc.am | 6 +++--- src/nwfilter/Makefile.inc.am | 2 +- src/openvz/Makefile.inc.am | 2 +- src/phyp/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 2 +- src/remote/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 2 +- src/storage/Makefile.inc.am | 2 +- src/test/Makefile.inc.am | 2 +- src/vbox/Makefile.inc.am | 4 ++-- src/vmware/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 2 +- 20 files changed, 23 insertions(+), 26 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Mon, Nov 11, 2019 at 02:22:19PM +0100, Michal Privoznik wrote:
Some low hanging fruit here.
There are more serious issues that I yet have to figure out: 1) docs/ is broken. Just open any site from your build directory. Our main.js lives in the source dir but we are trying to load it relative to build dir
When you "make install" the result should work correctly. IOW, IIUC, We've only broken the ability to browse the website from inside the build dir. We could "build" the static files by simply cp'ing them from the src dir for i in ../../docs/{js,fonts,logos} do cp -a $i . done for i in ../../docs/*.css do cp -a $i . done The "make install" rule can then install the ones in the build dir.
2) Generation of acl.html is broken - it assumes aclperms.htmlinc file lives under $srcdir which is not true anymore => page that's generated is useless
3) I've tried to update Gentoo live ebuild, but it failed to compile:
Making all in src make[2]: Entering directory '/var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999_build/src' ... /usr/bin/perl /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/genpolkit.pl < /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/viraccessperm.h > access/org.libvirt.api.policy || rm -f access/org.libvirt.api.policy /usr/bin/perl -w /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/remote/remote_protocol.x \
access/viraccessapicheck.h /bin/sh: access/org.libvirt.api.policy: No such file or directory
The libvirt-9999_build/src/access dir doesn't exist (I'm surprised it wasn't created automatically by autotools since src/ was). I'll have to investigate further.
I hit this problem when making the RPM uses a build!=src dir originally. I can't recall what I did to fix it though - it was something annoyingly stupid though IIRC. Like a parallel build happening when it shouldn't or something like that. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 11/11/19 2:42 PM, Daniel P. Berrangé wrote:
On Mon, Nov 11, 2019 at 02:22:19PM +0100, Michal Privoznik wrote:
Some low hanging fruit here.
3) I've tried to update Gentoo live ebuild, but it failed to compile:
Making all in src make[2]: Entering directory '/var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999_build/src' ... /usr/bin/perl /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/genpolkit.pl < /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/viraccessperm.h > access/org.libvirt.api.policy || rm -f access/org.libvirt.api.policy /usr/bin/perl -w /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/remote/remote_protocol.x \
access/viraccessapicheck.h /bin/sh: access/org.libvirt.api.policy: No such file or directory
The libvirt-9999_build/src/access dir doesn't exist (I'm surprised it wasn't created automatically by autotools since src/ was). I'll have to investigate further.
I hit this problem when making the RPM uses a build!=src dir originally. I can't recall what I did to fix it though - it was something annoyingly stupid though IIRC. Like a parallel build happening when it shouldn't or something like that.
I've identified the issue. It's ebuild/eclass who disables dependency-tracking whenever possible. Gentoo developers claim it's for faster configure (because by default, gentoo does in-tree builds) and they are right. But what dependency tracking has to do with creating directories is beyond me. Michal
On Tue, Nov 12, 2019 at 02:22:23PM +0100, Michal Privoznik wrote:
On 11/11/19 2:42 PM, Daniel P. Berrangé wrote:
On Mon, Nov 11, 2019 at 02:22:19PM +0100, Michal Privoznik wrote:
Some low hanging fruit here.
3) I've tried to update Gentoo live ebuild, but it failed to compile:
Making all in src make[2]: Entering directory '/var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999_build/src' ... /usr/bin/perl /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/genpolkit.pl < /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/viraccessperm.h > access/org.libvirt.api.policy || rm -f access/org.libvirt.api.policy /usr/bin/perl -w /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/remote/remote_protocol.x \
access/viraccessapicheck.h /bin/sh: access/org.libvirt.api.policy: No such file or directory
The libvirt-9999_build/src/access dir doesn't exist (I'm surprised it wasn't created automatically by autotools since src/ was). I'll have to investigate further.
I hit this problem when making the RPM uses a build!=src dir originally. I can't recall what I did to fix it though - it was something annoyingly stupid though IIRC. Like a parallel build happening when it shouldn't or something like that.
I've identified the issue. It's ebuild/eclass who disables dependency-tracking whenever possible. Gentoo developers claim it's for faster configure (because by default, gentoo does in-tree builds) and they are right. But what dependency tracking has to do with creating directories is beyond me.
Ahhhh yes, we did that for the RPM build too in commit f96395e78eaccffbf128336382c74b1250f04032 having to pass --enable-dependancy-tracking to override from RPM does by default in %configure. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (2)
-
Daniel P. Berrangé -
Michal Privoznik