diff mbox

[cbootimage-configs] Image dependency generator cleanups

Message ID 1396460585-9178-1-git-send-email-swarren@wwwdotorg.org
State Accepted, archived
Headers show

Commit Message

Stephen Warren April 2, 2014, 5:43 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

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>
---
 build/gen-image-deps.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Stephen Warren April 3, 2014, 5:01 p.m. UTC | #1 
On 04/02/2014 11:43 AM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> 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.

Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/build/gen-image-deps.sh b/build/gen-image-deps.sh
index 10c4001e0050..fcbb64cdbf5e 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