From 7f019514d81ac56135db70d22e38653fe557424a Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 16 Apr 2010 11:32:14 +0100 Subject: Move STAGING_BINDIR_CROSS into target sysroot, instead of native Cross scripts now live in sysroot/$arch-distro-os/crossscripts, this conveys that they are no longer native system dependant and emphasises their purpose. Bump the staging ABI and implement a simple migration from ABI 3 to ABI 4. Signed-off-by: Joshua Lock --- meta/conf/abi_version.conf | 2 +- meta/conf/bitbake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index 3ffcb616c..a3287a56f 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "3" +OELAYOUT_ABI = "4" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1745688fa..ee652e79e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -254,7 +254,7 @@ STAGING_DIR = "${TMPDIR}/sysroots" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" -STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}" +STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" -- cgit v1.2.3