Skip to contentSkip to conversation

package/vnstat: fix build failure due to double install of programs

PATCH New Fabrice Fontaine 2 participants 2 messages Oct 31, 2019 – Nov 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/vnstat: fix build failure due to double install of programs

Fixes:
- http://autobuild.buildroot.org/results/3aefa8d63f710b71720fc114450110d2f885820b

---
 ...build-failure-due-to-double-installa.patch | 59 +++++++++++++++++++
 package/vnstat/vnstat.mk                      |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 package/vnstat/0001-Makefile.am-fix-build-failure-due-to-double-installa.patch
package/vnstat/0001-Makefile.am-fix-build-failure-due-to-double-installa.patch new file +59 -0
new file mode 100644
index 0000000000..a1c0bb3563
@@ -0,0 +1,59 @@
+From 6126d04e995d6791377214433e54481b8084a42f Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Thu, 31 Oct 2019 11:02:22 +0100
+Subject: [PATCH] Makefile.am: fix build failure due to double installation of
+ programs
+
+install-data-hook should not depend on install-exec otherwise build
+could fail due to the double installation of vnstati:
+
+PATH="/data/buildroot/buildroot-test/instance-0/output/host/bin:/data/buildroot/buildroot-test/instance-0/output/host/sbin:/data/buildroot/buildroot-test/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"  /usr/bin/make -j12 DESTDIR=/data/buildroot/buildroot-test/instance-0/output/target install -C /data/buildroot/buildroot-test/instance-0/output/build/vnstat-2.4/
+make[1]: Entering directory '/data/buildroot/buildroot-test/instance-0/output/build/vnstat-2.4'
+Making install in .
+make[2]: Entering directory '/data/buildroot/buildroot-test/instance-0/output/build/vnstat-2.4'
+make[3]: Entering directory '/data/buildroot/buildroot-test/instance-0/output/build/vnstat-2.4'
+ /usr/bin/mkdir -p '/data/buildroot/buildroot-test/instance-0/output/target/usr/bin'
+ /usr/bin/mkdir -p '/data/buildroot/buildroot-test/instance-0/output/target/usr/sbin'
+ /usr/bin/mkdir -p '/data/buildroot/buildroot-test/instance-0/output/target/usr/share/man/man1'
+ /usr/bin/mkdir -p '/data/buildroot/buildroot-test/instance-0/output/target/usr/share/man/man5'
+ /usr/bin/mkdir -p '/data/buildroot/buildroot-test/instance-0/output/target/usr/share/man/man8'
+  /usr/bin/install -c vnstat vnstati '/data/buildroot/buildroot-test/instance-0/output/target/usr/bin'
+  /usr/bin/install -c vnstatd '/data/buildroot/buildroot-test/instance-0/output/target/usr/sbin'
+ /usr/bin/install -c -m 644 man/vnstat.1 man/vnstati.1 '/data/buildroot/buildroot-test/instance-0/output/target/usr/share/man/man1'
+ /usr/bin/install -c -m 644 man/vnstat.conf.5 '/data/buildroot/buildroot-test/instance-0/output/target/usr/share/man/man5'
+ /usr/bin/install -c -m 644 man/vnstatd.8 '/data/buildroot/buildroot-test/instance-0/output/target/usr/share/man/man8'
+/usr/bin/make  install-data-hook
+make[4]: Entering directory '/data/buildroot/buildroot-test/instance-0/output/build/vnstat-2.4'
+Making install-exec in .
+make[5]: Entering directory '/data/buildroot/buildroot-test/instance-0/output/build/vnstat-2.4'
+ /usr/bin/mkdir -p '/data/buildroot/buildroot-test/instance-0/output/target/usr/bin'
+ /usr/bin/mkdir -p '/data/buildroot/buildroot-test/instance-0/output/target/usr/sbin'
+  /usr/bin/install -c vnstat vnstati '/data/buildroot/buildroot-test/instance-0/output/target/usr/bin'
+  /usr/bin/install -c vnstatd '/data/buildroot/buildroot-test/instance-0/output/target/usr/sbin'
+/usr/bin/install: cannot create regular file '/data/buildroot/buildroot-test/instance-0/output/target/usr/bin/vnstati': File exists
+
+Fixes:
+ - http://autobuild.buildroot.org/results/3aefa8d63f710b71720fc114450110d2f885820b
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/vergoh/vnstat/pull/145]
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 20578e6..c65e0aa 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -143,7 +143,7 @@ release: distcheck
+ 	rm -fr $(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ 	ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
+ 
+-install-data-hook: install-exec
++install-data-hook:
+ 	if [ -f $(DESTDIR)$(man1dir)/vnstatd.1 ]; then rm -f $(DESTDIR)$(man1dir)/vnstatd.1; fi
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
+ if IS_CROSSCOMPILED
+-- 
+2.23.0
+
package/vnstat/vnstat.mk +2 -0
index f0ef1cc69d..79e558628e 100644
@@ -10,6 +10,8 @@ VNSTAT_LICENSE = GPL-2.0
 VNSTAT_LICENSE_FILES = COPYING
 VNSTAT_DEPENDENCIES = host-pkgconf sqlite
 VNSTAT_CONF_OPTS = --disable-extra-paths
+# We're patching Makefile.am
+VNSTAT_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
 VNSTAT_DEPENDENCIES += gd
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/vnstat: fix build failure due to double install of programs

Hello Fabrice,

Quoted 4 lines · On Thu, 31 Oct 2019 13:18:48 +0100 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/3aefa8d63f710b71720fc114450110d2f885820b

Why is this happening just 3 times? Is it a parallel build issue? Also, when I build vnstat a first time, and then do "make vnstat-rebuild", which reinstalls the same files at the same place, it doesn't fail. So why does it fail in those situations ?

Quoted 2 lines

+-install-data-hook: install-exec
++install-data-hook:

This solution is anyway not good, because it reverts upstream commit 3a76e18434fb033d8ac80955626fc8e2ca966cfa, which is necessary. Look at the Makefile.am, in the native compilation case:

install-data-hook: install-exec

        if [ -f $(DESTDIR)$(man1dir)/vnstatd.1 ]; then rm -f $(DESTDIR)$(man1dir)/vnstatd.1; fi
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)
if IS_CROSSCOMPILED
        if [ ! -f $(DESTDIR)$(sysconfdir)/vnstat.conf ]; \
        then cp -fv $(srcdir)/cfg/vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf; \
        fi
else
        $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf.new
        if [ -f $(DESTDIR)$(sysconfdir)/vnstat.conf ]; \
        then cp -fv $(DESTDIR)$(sysconfdir)/vnstat.conf vnstat.conf.old; \
        fi
        cp -fv vnstat.conf.new $(DESTDIR)$(sysconfdir)/vnstat.conf

endif

It runs the vnstat program itself! So it has to make sure it has been installed before running it. Of course, this could be changed to run the vnstat from the build directory instead of from the installation location.

But as it is, your patch breaks things for upstream. For the Buildroot case, it works fine, but we want more details as to what the problem is, and why it happens so infrequently.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com