From patchwork Fri Aug 9 12:05:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1144605 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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="sgzSqFcq"; 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 464kV33CKgz9sNF for ; Fri, 9 Aug 2019 22:06:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DC248883AE; Fri, 9 Aug 2019 12:05:57 +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 zI1U1hCjPvT2; Fri, 9 Aug 2019 12:05:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 100AF883B7; Fri, 9 Aug 2019 12:05:57 +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 941941BF2CF for ; Fri, 9 Aug 2019 12:05:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8E5BE883B7 for ; Fri, 9 Aug 2019 12:05:55 +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 CZ6bn-Z5y1sP for ; Fri, 9 Aug 2019 12:05:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id D6D7A883AE for ; Fri, 9 Aug 2019 12:05:54 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id z4so95574067qtc.3 for ; Fri, 09 Aug 2019 05:05:54 -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; bh=becaDS+X0TKc5/TFucBn6++/1JwZfH4v4kK1X70cxHY=; b=sgzSqFcqXZu5WqiZX/zPNi0b74nzL/kPfCTgMVCccXWs0jx+9kHj3c54K8R+NAjc75 AR5LUfS5luHCOAWMCMQbYpe5qjIg0yctmSaPbRfeSzTKV0OgRMrpJLKFg49s6XMcEXes r/w0Ng1P4ktZ2UvvZ7a4u4wMrUL1OF3IMWR7Xgqsi6aBFNb5ND4MHxFoFi8op4HGkSjQ MQYC4c8WK9hf7Ti6H1cgsMGb9YMiyQhlpFWUl6VI2lE8FsPxclbauljyDjkxyLqCLyA0 W0s/eeVDu0eWvhix1wRRMnS2M3G8jrq1lF+CnaVu8tctKu1WWPQhfGixagt0Hb5bIMSr /VoQ== 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; bh=becaDS+X0TKc5/TFucBn6++/1JwZfH4v4kK1X70cxHY=; b=hbdkaTxerUJ+5K1rNnQU6Kv+sZcjfWBdpOcsebEymfCt+zS0lWeZbrAy8jv5jeZyT+ A7tzz1hIhp594sgnXzZF21b5jZVcErmSSjoFgykxB7/0NYrG9esTu36aPr8PNJDxpXG8 hBMtf6XlKwwfPmhKXUmFsA1tjiOwHs7iBtqYSk1hrYIs0FBlVV5LeZCDo/AEJGdchS7X lCzqR2i5PAP6JLNxxMXKlbRIU+aYxWHwD4ToDxs/3OL+lwbttON0711Wbq4szj1klHmI W7vrI8Za1Ly/81G8Q/djAW01xjOxDfpEY5A9Ni7+THtC9UER5e/Avl3R7YZE8JLaM0Hc YadQ== X-Gm-Message-State: APjAAAUfkM8NJqoyjfvgSPnqHZSJQ7c5xuK1spyIqOuWxAToTi+GkCjs AxuRSPBKTG+SgIyhmJ2Z7OqkjetK X-Google-Smtp-Source: APXvYqytieWJTfljw4KQSKdeTTIWogV6yZIX9u3/xbihJ/RupvCvbmBVLxAuNv8uTDjGNDZDqDMkKg== X-Received: by 2002:ac8:6702:: with SMTP id e2mr16937975qtp.317.1565352353623; Fri, 09 Aug 2019 05:05:53 -0700 (PDT) Received: from casantos.remote.csb ([177.97.70.140]) by smtp.gmail.com with ESMTPSA id y3sm46273326qtj.46.2019.08.09.05.05.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 05:05:52 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 9 Aug 2019 09:05:44 -0300 Message-Id: <20190809120544.12405-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH v2] package/dhcp: fix installation with BR2_STATIC_LIBS=y 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: Carlos Santos MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use the "install-sbinPROGRAMS" make target to install the utilities instead of guessing their locations. We disable libtool for static builds so the binaries are not always in a ".libs" subdir. Fixes: http://autobuild.buildroot.net/results/0c43c02b8d418b60b4734187abde1da585e9e0ca/ http://autobuild.buildroot.net/results/e61b246df60af1e59b8f643510557ef2270f2d97/ Signed-off-by: Carlos Santos --- package/dhcp/dhcp.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 5f56c86414..0abb0aebd7 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -52,7 +52,7 @@ endef define DHCP_INSTALL_SERVER mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) - $(INSTALL) -m 0755 -D $(@D)/server/.libs/dhcpd $(TARGET_DIR)/usr/sbin/dhcpd + $(MAKE) -C $(@D)/server DESTDIR=$(TARGET_DIR) install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \ $(TARGET_DIR)/etc/dhcp/dhcpd.conf endef @@ -62,8 +62,7 @@ ifeq ($(BR2_PACKAGE_DHCP_RELAY),y) define DHCP_INSTALL_RELAY mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) - $(INSTALL) -m 0755 -D $(DHCP_DIR)/relay/.libs/dhcrelay \ - $(TARGET_DIR)/usr/sbin/dhcrelay + $(MAKE) -C $(@D)/relay DESTDIR=$(TARGET_DIR) install-sbinPROGRAMS endef endif @@ -71,8 +70,8 @@ ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) define DHCP_INSTALL_CLIENT mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) - $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/.libs/dhclient \ - $(TARGET_DIR)/sbin/dhclient + $(MAKE) -C $(@D)/client DESTDIR=$(TARGET_DIR) sbindir=/sbin \ + install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ $(TARGET_DIR)/etc/dhcp/dhclient.conf $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \