[libvirt] [PATCH 0/3] Couple of src/Makefile.am fixes
I've noticed that 'make distcheck' is failing. While investigating that issue I've came up with some other checks too. Preferably, I'd like to get these into the current release (the fix 2/3 at least). Michal Privoznik (3): src: Check libvirt_admin.syms for exported symbols src: Cleanup libvirt_admin.syms src: Check for symbols ordering in ADMIN_SYM_FILES src/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.4.6
We have this check rule in src/Makefile: check-symfile that should check if all symbols we wanted to export are exported. Moreover, if we are not exporting something more. Do the same with libvirt_admin.syms. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 57a06e8..186006e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -486,8 +486,12 @@ if WITH_LINUX check-symfile: libvirt.syms libvirt.la $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \ .libs/libvirt.so +check-admin-symfile: libvirt_admin.syms libvirt-admin.la + $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt_admin.syms \ + .libs/libvirt-admin.so else ! WITH_LINUX check-symfile: +check-admin-symfile: endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ @@ -610,7 +614,7 @@ EXTRA_DIST += check-driverimpls.pl check-aclrules.pl check-aclperms.pl check-local: check-protocol check-symfile check-symsorting \ check-drivername check-driverimpls check-aclrules \ - check-aclperms + check-aclperms check-admin-symfile .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc -- 2.4.6
It's a generated file, so after 'distclean' it should be gone. But it isn't yet. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 186006e..90292d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1104,7 +1104,7 @@ USED_SYM_FILES = $(srcdir)/libvirt_private.syms GENERATED_SYM_FILES = \ $(ACCESS_DRIVER_SYM_FILES) \ libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \ - libvirt_admin.def \ + libvirt_admin.syms libvirt_admin.def \ $(NULL) if WITH_TEST -- 2.4.6
Like we are checking for the correct order in SYM_FILES, we should do the same for ADMIN_SYM_FILES. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 90292d0..4291375 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -496,6 +496,9 @@ endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ $(srcdir) $(SYM_FILES) +check-admin-symsorting: + $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ + $(srcdir) $(ADMIN_SYM_FILES) EXTRA_DIST += check-symfile.pl check-symsorting.pl # Keep this list synced with RPC_PROBE_FILES @@ -614,7 +617,7 @@ EXTRA_DIST += check-driverimpls.pl check-aclrules.pl check-aclperms.pl check-local: check-protocol check-symfile check-symsorting \ check-drivername check-driverimpls check-aclrules \ - check-aclperms check-admin-symfile + check-aclperms check-admin-symfile check-admin-symsorting .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc -- 2.4.6
On Mon, Aug 31, 2015 at 12:51:14PM +0200, Michal Privoznik wrote:
I've noticed that 'make distcheck' is failing. While investigating that issue I've came up with some other checks too.
Preferably, I'd like to get these into the current release (the fix 2/3 at least).
Michal Privoznik (3): src: Check libvirt_admin.syms for exported symbols src: Cleanup libvirt_admin.syms src: Check for symbols ordering in ADMIN_SYM_FILES
src/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
-- 2.4.6
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
ACK and safe for release Pavel
On Mon, Aug 31, 2015 at 12:51:14PM +0200, Michal Privoznik wrote:
I've noticed that 'make distcheck' is failing. While investigating that issue I've came up with some other checks too.
Preferably, I'd like to get these into the current release (the fix 2/3 at least).
Michal Privoznik (3): src: Check libvirt_admin.syms for exported symbols src: Cleanup libvirt_admin.syms src: Check for symbols ordering in ADMIN_SYM_FILES
Ack to all three. -- Guido
participants (3)
-
Guido Günther -
Michal Privoznik -
Pavel Hrdina