diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-11-28 14:51:52 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-11-29 10:24:18 +0100 |
| commit | 40e575e003c035e20614e45172af7bbe933ce1ee (patch) | |
| tree | e41271a92e045987c651c9c26b4fdaee0b8478a2 | |
| parent | 6673513a20680602e5045aa335029eccd1022d2f (diff) | |
| download | ptxdist-40e575e003c035e20614e45172af7bbe933ce1ee.tar.gz ptxdist-40e575e003c035e20614e45172af7bbe933ce1ee.tar.xz | |
ptxdist: improve 'print' handling
'print-%' does not match 'print-/some/path'. This would be useful to debug
the tarball/package mappings that are defined as '$(<PKG>_SOURCE) = <PKG>'.
Using '/print-%' instead seems to work better. Use it but keep the old
patterns for backwards compatibility.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rwxr-xr-x | bin/ptxdist | 4 | ||||
| -rw-r--r-- | rules/other/Toplevel.make | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 5ca21325c..59a39ef56 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2028,7 +2028,7 @@ EOF exit 1 fi while [ ${#} -gt 0 ]; do - if [ -n "${!1}" ]; then + if [[ ! ( "${1}" =~ "/" ) ]] && [ -n "${!1}" ]; then if [ "${PTXDIST_VERBOSE}" = "1" ]; then echo -n "${1}=" fi @@ -2040,7 +2040,7 @@ EOF check_deps || exit 1 check=1 fi - ptxd_make_log "print-${1}" 2>/dev/null || { + ptxd_make_log "/print-${1}" 2>/dev/null || { echo "${1} undefined" >&2 exit 1 } diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 0cc05e5fd..d8c9fc36b 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -107,7 +107,7 @@ include $(PTX_DGEN_DEPS_POST) # just the "print" target # ---------------------------------------------------------------------------- -print-%: FORCE +print-% /print-%: FORCE $(if $(filter k,$(MAKEFLAGS)),,$($(if $(filter undefined,$(origin $(*))),$(error $(*) undefined)))) @echo "$(if $(filter 1,$(PTXDIST_VERBOSE)),$(*)=)$($(*))" |