summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-10-29 14:37:02 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-11-16 15:43:18 +0100
commit5dad57e859e8ef67989fa5d1e28f07708f99920e (patch)
treec7b7b53f6ce882b3da7fd0639fbadece22d6e0bf /scripts
parent8936ec4d2495c49e1ba699320632a7249a585b10 (diff)
downloadptxdist-5dad57e859e8ef67989fa5d1e28f07708f99920e.tar.gz
ptxdist-5dad57e859e8ef67989fa5d1e28f07708f99920e.tar.xz
[devpkg] be smarter when looking for dev packages
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/ptxd_make_00-init.sh18
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/lib/ptxd_make_00-init.sh b/scripts/lib/ptxd_make_00-init.sh
index b234c6800..b74e47a84 100644
--- a/scripts/lib/ptxd_make_00-init.sh
+++ b/scripts/lib/ptxd_make_00-init.sh
@@ -184,6 +184,7 @@ ptxd_init_cross_env() {
ptxd_init_devpkg()
{
local prefix
+ local -a path
prefix="$(ptxd_get_ptxconf PTXCONF_PROJECT_DEVPKGDIR)" || return 0
@@ -192,12 +193,21 @@ ptxd_init_devpkg()
platform_version="$(ptxd_get_ptxconf PTXCONF_PLATFORM_VERSION)"
if [ -n "${platform}" ]; then
- prefix="${prefix}/platform-${platform}${platform_version}"
- else
- : # nothing to do for non-platform BSPs
+ path[${#path[@]}]="${prefix}/platform-${platform}${platform_version}"
+ path[${#path[@]}]="${prefix}/platform-${platform}/packages"
+ fi
+ path[${#path[@]}]="${prefix}/packages"
+ path[${#path[@]}]="${prefix}"
+
+ if ! ptxd_get_path "${path[@]}"; then
+ ptxd_warning "No dev packages found in '$(ptxd_print_path "${prefix}")'"
+ fi
+ if [ "${PKGDIR}" = "${ptxd_reply}" ]; then
+ # don't my own packages. The timestamps mess up the dependencies.
+ return
fi
- PTXDIST_DEVPKG_PLATFORMDIR="${prefix}"
+ PTXDIST_DEVPKG_PLATFORMDIR="${ptxd_reply}"
export PTXDIST_DEVPKG_PLATFORMDIR
}