Patchwork tune-powerpc: Set TUNE_PKGARCH instead of adding to it on powerpc machine tune.inc files

login
mail settings
Submitter Malcolm Crossley
Date Aug. 1, 2011, 3:51 p.m.
Message ID <4E36CB93.2030006@ge.com>
Download mbox | patch
Permalink /patch/9015/
State New, archived
Headers show

Comments

Malcolm Crossley - Aug. 1, 2011, 3:51 p.m.
Set TUNE_PKGARCH instead of adding to it on powerpc machine tune.inc 
files.The ppce300c2 tune file already sets the TUNE_PKGARCH variable 
instead of adding to it.

Adding to the TUNE_PKGARCH variable is causing the TUNE_PKGARCH to not 
match the PACKAGE_EXTRA_ARCHS variable. This then meant the packaging 
mechanism could not find the packages to install into the rootfs. E.G. 
powerpcppce500mc was not in PACKAGE_EXTRA_ARCHS.

Signed-off-by: Malcolm Crossley <malcolm.crossley@ge.com>
---

I chose to implement it this way because it mirrored how the ppce300c2 
and core2.inc tune file's are done. If the intention is to keep the 
"powerpc" on the front then the PACKAGE_EXTRA_ARCHS variable will need 
to be changed instead.


  TUNEVALID[spe] = "Enable SPE ABI extensions"
  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", 
"-mabi=spe -mspe", "", d)}"

Patch

diff --git a/meta/conf/machine/include/tune-ppc603e.inc 
b/meta/conf/machine/include/tune-ppc603e.inc
index 7c05394..fb6abaf 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -4,7 +4,7 @@  require conf/machine/include/powerpc/arch-powerpc.inc

  TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", 
"-mcpu=603e", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", 
"ppc603e", "", d)}"
+TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", 
"ppc603e", "", d)}"

  AVAILTUNES += "ppc603e"
  TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce500.inc 
b/meta/conf/machine/incl
ude/tune-ppce500.inc
index c34d631..53c8038 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -4,7 +4,7 @@  require conf/machine/include/powerpc/arch-powerpc.inc

  TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations"
  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", 
"-mcpu=8540",
"", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500", 
"ppce500", ""
, d)}"
+TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500", 
"ppce500", "",
  d)}"

  TUNEVALID[spe] = "Enable SPE ABI extensions"
  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", 
"-mabi=spe -mspe", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc 
b/meta/conf/machine/include/tune-ppce500mc.inc
index 73217dd..8cbaec3 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -4,7 +4,7 @@  require conf/machine/include/powerpc/arch-powerpc.inc

  TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", 
"-mcpu=e500mc", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", 
"ppce500mc", "", d)}"
+TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", 
"ppce500mc", "", d)}"

  AVAILTUNES += "ppce500mc"
  TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc 
b/meta/conf/machine/include/tune-ppce500v2.inc
index 819d68a..1594e51 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -4,7 +4,7 @@  require conf/machine/include/powerpc/arch-powerpc.inc

  TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations"
  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", 
"-mcpu=8548", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", 
"ppce500v2", "", d)}"
+TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", 
"ppce500v2", "", d)}"