diff options
| -rw-r--r-- | TODO | 6 | ||||
| -rwxr-xr-x | bin/ptxdist | 15 |
2 files changed, 16 insertions, 5 deletions
@@ -105,11 +105,15 @@ make: *** [/home/frogger/pengutronix/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/pla when being run with sudo (see start/stop/connect scripts in i586) and /dev/net/tun must be made rwrwrw. -[ ] jbe: Would it be possible to delete a directory defined by PTXCONF_SYSROOT_TARGET +[x] jbe: Would it be possible to delete a directory defined by PTXCONF_SYSROOT_TARGET in the form "${PTXDIST_WORKSPACE}/local/${PTXCONF_ARCH_STRING}" Currently the "local" part still exists when running "ptxdist clean". This is for ptxdist-1 backward compatibility. + Update 20090126: the correct is path is: + "${PTXDIST_WORKSPACE}/local/${PTXCONF_GNU_TARGET}" + and it is cleaned now + [ ] bbu: default path to generic projects seems not work [ ] mkl/jbe: Host's environment variable PKG_CONFIG_PATH leaks into PTXdist's build diff --git a/bin/ptxdist b/bin/ptxdist index e7ebccd9..bbec8bf7 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -735,7 +735,6 @@ EOF clean() { local dir bdir - local ptxconf_sysroot_target ptxconf_sysroot_host ptxconf_sysroot_cross # we want to clean the root dir if [ "${1}" = "root" ]; then @@ -778,9 +777,10 @@ clean() { if [ -f "${PTXDIST_PTXCONFIG}" ]; then echo "${PROMPT}removing sysroot directories..." - ptxconf_sysroot_target="$(ptxd_get_ptxconf PTXCONF_SYSROOT_TARGET)" - ptxconf_sysroot_host="$(ptxd_get_ptxconf PTXCONF_SYSROOT_HOST)" - ptxconf_sysroot_cross="$(ptxd_get_ptxconf PTXCONF_SYSROOT_CROSS)" + local ptxconf_sysroot_target="$(ptxd_get_ptxconf PTXCONF_SYSROOT_TARGET)" + local ptxconf_sysroot_host="$(ptxd_get_ptxconf PTXCONF_SYSROOT_HOST)" + local ptxconf_sysroot_cross="$(ptxd_get_ptxconf PTXCONF_SYSROOT_CROSS)" + local ptxconf_gnu_target="$(ptxd_get_ptxconf PTXCONF_GNU_TARGET)" for dir in "${ptxconf_sysroot_target}" "${ptxconf_sysroot_host}" "${ptxconf_sysroot_cross}"; do if [ ! -d "${dir}" ]; then @@ -799,6 +799,13 @@ clean() { ;; esac done + + # this is for ptxdist-1 backward compatibility + dir="${PTXDIST_WORKSPACE}/local/${ptxconf_gnu_target}" + if [ -n "${ptxconf_gnu_target}" -a -d "${dir}" ]; then + rm -rf "${dir}" || true + rmdir "${PTXDIST_WORKSPACE}/local" >/dev/null 2>&1 || true + fi fi echo "${PROMPT}removing deps..." |