Skip to contentSkip to conversation

sstate.bbclass: fix multimachine builds when PACKAGE_ARCH = MACHINE_ARCH

PATCH In review Koen Kooi 3 participants 3 messages Jan 3, 2011 – Jan 4, 2011

lore
Share & tools
lore

Koen Kooi

author
#0 lore raw

PATCH 1/1 sstate.bbclass: fix multimachine builds when PACKAGE_ARCH = MACHINE_ARCH

From: Koen Kooi <[email protected]>

previously you could only build one set of packages for multiple machines:

MACHINE=foo bitbake task-base
MACHINE=bar bitbake task-base

would only create task-base packages for foo, but not for both foo and bar. Doing MACHINE=bar bitbake task-base -c cleanall would remove the packages for foo.

The solution is to use MULTIMACH_ARCH as suggested by Richard Purdie.

---
 meta/classes/sstate.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/sstate.bbclass +1 -1
index 0ba130c..b6e6c92 100644
@@ -5,7 +5,7 @@ SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_PKGARCH}-"
 SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
 
 
-SSTATE_PKGARCH    = "${BASE_PACKAGE_ARCH}"
+SSTATE_PKGARCH    = "${MULTIMACH_ARCH}"
 SSTATE_PKGSPEC    = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
 SSTATE_PKGNAME    = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
 SSTATE_PKG        = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
Signature · 1 line
1.6.6.1
#1 lore raw
Quoted 7 lines · Koen Kooi

From: Koen Kooi<[email protected]>

previously you could only build one set of packages for multiple machines:

MACHINE=foo bitbake task-base
MACHINE=bar bitbake task-base

Quoted 6 lines

would only create task-base packages for foo, but not for both foo and bar. Doing MACHINE=bar bitbake task-base -c cleanall would remove the packages for foo.

The solution is to use MULTIMACH_ARCH as suggested by Richard Purdie.

Acked by: Gary Thomas <[email protected]>

Quoted 17 lines
---
  meta/classes/sstate.bbclass |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/sstate.bbclass +1 -1
index 0ba130c..b6e6c92 100644
@@ -5,7 +5,7 @@ SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_PKGARCH}-"
  SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
 
 
-SSTATE_PKGARCH    = "${BASE_PACKAGE_ARCH}"
+SSTATE_PKGARCH    = "${MULTIMACH_ARCH}"
  SSTATE_PKGSPEC    = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
  SSTATE_PKGNAME    = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
  SSTATE_PKG        = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#2 lore raw
In reply to Koen Kooi
Quoted 22 lines · Koen Kooi

From: Koen Kooi<[email protected]>

previously you could only build one set of packages for multiple machines:

MACHINE=foo bitbake task-base
MACHINE=bar bitbake task-base

would only create task-base packages for foo, but not for both foo and bar. Doing MACHINE=bar bitbake task-base -c cleanall would remove the packages for foo.

The solution is to use MULTIMACH_ARCH as suggested by Richard Purdie.

---
  meta/classes/sstate.bbclass |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/sstate.bbclass +0 -0
index 0ba130c..b6e6c92 100644

meta/classes/sstate.bbclass SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_PKGARCH}-" · line 11

Quoted 8 lines
meta/classes/sstate.bbclass +1 -1
@@ -5,7 +5,7 @@ SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_PKGARCH}-"
  SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
 
 
-SSTATE_PKGARCH    = "${BASE_PACKAGE_ARCH}"
+SSTATE_PKGARCH    = "${MULTIMACH_ARCH}"
  SSTATE_PKGSPEC    = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
  SSTATE_PKGNAME    = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
  SSTATE_PKG        = "${SSTATE_DIR}/${SSTATE_PKGNAME}"

Pulled into master now

Thanks for the patch

Sau!