From cfdb9ae992bf4e218a9b8410205c46d4da749170 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 19 Jul 2008 14:07:55 +0000
Subject: conf/bitbake.conf: Merge in multimachine making it the standard
 layout as discussed on the mailing list. Anyone wanting the previous layout
 can INHERIT the new singlemachine class

---
 classes/packaged-staging.bbclass | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'classes/packaged-staging.bbclass')

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 5de5970880..77fd8a92c3 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -19,9 +19,6 @@ PSTAGE_PKGPN      = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_
 PSTAGE_PKGNAME    = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk"
 PSTAGE_PKG        = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
 
-# multimachine.bbclass will override this but add a default in case we're not using it
-MULTIMACH_ARCH ?= "${PACKAGE_ARCH}"
-
 PSTAGE_NATIVEDEPENDS = "\
     shasum-native \
     stagemanager-native \
-- 
cgit v1.2.3