From: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
Date: Tue, 5 Aug 2014 17:49:45 +0000 (+0200)
Subject: Merge meta-generic and meta-<profile> yaml files
X-Git-Tag: accepted/tizen/ivi/20140822.105036^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_3.0_ivi;p=platform%2Fupstream%2Fimage-configurations.git

Merge meta-generic and meta-<profile> yaml files

Copy the source files coming from meta-generic and
the current meta-<profile> to the same input dir
before running kickstarter. Otherwise, the scripts
defined in meta-generic can't be used in the current
profile.

This is the same trick as the one done in package-groups
with patterns.

Change-Id: I4bb93fe852ef590007e3526e5a64a8515f5f6e34
Bug-Tizen: PTREL-807
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
---

diff --git a/packaging/image-configurations.spec b/packaging/image-configurations.spec
index afe87bc..47633ae 100644
--- a/packaging/image-configurations.spec
+++ b/packaging/image-configurations.spec
@@ -18,10 +18,11 @@ Source1001: 	image-configurations.manifest
 
 BuildArch:	noarch
 BuildRequires:  kickstarter >= 0.15
+BuildRequires:  meta-generic
 BuildRequires:  meta-%{_profile}
 
 %description
-Create Configuration files to build Tizen images 
+Create Configuration files to build Tizen images
 
 %prep
 %setup -q
@@ -29,10 +30,19 @@ cp %{SOURCE1001} .
 
 
 %build
-kickstarter -c /usr/share/image-configurations/%_profile/%_profile.yaml \
-    -e /usr/share/image-configurations/%_profile/configs \
-    -r /usr/share/image-configurations/%_profile/%_profile-repos.yaml \
-    -T /usr/share/image-configurations/%_profile/%_profile-targets.yaml \
+
+# merge the configuration files from generic and the current profile
+# in the same input dir to make kickstarter aware of the generic scripts.
+mkdir -p input
+for profile in generic %_profile; do
+	pdir=%{_datadir}/image-configurations/$profile
+	[ -d $pdir ] && cp -a $pdir/* input/
+done
+
+kickstarter -c input/%_profile.yaml \
+    -e input/configs \
+    -r input/%_profile-repos.yaml \
+    -T input/%_profile-targets.yaml \
     -t %{_repository} \
     -i image-configs.xml