From patchwork Sat Aug 8 15:55:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1342534 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=crapouillou.net header.i=@crapouillou.net header.a=rsa-sha256 header.s=mail header.b=TmY1FHMb; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BP6Jh3LKSz9sRK for ; Sun, 9 Aug 2020 01:55:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E14EB263F9; Sat, 8 Aug 2020 15:55:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BRrkXNOac78t; Sat, 8 Aug 2020 15:55:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A6E1B204F3; Sat, 8 Aug 2020 15:55:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C080B1BF2E4 for ; Sat, 8 Aug 2020 15:55:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B6999888B5 for ; Sat, 8 Aug 2020 15:55:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bkEYH9X-lDDd for ; Sat, 8 Aug 2020 15:55:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from crapouillou.net (crapouillou.net [89.234.176.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5438D88839 for ; Sat, 8 Aug 2020 15:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1596902133; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=bvDCP2byNCnwikyN7lrz5fZrQxMK97tz78daHRvGtXA=; b=TmY1FHMbY4TpLGwuUjdo5Glvks7KAGnSxLbG3zR4YAQBcnS9flDHGxxqN/S4DgqrT1ZATo D49/BEetAjHBVtz/CKkE3HTv5zg4KgLRmDoiZ5XcY4YZUqYPTL7TAVrNVeRQztyAzacs7j TbKOVRTOVD7pGaQ4mXL3b+gdiurHjVQ= From: Paul Cercueil To: buildroot@busybox.net Date: Sat, 8 Aug 2020 17:55:27 +0200 Message-Id: <20200808155527.24726-1-paul@crapouillou.net> MIME-Version: 1.0 Subject: [Buildroot] [PATCH] system: set default PATH according to BR2_ROOTFS_MERGED_USR 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: Paul Cercueil , Jens Nyberg Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use "/usr/bin:/usr/sbin" as the default path if BR2_ROOTFS_MERGED_USR is enabled, otherwise use "/bin:/sbin:/usr/bin:/usr/sbin". Signed-off-by: Paul Cercueil --- system/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 5063797976..b8b7c16529 100644 --- a/system/Config.in +++ b/system/Config.in @@ -402,7 +402,8 @@ endif # BR2_ROOTFS_SKELETON_DEFAULT config BR2_SYSTEM_DEFAULT_PATH string "Set the system's default PATH" - default "/bin:/sbin:/usr/bin:/usr/sbin" + default "/usr/bin:/usr/sbin" if BR2_ROOTFS_MERGED_USR + default "/bin:/sbin:/usr/bin:/usr/sbin" if !BR2_ROOTFS_MERGED_USR help Sets the system's default PATH. It is being used in /etc/profile in the skeleton-init-common package and by some