diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-12-07 21:28:22 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-12 21:50:09 +0000 |
| commit | 1a599cc822ad517f9ba70ceb0e39c5572d37a5a6 (patch) | |
| tree | 2efc3e2b2f0c5d69ea17134ddda6fe4470308235 /meta/conf | |
| parent | 046f7cce366bc68ec35076ffc4c6058567e5dbaf (diff) | |
| download | openembedded-core-1a599cc822ad517f9ba70ceb0e39c5572d37a5a6.tar.gz openembedded-core-1a599cc822ad517f9ba70ceb0e39c5572d37a5a6.tar.bz2 openembedded-core-1a599cc822ad517f9ba70ceb0e39c5572d37a5a6.zip | |
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
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/ia32/arch-ia32.inc | 4 | ||||
| -rw-r--r-- | meta/conf/machine/include/tune-core2.inc | 6 |
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" AVAILTUNES += "x86-64-x32" TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" BASE_LIB_tune-x86-64-x32 ?= "libx32" -PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32" -TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" +PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64_x32" +TUNE_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 @@ DEFAULTTUNE ?= "core2" -TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}" +TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2_64", d)}" require conf/machine/include/tune-i586.inc @@ -16,9 +16,9 @@ PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586 AVAILTUNES += "core2-64" TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2" BASE_LIB_tune-core2-64 ?= "lib64" -PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64" +PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64" AVAILTUNES += "core2-64-x32" TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2" BASE_LIB_tune-core2-64-x32 ?= "libx32" -PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32" +PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32" |