diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-16 15:29:26 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-16 15:29:26 +0200 |
| commit | 1520848b7812e6daf8f78cf084fbb14f57802082 (patch) | |
| tree | db5f006c0d84ecf42a2173aa26a5ea2032038a2c /bin | |
| parent | 97cdd287d8ed06c3154340f04f43d491df669a13 (diff) | |
| parent | 219728562e61ab5cf73bb6b5499fb68a36b273d2 (diff) | |
| download | ptxdist-1520848b7812e6daf8f78cf084fbb14f57802082.tar.gz ptxdist-1520848b7812e6daf8f78cf084fbb14f57802082.tar.xz | |
Merge branch 'next/image_cleanups' of git://git.pengutronix.de/git/mkl/ptxdist
Conflicts:
scripts/lib/ptxd_make_install.sh
This is due to "360f73777af1661d85ae0aa2434b6acde22da9fa" Fix
dependencies to files in projectroot.
The modifications to ptxd_make_install_init have been moved to
ptxd_make_xpkg_prepare.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index cb1ffd77c..7f02a9a0a 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -174,7 +174,7 @@ check_uid() { # remove "." from the PATH # check_path() { - PATH="$(echo "${PATH}" | sed -e "s/:\.$//" -e "s/^\.://" -e "s/:\.://")" + PATH="$(echo "${PATH}" | sed -e "s/\(:\.\)\+:/:/g" -e "s/\(^\.:\|:\.$\)//g")" } @@ -1689,7 +1689,6 @@ do_go() do_images() { check_premake_compiler && - ptxd_make_log images_world && ptxd_make_log images } |