The main branch only supports building with kirkstone now so we no longer need this to tweak paths for older branches.
Signed-off-by: Anuj Mittal <[email protected]> --- conf/layer.conf | 2 -- conf/machine/include/intel-core2-32-common.inc | 4 ++-- conf/machine/include/intel-corei7-64-common.inc | 4 ++-- conf/machine/include/tune-skylake.inc | 2 +- conf/machine/intel-skylake-64.conf | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index b81d891c..64e209b6 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -41,5 +41,3 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" PREFERRED_PROVIDER_libva-utils ?= "libva-utils" PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" - -X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone', 'include/x86', 'include', d)}" diff --git a/conf/machine/include/intel-core2-32-common.inc b/conf/machine/include/intel-core2-32-common.inc index 20d50207..ce34d9bb 100644 --- a/conf/machine/include/intel-core2-32-common.inc +++ b/conf/machine/include/intel-core2-32-common.inc @@ -3,5 +3,5 @@ # DEFAULTTUNE ?= "core2-32" -require conf/machine/${X86_TUNE_DIR}/tune-core2.inc -require conf/machine/${X86_TUNE_DIR}/x86-base.inc +require conf/machine/include/x86/tune-core2.inc +require conf/machine/include/x86/x86-base.inc diff --git a/conf/machine/include/intel-corei7-64-common.inc b/conf/machine/include/intel-corei7-64-common.inc index 82645eb3..3498ebe3 100644 --- a/conf/machine/include/intel-corei7-64-common.inc +++ b/conf/machine/include/intel-corei7-64-common.inc @@ -3,5 +3,5 @@ # DEFAULTTUNE ?= "corei7-64" -require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc -require conf/machine/${X86_TUNE_DIR}/x86-base.inc +require conf/machine/include/x86/tune-corei7.inc +require conf/machine/include/x86/x86-base.inc diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc index b3630edd..05b7283c 100644 --- a/conf/machine/include/tune-skylake.inc +++ b/conf/machine/include/tune-skylake.inc @@ -8,7 +8,7 @@ DEFAULTTUNE ?= "skylake-64" # Include the previous tune to pull in PACKAGE_EXTRA_ARCHS -require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc +require conf/machine/include/x86/tune-corei7.inc # Extra tune features TUNEVALID[skylake] = "Enable skylake specific processor optimizations" diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf index 84dee4bb..47d53fa0 100644 --- a/conf/machine/intel-skylake-64.conf +++ b/conf/machine/intel-skylake-64.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for 64 bit Intel Skylake CPU (and later) with MMX, SSE, SSE2, SSE3, SSE4.1, SSE4.2, AVX, and AVX2 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. require conf/machine/include/meta-intel.inc -require conf/machine/${X86_TUNE_DIR}/x86-base.inc +require conf/machine/include/x86/x86-base.inc require conf/machine/include/tune-skylake.inc require conf/machine/include/intel-common-pkgarch.inc -- 2.35.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7483): https://lists.yoctoproject.org/g/meta-intel/message/7483 Mute This Topic: https://lists.yoctoproject.org/mt/90259318/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
