From patchwork Tue Jun 16 15:41:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Starr X-Patchwork-Id: 485072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id A3B5A140281 for ; Wed, 17 Jun 2015 01:54:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0BB89921A9; Tue, 16 Jun 2015 15:54:40 +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 wwcMsQEWBD91; Tue, 16 Jun 2015 15:54:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CF049921B5; Tue, 16 Jun 2015 15:54:38 +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 789AF1BFD7E for ; Tue, 16 Jun 2015 15:54:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7298A921A9 for ; Tue, 16 Jun 2015 15:54:37 +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 RzkopB0lOfj3 for ; Tue, 16 Jun 2015 15:54:36 +0000 (UTC) X-Greylist: delayed 00:12:05 by SQLgrey-1.7.6 Received: from mail.hedonline.com (mail.hedonline.com [12.133.124.242]) by whitealder.osuosl.org (Postfix) with ESMTP id 8CE0C9219F for ; Tue, 16 Jun 2015 15:54:36 +0000 (UTC) X-MimeOLE: Produced By Microsoft Exchange V6.5 Received: from email.hedonline.com ([12.133.124.245]) by hed-dc01.hed.local ([192.168.1.1]) with Microsoft Exchange Server HTTP-DAV ; Tue, 16 Jun 2015 15:40:50 +0000 MIME-Version: 1.0 X-Mailer: git-send-email 2.1.4 Content-class: urn:content-classes:message Date: Tue, 16 Jun 2015 10:41:45 -0500 Message-ID: <64CA5C49A43E314D9F7DAE05370E2F7B05F54E6F@hed-dc01.hed.local> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH 1/1] system: make sh symlink match original busybox symlink path Thread-Index: AdCoStKv/RTqPlssSGOB/gAQEokrBw== From: "Matthew Starr" To: Cc: Matthew Starr Subject: [Buildroot] [PATCH 1/1] system: make sh symlink match original busybox symlink path X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The symlink created by buildroot for /bin/sh when busybox is used is the full path to /bin/busybox and does not match the symlink created by busybox for /bin/sh, which is just busybox. When handling files on the host system this will point to the host system's busybox if present and not the target busybox. This is fixed by changing the /bin/sh symlink to just be busybox since both files are in the same directory. Signed-off-by: Matthew Starr --- system/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 84cde94..5c4ba90 100644 --- a/system/Config.in +++ b/system/Config.in @@ -236,7 +236,7 @@ endchoice # /bin/sh config BR2_SYSTEM_BIN_SH string - default "/bin/busybox" if BR2_SYSTEM_BIN_SH_BUSYBOX + default "busybox" if BR2_SYSTEM_BIN_SH_BUSYBOX default "/bin/bash" if BR2_SYSTEM_BIN_SH_BASH default "/bin/dash" if BR2_SYSTEM_BIN_SH_DASH default "/bin/zsh" if BR2_SYSTEM_BIN_SH_ZSH