diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-11 16:28:46 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-11 16:28:46 +0000 |
| commit | 9afdda46100990f3be10d0009d606b258cb64785 (patch) | |
| tree | d45396a4a038e91871bc80e2ddecdfea55fa71ad | |
| parent | fef44a59640a4335cfe13710690ba4fce76c73e8 (diff) | |
| download | ptxdist-9afdda46100990f3be10d0009d606b258cb64785.tar.gz ptxdist-9afdda46100990f3be10d0009d606b258cb64785.tar.xz | |
* scripts/libptxdist.sh, bin/ptxdist:
put PTXCONF_HOST_PREFIX in path
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6842 33e552b5-05e3-0310-8538-816dae2090ed
| -rwxr-xr-x | bin/ptxdist | 34 | ||||
| -rw-r--r-- | scripts/libptxdist.sh | 8 |
2 files changed, 28 insertions, 14 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index fc392d2a1..67c2ff131 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -42,9 +42,9 @@ fi # we need the static variable definitions # for file in \ - scripts/libptxdist.sh \ - scripts/ptxdist_version.sh \ scripts/ptxdist_vars.sh \ + scripts/ptxdist_version.sh \ + scripts/libptxdist.sh \ ; do if test -e ${PTXDIST_TOPDIR}/$file; then . ${PTXDIST_TOPDIR}/$file @@ -60,6 +60,12 @@ done # use linked toolchain if available [ -d ".toolchain" ] && export PATH=${PTXDIST_WORKSPACE}/.toolchain:$PATH +# dir might not be available yet, but will be created later +prefix_host="`ptxd_get_ptxconf PTXCONF_HOST_PREFIX`" +if test -n "${prefix_host}"; then + export PATH="${prefix_host}:$PATH" +fi + # # board setup # @@ -628,18 +634,18 @@ newpacket () { fi sed \ - -e "s,\@packet_filename@,${packet_filename},g" \ - -e "s,\@PACKET@,${PACKET},g" \ - -e "s,\@packet@,${packet},g" \ - -e "s,\@packetdash@,${packetdash},g" \ - -e "s,\@class@,${class},g" \ - -e "s,\@CLASS@,${CLASS},g" \ - -e "s,\@AUTOCONF_CLASS@,${autoconf_class},g" \ - -e "s,\@VERSION@,${version},g" \ - -e "s,\@URL@,${url},g" \ - -e "s,\@YEAR@,${year},g" \ - -e "s,\@AUTHOR@,${author},g" \ - -e "s,\@SUFFIX@,${suffix},g" \ + -e "s#\@packet_filename@#${packet_filename}#g" \ + -e "s#\@PACKET@#${PACKET}#g" \ + -e "s#\@packet@#${packet}#g" \ + -e "s#\@packetdash@#${packetdash}#g" \ + -e "s#\@class@#${class}#g" \ + -e "s#\@CLASS@#${CLASS}#g" \ + -e "s#\@AUTOCONF_CLASS@#${autoconf_class}#g" \ + -e "s#\@VERSION@#${version}#g" \ + -e "s#\@URL@#${url}#g" \ + -e "s#\@YEAR@#${year}#g" \ + -e "s#\@AUTHOR@#${author}#g" \ + -e "s#\@SUFFIX@#${suffix}#g" \ ${RULESDIR}/${template} \ > ${filename} diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index c0f63e3fb..9bce18348 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -21,6 +21,14 @@ shell() { } +ptxd_get_ptxconf() { + if test -z "${PTXCONF_MODULES}"; then + source "${PTXCONFIG}" + fi + + echo "${!1}" +} + # # $1 copy_back; "true" copies the .config file back to ptxdist # $2 function that is called |