diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-10-20 16:20:51 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-10-20 16:20:51 +0000 |
| commit | ffb60e11a255177cdfe3e06589a8da755f82e959 (patch) | |
| tree | 04395104eef60b1c972ac57c1fb91085378308dc /bin | |
| parent | aea5ce0c24064cd2a8c0781080c3d562a70750a7 (diff) | |
| download | ptxdist-ffb60e11a255177cdfe3e06589a8da755f82e959.tar.gz ptxdist-ffb60e11a255177cdfe3e06589a8da755f82e959.tar.xz | |
* boardsetup: migrate boardsetup from copy-paste to ptxdist-mainline
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8937 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 3fdc47e63..ee1ca16a6 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -15,7 +15,6 @@ PTXDIST_PTXCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_ptxconfig' PTXDIST_PLATFORMCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_platformconfig' PTXDIST_TOOLCHAIN_DEFAULT='${PTXDIST_WORKSPACE}/selected_toolchain' PTXDIST_PTXRC_DEFAULT='${HOME}/.ptxdistrc.${FULLVERSION}' -PTXDIST_BOARDSETUP_DEFAULT='${PTXDIST_WORKSPACE}/boardsetup/boardsetup' PTXDIST_PACKAGES_COLLECTION_DEFAULT="ALL" @@ -899,7 +898,6 @@ parse_first() PTXDIST_TOOLCHAIN="${PTXDIST_TOOLCHAIN_DEFAULT}" PTXDIST_PLATFORMCONFIG="${PTXDIST_PLATFORMCONFIG_DEFAULT}" PTXDIST_PTXCONFIG="${PTXDIST_PTXCONFIG_DEFAULT}" - PTXDIST_BOARDSETUP="${PTXDIST_BOARDSETUP_DEFAULT}" PTXDIST_PACKAGES_COLLECTION="${PTXDIST_PACKAGES_COLLECTION_DEFAULT}" # @@ -1257,6 +1255,8 @@ parse_second() ;; boardsetup) + check_ptxconfig + [ -d ${HOME}/.ptxdist ] || mkdir ${HOME}/.ptxdist do_config menuconfig board exit ${?} ;; @@ -1580,12 +1580,13 @@ setup_libs() { # out: PTXDIST_PLATFORMDIR # PTXDIST_PLATFORMSUFFIX # PTXDIST_PLATFORMCONFIGDIR -# PTXDIST_BOARDSETUP_DEFAULT # "*DIR" correct directory definitions # setup_platform() { local cfg_dir local platform="$(ptxd_get_ptxconf PTXCONF_PLATFORM)" + local project="$(ptxd_get_ptxconf PTXCONF_PROJECT)" + local project_version="$(ptxd_get_ptxconf PTXCONF_PROJECT_VERSION)" if [ -n "${platform}" ]; then PTXDIST_PLATFORMDIR="${PTXDIST_WORKSPACE}/platform-${platform}" @@ -1605,7 +1606,7 @@ setup_platform() { fi PTXDIST_PLATFORMCONFIGDIR="${cfg_dir}" - eval PTXDIST_BOARDSETUP="${PTXDIST_BOARDSETUP_DEFAULT}" + PTXDIST_BOARDSETUP="${HOME}/.ptxdist/boardsetup.${project}${project_version}.${platform}" } |