From 0eb04cc682a3b19c272a8ba2bbd0f6111927732f Mon Sep 17 00:00:00 2001 From: JF Ding Date: Fri, 1 Aug 2014 15:14:36 +0800 Subject: Ignore the case of empty ks file list in target rpm 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 --- packaging/image-configurations.spec | 5 ++--- 1 file 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/* -- cgit v1.2.3