diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-04-02 11:38:40 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2014-04-02 11:42:30 -0600 |
| commit | a28e0aecd9d5e875a71781a0dadd6267da089dbb (patch) | |
| tree | 739c3850afe2918a15eb7f266d3ee6aa7a64d6ac | |
| parent | 19bbd235d4234a8997c74998ea087c6dd7e83f7c (diff) | |
| download | cbootimage-configs-a28e0aecd9d5e875a71781a0dadd6267da089dbb.tar.gz | |
Image dependency generator cleanups
1) Remove whitespace from parsed filenames.
2) Make image file depend on dependency generator script.
3) Provide dummy rules for all dependencies. Without this change, if any
dependency is renamed, make will try to build it but won't know how.
With the dummy rules in place, make will execute an empty command to
build any missing dependencies, which is fine if they've simply been
renamed. Any real errors due to incorrect filenames in the current
config files will be caught by the cbootimage invocation itself.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rwxr-xr-x | build/gen-image-deps.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/build/gen-image-deps.sh b/build/gen-image-deps.sh index 10c4001..fcbb64c 100755 --- a/build/gen-image-deps.sh +++ b/build/gen-image-deps.sh @@ -18,17 +18,25 @@ # misrepresented as being the original software. # 3. This notice may not be removed or altered from any source distribution. +deps_script=$0 img_cfg_file=$1 img_file=$2 dep_file=$3 rm -f ${dep_file} -bct=`grep -i bctfile ${img_cfg_file} | sed -e 's/^.*=//' -e s'/[,;].*$//'` -bootloader=`grep -i bootloader ${img_cfg_file} | sed -e 's/^.*=//' -e s'/[,;].*$//'` +bct=`grep -i bctfile ${img_cfg_file} | sed -e 's/^.*=\s*//' -e s'/[,;].*$//'` +bootloader=`grep -i bootloader ${img_cfg_file} | sed -e 's/^.*=\s*//' -e s'/[,;].*$//'` cat > ${dep_file} <<ENDOFHERE ${img_file}: \\ + ${deps_script} \\ ${img_cfg_file} \\ ${bct} \\ ${bootloader} + +${img_cfg_file}: + +${bct}: + +${bootloader}: ENDOFHERE |