From 103d1e3ddb00577f4027de29c000b63d9a5bb062 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 29 Oct 2007 15:52:18 +0000 Subject: base.bbclass: Update staging references (from poky) --- classes/base.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 2cf205fbe9..8904b97883 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -687,10 +687,10 @@ base_do_stage () { : } -do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${TARGET_SYS}/lib \ - ${STAGING_DIR}/${TARGET_SYS}/include \ - ${STAGING_DIR}/${BUILD_SYS}/bin ${STAGING_DIR}/${BUILD_SYS}/lib \ - ${STAGING_DIR}/${BUILD_SYS}/include \ +do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \ + ${STAGING_DIR_TARGET}/include \ + ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \ + ${STAGING_INCDIR_NATIVE} \ ${STAGING_DATADIR} \ ${S} ${B}" -- cgit v1.2.3 From 4a8c887ee370ce0bb2153d474e7f1321b89c21d1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 29 Oct 2007 15:54:02 +0000 Subject: base.bbclass: Move do_install note to more appropriate place --- classes/base.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 8904b97883..c504f78283 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -387,9 +387,6 @@ oe_machinstall() { fi } -# Remove and re-create ${D} so that is it guaranteed to be empty -do_install[cleandirs] = "${D}" - addtask listtasks do_listtasks[nostamp] = "1" python do_listtasks() { @@ -703,6 +700,8 @@ python do_populate_staging () { addtask install after do_compile do_install[dirs] = "${D} ${S} ${B}" +# Remove and re-create ${D} so that is it guaranteed to be empty +do_install[cleandirs] = "${D}" base_do_install() { : -- cgit v1.2.3