summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-26 10:04:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-26 11:37:32 +0000
commit82745e4f32e83a49e2fbb825ace8d3452c37b4d4 (patch)
treefedd20ab2a9dae1e1c8266f992215cc2e96d6859 /meta
parent70301cc433f418af2654a9a7f1353faf4be03a3d (diff)
downloadpoky-82745e4f32e83a49e2fbb825ace8d3452c37b4d4.tar.gz
cross.bbclass: Move sysroot_stage_all function to the only place that uses it now (gcc-cross-intermediate)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cross.bbclass13
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc12
2 files changed, 12 insertions, 13 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 2564505d6a..f9fd07a9a2 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -62,16 +62,3 @@ do_install () {
62 oe_runmake 'DESTDIR=${D}' install 62 oe_runmake 'DESTDIR=${D}' install
63} 63}
64 64
65#
66# Override the default sysroot staging copy since this won't look like a target system
67#
68sysroot_stage_all() {
69 sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
70 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/
71 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/
72 mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true
73 mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
74}
75
76
77
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 01571a3202..2e5283d691 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -45,3 +45,15 @@ do_install () {
45 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t 45 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
46 done 46 done
47} 47}
48
49#
50# Override the default sysroot staging copy since this won't look like a target system
51#
52sysroot_stage_all() {
53 sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
54 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/
55 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/
56 mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true
57 mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
58}
59