From 5cb246dbf164d31ce0428dd2fa288d033ded4d0e Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 7 Dec 2011 21:28:22 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/machine/include/ia32/arch-ia32.inc | 4 ++-- meta/conf/machine/include/tune-core2.inc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/conf/machine') 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" -- cgit v1.2.3-54-g00ecf