diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-12-30 13:21:25 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-18 10:00:15 +0100 |
| commit | b4edfb98da8ad0f2430e4775e3ce28289c9c01b1 (patch) | |
| tree | 7c0a3091991f9208617b0b59dabdbb3490618a56 /scripts/lib | |
| parent | ab3eda7bfd99ed897614ca7ce7da5356e2d8cf7d (diff) | |
| download | ptxdist-b4edfb98da8ad0f2430e4775e3ce28289c9c01b1.tar.gz ptxdist-b4edfb98da8ad0f2430e4775e3ce28289c9c01b1.tar.xz | |
[lib] define pkg_sysroot_dir for all packages
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 4 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_install_mangle_pc.awk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index a8b0f73b6..b65189087 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -144,9 +144,11 @@ ptxd_make_world_init_compat() { # case "${pkg_stamp}" in initramfs-*|klibc-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_TARGET}/usr/lib/klibc" ;; - host-*|cross-*) pkg_sysroot_dir="";; + host-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_HOST}" ;; + cross-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_CROSS}" ;; *) pkg_sysroot_dir="${PTXDIST_SYSROOT_TARGET}" ;; esac + export pkg_sysroot_dir # pkg_env diff --git a/scripts/lib/ptxd_make_world_install_mangle_pc.awk b/scripts/lib/ptxd_make_world_install_mangle_pc.awk index 0e27b615c..705088440 100644 --- a/scripts/lib/ptxd_make_world_install_mangle_pc.awk +++ b/scripts/lib/ptxd_make_world_install_mangle_pc.awk @@ -11,7 +11,7 @@ BEGIN { FS = "([[:space:]]|=)[[:space:]]*"; - SYSROOT = ENVIRON["PTXDIST_SYSROOT_TARGET"]; + SYSROOT = ENVIRON["pkg_sysroot_dir"]; pkg_pkg_dir = ENVIRON["pkg_pkg_dir"]; # quote "+" and "/" |