diff options
| author | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-08-05 19:49:45 +0200 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-08-05 19:49:45 +0200 |
| commit | d3b43b4768e2c1f71b85ce9e3035c33abe27153d (patch) | |
| tree | e763020fba35346e6844c754d9c7f787376f3e98 | |
| parent | 0eb04cc682a3b19c272a8ba2bbd0f6111927732f (diff) | |
| download | image-configurations-d3b43b4768e2c1f71b85ce9e3035c33abe27153d.tar.gz image-configurations-d3b43b4768e2c1f71b85ce9e3035c33abe27153d.tar.bz2 image-configurations-d3b43b4768e2c1f71b85ce9e3035c33abe27153d.zip | |
Merge meta-generic and meta-<profile> yaml filestizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasetizen_3.0.m14.3_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen_ivi/20160217.000005submit/tizen_ivi/20160217.000000submit/tizen_ivi/20140822.112233submit/tizen_ivi/20140821.112233submit/tizen_ivi/20140818.000000submit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_common/20140812.170532submit/tizen_common/20140812.151815submit/tizen_common/20140812.150926accepted/tizen/ivi/20160218.024726accepted/tizen/ivi/20140822.105036tizen_3.0_ivitizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.m14.3_ivitizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commonaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_common
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>
| -rw-r--r-- | packaging/image-configurations.spec | 20 |
1 files changed, 15 insertions, 5 deletions
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 |