summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-04-22 11:31:43 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-04-22 11:38:15 +0200
commit3091cb37cf5925e9c062700addab63d365f82b63 (patch)
tree68c26a41f3d60c78898981f1c0ff85377f3d8343
parent1555d3e1131526f5d446254a0365deee95b31922 (diff)
downloadptxdist-3091cb37cf5925e9c062700addab63d365f82b63.tar.gz
ptxdist-3091cb37cf5925e9c062700addab63d365f82b63.tar.xz
[xpkg_finish] fix dependencies
This patch revert the changes of "6dbb9f7602677b2b6407ff9b8ad1d09d449c76b6" on file "scripts/lib/ptxd_make_xpkg_finish.sh". The wrong map file was used to create ipkg dependencies, resulting in a package depending on itself not on the dependency pacakge. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 36cffa779405b635a80f591f90489848aeb6b2d8) Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--scripts/lib/ptxd_make_xpkg_finish.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_finish.sh b/scripts/lib/ptxd_make_xpkg_finish.sh
index 0d9a92b96..719b07598 100644
--- a/scripts/lib/ptxd_make_xpkg_finish.sh
+++ b/scripts/lib/ptxd_make_xpkg_finish.sh
@@ -30,15 +30,16 @@ ptxd_make_xpkg_deps() {
local dep
while [ ${#} -ne 0 ]; do
+ local map="${ptx_state_dir}/${1}.xpkg.map"
shift
- if [ \! -e "${pkg_xpkg_map}" ]; then
+ if [ \! -e "${map}" ]; then
continue
fi
while read dep; do
pkg_xpkg_deps=( "${pkg_xpkg_deps[@]}" "${dep}" )
- done < "${pkg_xpkg_map}"
+ done < "${map}"
done
}
export -f ptxd_make_xpkg_deps