summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJF Ding <jian-feng.ding@intel.com>2014-08-01 15:14:36 +0800
committerJF Ding <jian-feng.ding@intel.com>2014-08-01 16:12:17 +0800
commit0eb04cc682a3b19c272a8ba2bbd0f6111927732f (patch)
treef9e831075158252554f3eb17d5a502ea1c18f6e5
parent0caf8fb7777a108e2c60fd0ac6b67fa03b9f7fc4 (diff)
downloadimage-configurations-0eb04cc682a3b19c272a8ba2bbd0f6111927732f.tar.gz
image-configurations-0eb04cc682a3b19c272a8ba2bbd0f6111927732f.tar.bz2
image-configurations-0eb04cc682a3b19c272a8ba2bbd0f6111927732f.zip
With the '--target' specification, it's possible there's no image definitions for the building target. Now it's acceptable, and let the rpm build continue. Change-Id: Iacbf498b8bb98d100aaa42dcd39c14082e9dc604 Signed-off-by: JF Ding <jian-feng.ding@intel.com>
-rw-r--r--packaging/image-configurations.spec5
1 files changed, 2 insertions, 3 deletions
diff --git a/packaging/image-configurations.spec b/packaging/image-configurations.spec
index 7e46b7d..afe87bc 100644
--- a/packaging/image-configurations.spec
+++ b/packaging/image-configurations.spec
@@ -39,11 +39,10 @@ kickstarter -c /usr/share/image-configurations/%_profile/%_profile.yaml \
%install
mkdir -p %{buildroot}/usr/share/image-configurations
-cp %{baseline}/*.ks %{buildroot}/usr/share/image-configurations
+[ -n "$(ls -A %{baseline}/*.ks 2>/dev/null)" ] && cp %{baseline}/*.ks %{buildroot}/usr/share/image-configurations
cp image-configs.xml %{buildroot}/usr/share/image-configurations
%files
%manifest %{name}.manifest
#%dir %_datadir/image-configurations
-%_datadir/image-configurations/*.ks
-%_datadir/image-configurations/image-configs.xml
+%_datadir/image-configurations/*