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 e98af3ef7739723fdc54aa4e5469e600e25d6629..02aa913b9dd029fdb99ef0eca302258c4ce5f4b0 100644 (file)
--- 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 5d16064f8502a2bd1ef8a1e195e1f27169429545..3e2f30a32c4c56509fb43be3f6cc2e2a3bef2328 100644 (file)
--- 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} \