From patchwork Thu Oct 31 12:18:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1187426 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rlfBfN+4"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 473kqv2S8dz9sCJ for ; Thu, 31 Oct 2019 23:18:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 800E7880A1; Thu, 31 Oct 2019 12:18:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yM1cfW-qt1SZ; Thu, 31 Oct 2019 12:18:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 63F5E88084; Thu, 31 Oct 2019 12:18:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E9F391BF2EB for ; Thu, 31 Oct 2019 12:18:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D211385B4F for ; Thu, 31 Oct 2019 12:18:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 87+YpxfrKopX for ; Thu, 31 Oct 2019 12:18:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0C59B880C0 for ; Thu, 31 Oct 2019 12:18:12 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id l10so6015611wrb.2 for ; Thu, 31 Oct 2019 05:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bHE+FEd0HsrpL7TiHEuvAj8K/c6UMYUBNRgeWeG9Jvw=; b=rlfBfN+4golC1ohv83jE8EY5rCQt/UrXyqcpL6VBoLZtN70yWmvLip7Y3YiMR0OLje v4m/o1OFeOwibjHG7WcRs0knbAzqOEfYkUbznqKMcCiGdHqY/n+YvCdNJVTmEoRBf5kI 6H5EKPnTgyby3R1eXE8bA9YWg8MpjoozenW9hKuMTqfXI1LWsmZsPX3AT/MvuuWCi3iG MsnvWs3faShUEVHiHDn+nyVHvWzYKKG4IQ1b4UqY56ZzAQszqHMxJeS7GaguyKJVHcTa wiADC31LpKXWuMwUh1L/ONdS9q7CKgs+xQOK7Md7KIDRcmqw/bufbaA0PEqjrAd0k5DL AIHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bHE+FEd0HsrpL7TiHEuvAj8K/c6UMYUBNRgeWeG9Jvw=; b=G0BIuKgJBGN2b/U8loLBpYKRSXYXmZTJ7PKEMvJJRJ2ILhlToeWGEe/cD7LWvF3OMR bkq1NSsGn/23K+SDTkffuZjtWmoi88uVNpuuR8T3K10Pj0c4NTIeQ34EL0OQ+dbe3Yqu PXSUP79X6ee2adpfYlJwEyVcA67SOruKdVyNgQoq+NjCu/gI525iLdAtMHces0yfAhYH 1vgFLKjypAYmYJFe82s2LGt670+mU0Gal9v7EGUhO/XODkjU/YEzSiUkt2I3PjZ/bfeS 0JcgGklgqG0zLMx/QVZxb6HsIyz41Dh1WdFOM/U14J1n8XS95K2OngR3rrLIOmTmGjLB 6r4Q== X-Gm-Message-State: APjAAAW2lBDHZLkGn10jpE04BoD4fhHFtqNPa9vTaI3xOeD1yB2kajvW /jg0S3Q8f3U8I7oRB6xZmvgNUdZ7 X-Google-Smtp-Source: APXvYqw/Pd0JNTCGqYN7gAMkn5/t/o1OMFvZ+avsOtLB4Byy4PRnOVww+J/Yw6lI/6lwPKrEpZUILg== X-Received: by 2002:adf:ea50:: with SMTP id j16mr5129799wrn.295.1572524289957; Thu, 31 Oct 2019 05:18:09 -0700 (PDT) Received: from kali.home (lfbn-1-3732-187.w86-229.abo.wanadoo.fr. [86.229.230.187]) by smtp.gmail.com with ESMTPSA id f20sm2966754wmb.6.2019.10.31.05.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2019 05:18:09 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 31 Oct 2019 13:18:48 +0100 Message-Id: <20191031121848.7914-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/vnstat: fix build failure due to double install of programs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Rodrigo Rebello , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/3aefa8d63f710b71720fc114450110d2f885820b Signed-off-by: Fabrice Fontaine --- ...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 diff --git a/package/vnstat/0001-Makefile.am-fix-build-failure-due-to-double-installa.patch b/package/vnstat/0001-Makefile.am-fix-build-failure-due-to-double-installa.patch new file mode 100644 index 0000000000..a1c0bb3563 --- /dev/null +++ b/package/vnstat/0001-Makefile.am-fix-build-failure-due-to-double-installa.patch @@ -0,0 +1,59 @@ +From 6126d04e995d6791377214433e54481b8084a42f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +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 +[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 + diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk index f0ef1cc69d..79e558628e 100644 --- a/package/vnstat/vnstat.mk +++ b/package/vnstat/vnstat.mk @@ -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