From patchwork Tue Feb 4 13:14:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1233331 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=nMcYopsI; 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 48BlY220byzB3xT for ; Wed, 5 Feb 2020 00:15:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 76AB187032; Tue, 4 Feb 2020 13:14:58 +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 taQW-7VCLkse; Tue, 4 Feb 2020 13:14:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B162986F58; Tue, 4 Feb 2020 13:14:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CF6D51BF271 for ; Tue, 4 Feb 2020 13:14:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CC3C4843E8 for ; Tue, 4 Feb 2020 13:14:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hv1Si_icKNAz for ; Tue, 4 Feb 2020 13:14:52 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 740D481BE1 for ; Tue, 4 Feb 2020 13:14:52 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id f24so12151427lfh.3 for ; Tue, 04 Feb 2020 05:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=tbQkk3oCfvtxoL56KsGtd+V2aJ6q16kHdGgJideVqUM=; b=nMcYopsIvJUwXRx9qYZ6JCrlZqsgtaFCQPc4lxHfOIvQzC6KhezYmiHTCljxE6Yeu1 v5/7maT7ArZ5nd4schYFdjIbE7KqXuas7Xo/oQqEtaM9jOH+cEOUCIDE0Pg99RYpC3la TL/h1CGJiiHkOf+JHZfkW32AbxEGAeZz3SSLk= 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=tbQkk3oCfvtxoL56KsGtd+V2aJ6q16kHdGgJideVqUM=; b=PVihXe9cgWAjG7KZwWFHt3RQFKnXboFV5p/X5l/w1272ukhwOw4mYEu4MdpwhSz6bk dy5VR2TLZIofNN4ulyiK6VKdCt3hKR51Lql3v4QGZfuWynx/RvAI3Isx9HUJsUt5hzbB mHwOpDXeV1I5MCXqj0DsCNzUWZLRZhkj3frFGbcxpJHK+LtTLNaYQzdwdx3qS/hwzv7F D0HLjb/qBF4dTksJilRb6eWADlPt0O/i4vLGpz5Ik28RFzR4ouQLZ3V4cKRmZu/QV03W R5IS65UGUxwYD/Sjlklo3Q9paGk11gsFwCT9VcZCZTqiR9CZKpvB4MPL8rHXnIk1vcBb ZYwA== X-Gm-Message-State: APjAAAV6R80KzQiQBWGpZ86qt8+UcQ3ucAwrKnMdeS3qfu1bWLr1DSoK 3dknGatIotjEs5eWVrcV7s+H5UXdXmPdaw== X-Google-Smtp-Source: APXvYqz0qhKoVs1Hep/mhSd6U+kQkO2ltxe8kpXX2bRIZbsV2Y32A18T1NvMi8hY1eh3R1VHjp6KPQ== X-Received: by 2002:a19:2213:: with SMTP id i19mr14796078lfi.83.1580822090230; Tue, 04 Feb 2020 05:14:50 -0800 (PST) Received: from localhost.localdomain ([2620:0:1055:fd00:4da8:e122:c3b:1b67]) by smtp.gmail.com with ESMTPSA id d24sm11391203lja.82.2020.02.04.05.14.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Feb 2020 05:14:49 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 14:14:41 +0100 Message-Id: <1580822081-3713-1-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH v2] package/grep: fix busybox aliasing 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: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When grep package is selected, it should be installed at the same exact location where busybox installs it too, this way the grep/egrep/fgrep executables will end up overwriting the busybox provided ones. Busybox installs *grep executables in /bin, grep package in /usr/bin. Signed-off-by: Angelo Compagnucci --- Changelog: * Patch splitting as suggested by Peter I tested manually chenghing the package to: GREP_CONF_OPTS = SHELL=/bin/dash --exec-prefix=/ And this works. If /bin/sh is a link to /bin/zsh for example, it will not work cause the configure is not able to run on zsh. I suppose that changing the default /bin/sh to something not sh compatible woulb break many other things. package/grep/grep.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 96685b0..be3e53b 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -10,6 +10,7 @@ GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ GREP_LICENSE_FILES = COPYING GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +GREP_CONF_OPTS = --exec-prefix=/ # link with iconv if enabled ifeq ($(BR2_PACKAGE_LIBICONV),y)