diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-10-20 10:35:10 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-10-20 10:35:10 -0500 |
| commit | 685570fbde82b482a46c5d07e0b7deed1daf5ed1 (patch) | |
| tree | 641d40fe058c839526c0ad6d79aa41fbbf610dab | |
| parent | e7b4a94ad02f78993a11d73744fd537557286381 (diff) | |
pre-built bin... adjust the utility script to the movement to external/
so-called external modules are being moved from the top level to a
sub-directory in external/
The script bin_library_info is collecting among other thing the
sha of the tree object that represent the top level of the module
itself... so we need to account for the fact that such module
is not necessarily at $SRCDIR/<module> but can be at
$SRCDIR/external/module
Change-Id: I6c6912a51819669bde512fa8acad7ac82eb50334
| -rwxr-xr-x | solenv/bin/bin_library_info.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/bin/bin_library_info.sh b/solenv/bin/bin_library_info.sh index 29d8a4bf4dff..10200edad3f5 100755 --- a/solenv/bin/bin_library_info.sh +++ b/solenv/bin/bin_library_info.sh @@ -43,7 +43,11 @@ get_library_gbuild_sha() local module="$1" pushd ${SRCDIR?} > /dev/null - git ls-tree HEAD | grep "\t${module?}$" | cut -f 1 | cut -d " " -f 3 + if [ -d "${SRCDIR}/external/${module?}" ] ; then + git ls-tree -d HEAD "external/${module?}" | cut -f 1 | cut -d " " -f 3 + else + git ls-tree -d HEAD | "{module?}" | cut -f 1 | cut -d " " -f 3 + fi popd ${SRCDIR?} > /dev/null } |