summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/binconfig.bbclass6
-rw-r--r--meta/classes/cross.bbclass2
-rw-r--r--meta/classes/kernel.bbclass2
-rw-r--r--meta/classes/native.bbclass3
-rw-r--r--meta/classes/siteconfig.bbclass5
-rw-r--r--meta/classes/staging.bbclass26
6 files changed, 25 insertions, 19 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 73ca4d6219..8e22d2d292 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -47,8 +47,8 @@ SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
47binconfig_sysroot_preprocess () { 47binconfig_sysroot_preprocess () {
48 for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do 48 for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
49 configname=`basename $config` 49 configname=`basename $config`
50 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS} 50 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
51 cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname 51 cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
52 chmod u+x ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname 52 chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
53 done 53 done
54} 54}
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 7c20be0b81..6ec98b2395 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -50,6 +50,8 @@ base_sbindir = "${bindir}"
50libdir = "${exec_prefix}/lib/${MULTIMACH_TARGET_SYS}" 50libdir = "${exec_prefix}/lib/${MULTIMACH_TARGET_SYS}"
51libexecdir = "${exec_prefix}/libexec/${MULTIMACH_TARGET_SYS}" 51libexecdir = "${exec_prefix}/libexec/${MULTIMACH_TARGET_SYS}"
52 52
53do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}"
54
53do_install () { 55do_install () {
54 oe_runmake 'DESTDIR=${D}' install 56 oe_runmake 'DESTDIR=${D}' install
55} 57}
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 47110a21aa..9d3b2bbd8a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -185,7 +185,7 @@ kernel_do_install() {
185} 185}
186 186
187sysroot_stage_all_append() { 187sysroot_stage_all_append() {
188 sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR} 188 sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}/kernel
189} 189}
190 190
191 191
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 3ca9d62845..aec7fe38a9 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -60,6 +60,9 @@ base_prefix = "${STAGING_DIR_NATIVE}"
60prefix = "${STAGING_DIR_NATIVE}${prefix_native}" 60prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
61exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" 61exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
62 62
63do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}"
64do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_NATIVE}"
65
63# Since we actually install these into situ there is no staging prefix 66# Since we actually install these into situ there is no staging prefix
64STAGING_DIR_HOST = "" 67STAGING_DIR_HOST = ""
65STAGING_DIR_TARGET = "" 68STAGING_DIR_TARGET = ""
diff --git a/meta/classes/siteconfig.bbclass b/meta/classes/siteconfig.bbclass
index 37d910e1da..e7cc9ae0da 100644
--- a/meta/classes/siteconfig.bbclass
+++ b/meta/classes/siteconfig.bbclass
@@ -20,8 +20,9 @@ siteconfig_do_siteconfig_gencache () {
20 sed -n -e "/ac_cv_c_bigendian/p" -e "/ac_cv_sizeof_/p" \ 20 sed -n -e "/ac_cv_c_bigendian/p" -e "/ac_cv_sizeof_/p" \
21 -e "/ac_cv_type_/p" -e "/ac_cv_header_/p" -e "/ac_cv_func_/p" \ 21 -e "/ac_cv_type_/p" -e "/ac_cv_header_/p" -e "/ac_cv_func_/p" \
22 < ${PN}_cache > ${PN}_config 22 < ${PN}_cache > ${PN}_config
23 mkdir -p ${SYSROOT_DESTDIR}${SITECONFIG_SYSROOTCACHE} 23 mkdir -p ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d
24 cp ${PN}_config ${SYSROOT_DESTDIR}${SITECONFIG_SYSROOTCACHE} 24 cp ${PN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d
25
25} 26}
26 27
27do_populate_sysroot[sstate-interceptfuncs] += "do_siteconfig " 28do_populate_sysroot[sstate-interceptfuncs] += "do_siteconfig "
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
56sysroot_stage_all() { 56sysroot_stage_all() {
@@ -90,8 +90,8 @@ python do_populate_sysroot () {
90 90
91SSTATETASKS += "do_populate_sysroot" 91SSTATETASKS += "do_populate_sysroot"
92do_populate_sysroot[sstate-name] = "populate-sysroot" 92do_populate_sysroot[sstate-name] = "populate-sysroot"
93do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR}" 93do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}"
94do_populate_sysroot[sstate-outputdirs] = "${TMPDIR}/sysroots" 94do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/"
95 95
96python do_populate_sysroot_setscene () { 96python do_populate_sysroot_setscene () {
97 sstate_setscene(d) 97 sstate_setscene(d)