From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 20 Sep 2013 15:26:54 +0000 (+0200)
Subject: Fix collect_project regression
X-Git-Tag: e2factory-2.3.14p0~8
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=bd671d59b9e3ea08e6b0f5a5254bb35ad0660a77;p=e2factory.git

Fix collect_project regression

Make collect_project work with init files again. A regression test
has been added.

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/Changelog b/Changelog
index e98af3e..02aa913 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 NEXT:
+ * Unbreak collect_project functionality with files in proj/init.
 
 e2factory-2.3.14
 
diff --git a/local/make/build.sh b/local/make/build.sh
index 5d16064..3e2f30a 100644
--- a/local/make/build.sh
+++ b/local/make/build.sh
@@ -59,7 +59,7 @@ for d in $DEPEND ; do
 done
 # install result stuff
 mkdir -p $chroot_path/tmp/e2/{script,init,env,dep,build,out,root}
-if [ ! proj/init/* = 'proj/init/*' ]; then
+if [ ! "$(echo proj/init/*)" = 'proj/init/*' ]; then
 	cp -v proj/init/* $chroot_path/tmp/e2/init
 fi
 cp -v res/$RESULT/{build-driver,buildrc,build-script} \