aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2019-06-13 10:27:55 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-06-17 17:22:34 +0000
commit334a20160e0c4e8119478542fdacade1f268a1c1 (patch)
tree8e0b424227a2ae7312a2745a220fbc9155a84170 /scripts
parent4aefa58d05e5ed4d3351e702193b2382caa5206c (diff)
distro-build-manifest: fix DIST_LAYERS due to new layout
New layout with subfolders causes incomplete DIST_LAYERS to be generated in deploy/images/.../build-info. This patches fixes how git repos are found in the layers directory. Bug-AGL: SPEC-2450 Change-Id: I4b6a62b68064de12119e668522242677e11c65eb Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/distro-manifest-generator.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/distro-manifest-generator.sh b/scripts/distro-manifest-generator.sh
index 834cde248..7552b9942 100755
--- a/scripts/distro-manifest-generator.sh
+++ b/scripts/distro-manifest-generator.sh
@@ -155,7 +155,7 @@ function _getgitmanifest() {
local gitrepo gitrev metagitdir sep=""
DIST_LAYERS=""
- for metagitdir in $(ls -d $DIST_METADIR/*/.git); do
+ for metagitdir in $(find $DIST_METADIR -type d -name ".git"); do
gitrepo=$($REALPATH -Ls $metagitdir/.. --relative-to=$DIST_METADIR)
pushd $DIST_METADIR/$gitrepo &>/dev/null && {
gitrev=$( { $GIT describe --long --dirty --always 2>/dev/null || echo "unknown_revision"; } | tr ' \t' '__' )