From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mail.openembedded.org (Postfix) with ESMTP id A3AD460851 for ; Fri, 10 Feb 2017 13:42:34 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 10 Feb 2017 05:42:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,141,1484035200"; d="scan'208";a="42543553" Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga002.jf.intel.com with ESMTP; 10 Feb 2017 05:42:34 -0800 From: Amarnath Valluri To: openembedded-core@lists.openembedded.org Date: Fri, 10 Feb 2017 15:42:15 +0200 Message-Id: <1486734151-28331-8-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486734151-28331-1-git-send-email-amarnath.valluri@intel.com> References: <1486734151-28331-1-git-send-email-amarnath.valluri@intel.com> Subject: [PATCH 07/23] busybox: changes to support merged /usr X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2017 13:42:34 -0000 Most of the shell scripts refer to /bin/sh inside the script. When 'usrmege' feature is enabled, this path would be /usr/bin/sh. Hence, to satisfy build dependency add '/bin/sh' to it's providers list. Signed-off-by: Amarnath Valluri --- meta/recipes-core/busybox/busybox.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 34f4e25..61d17e4 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -431,3 +431,5 @@ pkg_prerm_${PN}-syslog () { fi fi } + +RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}" -- 2.7.4