diff options
| author | Juergen Borleis <jbe@pengutronix.de> | 2014-06-19 23:46:16 +0200 |
|---|---|---|
| committer | Juergen Borleis <jbe@pengutronix.de> | 2014-07-11 10:28:35 +0200 |
| commit | 5ad68e352b0ec022025e052443fc88acfe25558e (patch) | |
| tree | 07d9af5080a27671da22002b24db5a486692118f /scripts | |
| parent | 27e9d1dbe22e9e77660eb47ab36b84ddf17f55d6 (diff) | |
| download | ptxdist-5ad68e352b0ec022025e052443fc88acfe25558e.tar.gz ptxdist-5ad68e352b0ec022025e052443fc88acfe25558e.tar.xz | |
newpackages: provide the M4 macro directory to the wizard script
In order to be able to keep all our cross compile M4 macros at a single
location and share it between all autotools based templates we must forward
the location of the M4 macros to the wizard script. This change adds a second
parameter when calling the template's wizard. Older wizards will ignore it so
it should not confuse existing templates.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_lib_template.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh index ee9d1260e..68c614218 100644 --- a/scripts/lib/ptxd_lib_template.sh +++ b/scripts/lib/ptxd_lib_template.sh @@ -188,6 +188,7 @@ export -f ptxd_template_write_rules ptxd_template_write_src() { local dst="${PTXDIST_WORKSPACE}/local_src/${package}" local template_src + local template_dir if [ -d "${dst}" ]; then return @@ -209,8 +210,8 @@ ptxd_template_write_src() { if [ ! -e "${dst}/wizard.sh" ]; then return fi && - - ( cd "${dst}" && bash wizard.sh "${package}" ) && + template_dir=$(dirname "${template_src}") && + ( cd "${dst}" && bash wizard.sh "${package}" "${template_dir}") && rm -f "${dst}/wizard.sh" } export -f ptxd_template_write_src |