summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-07 21:28:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-12 21:50:19 +0000
commit5cb246dbf164d31ce0428dd2fa288d033ded4d0e (patch)
tree16645e3a59ed2bb4579975022d1abc1c95cd8f70 /meta/conf
parent6e8e25f0821d2e3c05042f1e85c973ef0bcd52b9 (diff)
downloadpoky-5cb246dbf164d31ce0428dd2fa288d033ded4d0e.tar.gz
x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH
rpmbuild can not handle the PACKAGE_ARCH of these kinds: x86_64-x32, core2-64, core2-64-x32 With these kinds of PACKAGE_ARCH the --target parameter of rpmbuild becomes like: core2-64-x32-poky-linux-gnux32 ; And rpmbuild extracts %_target (arch) wrongly as core2 generating these kinds of rpms with incorrect filenames: zip-3.0-r0.core2.rpm So this commit fixes the issue by making PACKAGE_ARCH like this: x86_64_x32, core2_64, core2_64_x32 Now --target parameter of rpmbuild becomes like: core2_64_x32-poky-linux-gnux32 ; And rpmbuild extracts %_target (arch) correctly as core2_64_x32 generating these kinds of rpms with correct filenames: zip-3.0-r0.core2_64_x32.rpm (From OE-Core rev: 1a599cc822ad517f9ba70ceb0e39c5572d37a5a6) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc4
-rw-r--r--meta/conf/machine/include/tune-core2.inc6
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index ee919830c0..0931c26520 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -45,5 +45,5 @@ PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
45AVAILTUNES += "x86-64-x32" 45AVAILTUNES += "x86-64-x32"
46TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" 46TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
47BASE_LIB_tune-x86-64-x32 ?= "libx32" 47BASE_LIB_tune-x86-64-x32 ?= "libx32"
48PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32" 48PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64_x32"
49TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" 49TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "_x32", "", d)}"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 565a39c273..7cde5111d2 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -1,5 +1,5 @@
1DEFAULTTUNE ?= "core2" 1DEFAULTTUNE ?= "core2"
2TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}" 2TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2_64", d)}"
3 3
4require conf/machine/include/tune-i586.inc 4require conf/machine/include/tune-i586.inc
5 5
@@ -16,9 +16,9 @@ PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586
16AVAILTUNES += "core2-64" 16AVAILTUNES += "core2-64"
17TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2" 17TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2"
18BASE_LIB_tune-core2-64 ?= "lib64" 18BASE_LIB_tune-core2-64 ?= "lib64"
19PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64" 19PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64"
20 20
21AVAILTUNES += "core2-64-x32" 21AVAILTUNES += "core2-64-x32"
22TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2" 22TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2"
23BASE_LIB_tune-core2-64-x32 ?= "libx32" 23BASE_LIB_tune-core2-64-x32 ?= "libx32"
24PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32" 24PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32"