10 files changed, 14 insertions, 19 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 8ee1cc6838..1e385f1394 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -91,6 +91,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 
+MULTIMACH_ARCH = "${PACKAGE_ARCH}"
+MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
+
 # select proper CPU to get binary locales generated
 QEMU_OPTIONS = ""
 QEMU_OPTIONS_iwmmxt  = "-cpu pxa270-c5"
@@ -211,8 +215,8 @@ SVNDIR = "${CO_DIR}/svn"
 GITDIR = "${CO_DIR}/git"
 BZRDIR = "${CO_DIR}/bzr"
 
-STAMP = "${TMPDIR}/stamps/${PF}"
-WORKDIR = "${TMPDIR}/work/${PF}"
+STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}"
+WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
 S = "${WORKDIR}/${P}"
@@ -248,7 +252,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
 DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
-PKGDATA_DIR = "${STAGING_DIR}/pkgdata"
+PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
 SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
 SDK_PREFIX = "/usr/local/${SDK_NAME}"
@@ -258,7 +262,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}"
 ##################################################################
 
 OLDEST_KERNEL = "2.4.0"
-STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel"
+STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel"
 
 ##################################################################
 # Specific image creation and rootfs population info.
diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf
index 03dcd22d79..ad7a34d97c 100644
--- a/conf/distro/celinux-test.conf
+++ b/conf/distro/celinux-test.conf
@@ -11,9 +11,6 @@
 # we want IPKG packages and Debian style naming
 INHERIT += " package_ipk debian"
 
-# enable if build for many machines
-#INHERIT += " multimachine"
-
 # we want images supporting the following features (for task-base)
 DISTRO_FEATURES = "nfs pcmcia usbhost"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index bbdbe7f80b..4ada4a89d4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -35,9 +35,6 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
 #use debian style naming
 INHERIT += "debian"
 
-#use multimachine buildrules 
-INHERIT += "multimachine"
-
 #activate config checker
 INHERIT += "sanity" 
 
diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index a7eac524bc..36eca58241 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -9,9 +9,6 @@ BB_MIN_VERSION = "1.8.10"
 #OPLinux and OPLinux-uclibc source mirrors
 INHERIT += "oplinux-mirrors"
 
-#oplinux is a multimachine distro
-INHERIT += "multimachine"
-
 # check for required tools and minimal BitBake version
 INHERIT += "sanity"
 
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8661e5b065..b149f65f11 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -42,7 +42,7 @@ TARGET_FPU = "soft"
 # glib-2.0 builds require USE_NLS to be overridden
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += "package_ipk debian multimachine"
+INHERIT += "package_ipk debian"
 
 # FULL_OPTIMIZATION
 #    Optimization settings.  Os works fine and is significantly better than O2.
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index b8c7dae22e..d5b994c55c 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -81,7 +81,7 @@ PREFERRED_VERSION_busybox = "1.9.1"
 #<>It will use different folders depending on Arch (set in local.conf)
 #<>------------------------------------------------------------------<
 SRC_DIST_LOCAL = "copy"
-INHERIT += "package_ipk package_tar multimachine src_distribute_local"
+INHERIT += "package_ipk package_tar src_distribute_local"
 BBINCLUDELOGS = "yes"
 IMAGE_FSTYPES = "tar.bz2"
 TARGET_OS = "linux"
diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf
index 68353b0bd9..646d335390 100644
--- a/conf/distro/jlime-henchman.conf
+++ b/conf/distro/jlime-henchman.conf
@@ -32,7 +32,7 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
 #
 # Naming schemes
 #
-INHERIT += "debian multimachine"
+INHERIT += "debian"
 
 #
 # Packaging and output format
diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf
index 6fb00f1452..e2b2e8b7db 100644
--- a/conf/distro/jlime-mongo.conf
+++ b/conf/distro/jlime-mongo.conf
@@ -32,7 +32,7 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
 #
 # Naming schemes
 #
-INHERIT += "debian multimachine"
+INHERIT += "debian"
 
 #
 # Packaging and output format
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index b54b0c8c8b..e86cf5cd4f 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -19,7 +19,7 @@ DISTRO_TYPE = "debug"
 #
 # Naming schemes
 #
-INHERIT += "debian multimachine"
+INHERIT += "debian"
 
 #
 # Packaging and output format
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index 533b41526b..4b620fe6be 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -17,7 +17,7 @@ MACHINE_TASK_PROVIDER = "task-openprotium"
 #
 # Naming schemes
 #
-INHERIT += "debian multimachine"
+INHERIT += "debian"
 
 #
 # Packaging and output format