From: Zhenhua Luo <zhenhua.luo@freescale.com>
Date: Wed, 12 Aug 2015 14:42:23 +0000 (+0800)
Subject: merge-files: Define S to fix build warning
X-Git-Tag: 2.1~395
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=316ae14e6d9e14463023cd96c168df5fe49950b7;p=meta-freescale.git

merge-files: Define S to fix build warning

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-extended/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb
index f64b909f..43860dd8 100644
--- a/recipes-extended/merge-files/merge-files_1.0.bb
+++ b/recipes-extended/merge-files/merge-files_1.0.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 inherit allarch
 
 SRC_URI = "file://merge"
+S = "${WORKDIR}"
 
 MERGED_DST ?= "${ROOT_HOME}"
 do_install () {
@@ -22,4 +23,3 @@ do_compile[noexec] = "1"
 FILES_${PN} = "/*"
 ALLOW_EMPTY_${PN} = "1"
 INSANE_SKIP_${PN} = "debug-files dev-so"
-