diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-01-18 16:17:58 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-21 11:18:37 +0000 |
commit | bc9d2fbfd4eaad0df5647dd5d07dfb9fcff80ff3 (patch) | |
tree | 932aff7c30893ed2625143e53a968521c8ebf8d7 /meta/classes/staging.bbclass | |
parent | b1025bd5385de70ba1e1fc8ec9d2fb59d7fe1e91 (diff) | |
download | poky-bc9d2fbfd4eaad0df5647dd5d07dfb9fcff80ff3.tar.gz |
staging: Use relative path in sysroot-destdir for target recipes
Original we used absolute path in sysroot-destdir for both native and
target recipes. This commit changes target recipes to use relative path
which is same as the image directory.
[sgw: merged with libtool sysroot work]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 438cf375b9..72d77e2b54 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -32,25 +32,25 @@ sysroot_stage_dirs() { | |||
32 | from="$1" | 32 | from="$1" |
33 | to="$2" | 33 | to="$2" |
34 | 34 | ||
35 | sysroot_stage_dir $from${includedir} $to${STAGING_INCDIR} | 35 | sysroot_stage_dir $from${includedir} $to${includedir} |
36 | if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then | 36 | if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then |
37 | sysroot_stage_dir $from${bindir} $to${STAGING_DIR_HOST}${bindir} | 37 | sysroot_stage_dir $from${bindir} $to${bindir} |
38 | sysroot_stage_dir $from${sbindir} $to${STAGING_DIR_HOST}${sbindir} | 38 | sysroot_stage_dir $from${sbindir} $to${sbindir} |
39 | sysroot_stage_dir $from${base_bindir} $to${STAGING_DIR_HOST}${base_bindir} | 39 | sysroot_stage_dir $from${base_bindir} $to${base_bindir} |
40 | sysroot_stage_dir $from${base_sbindir} $to${STAGING_DIR_HOST}${base_sbindir} | 40 | sysroot_stage_dir $from${base_sbindir} $to${base_sbindir} |
41 | sysroot_stage_dir $from${libexecdir} $to${STAGING_DIR_HOST}${libexecdir} | 41 | sysroot_stage_dir $from${libexecdir} $to${libexecdir} |
42 | sysroot_stage_dir $from${sysconfdir} $to${STAGING_DIR_HOST}${sysconfdir} | 42 | sysroot_stage_dir $from${sysconfdir} $to${sysconfdir} |
43 | sysroot_stage_dir $from${localstatedir} $to${STAGING_DIR_HOST}${localstatedir} | 43 | sysroot_stage_dir $from${localstatedir} $to${localstatedir} |
44 | fi | 44 | fi |
45 | if [ -d $from${libdir} ] | 45 | if [ -d $from${libdir} ] |
46 | then | 46 | then |
47 | sysroot_stage_libdir $from/${libdir} $to${STAGING_LIBDIR} | 47 | sysroot_stage_libdir $from/${libdir} $to${libdir} |
48 | fi | 48 | fi |
49 | if [ -d $from${base_libdir} ] | 49 | if [ -d $from${base_libdir} ] |
50 | then | 50 | then |
51 | sysroot_stage_libdir $from${base_libdir} $to${STAGING_DIR_HOST}${base_libdir} | 51 | sysroot_stage_libdir $from${base_libdir} $to${base_libdir} |
52 | fi | 52 | fi |
53 | sysroot_stage_dir $from${datadir} $to${STAGING_DATADIR} | 53 | sysroot_stage_dir $from${datadir} $to${datadir} |
54 | } | 54 | } |
55 | 55 | ||
56 | sysroot_stage_all() { | 56 | sysroot_stage_all() { |
@@ -90,8 +90,8 @@ python do_populate_sysroot () { | |||
90 | 90 | ||
91 | SSTATETASKS += "do_populate_sysroot" | 91 | SSTATETASKS += "do_populate_sysroot" |
92 | do_populate_sysroot[sstate-name] = "populate-sysroot" | 92 | do_populate_sysroot[sstate-name] = "populate-sysroot" |
93 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR}" | 93 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" |
94 | do_populate_sysroot[sstate-outputdirs] = "${TMPDIR}/sysroots" | 94 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/" |
95 | 95 | ||
96 | python do_populate_sysroot_setscene () { | 96 | python do_populate_sysroot_setscene () { |
97 | sstate_setscene(d) | 97 | sstate_setscene(d) |