From c7bf6a327b9b9ebb982324c6ef9f595f7a14f94a Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 5 Feb 2014 19:15:29 -0800 Subject: intel-common: Make using intel-common override opt-in Currently the intel-core*-common.inc files also include the intel-common-pkgarch.inc, forcing the introduction of the intel-common PACKAGE_ARCH. Coupling this with the addition of the intel-common MACHINE_OVERRIDE, means that even MACHINE_ARCH packages can be influenced by intel-common overrides, which is not desirable. Remove the intel-common-pkgarch.inc from the intel-core*common.inc include files, requiring BSPs wanting to use the intel-common mechanism to explicitly include it. This obviates the need to reset the linux-yocto PACKAGE_ARCH to MACHINE_ARCH. Signed-off-by: Darren Hart Cc: Richard Purdie --- conf/machine/intel-corei7-64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf/machine/intel-corei7-64.conf') diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index abf38727..23af4eb1 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -5,5 +5,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" -# Should these be require? -include conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc -- cgit v1.2.3-54-g00ecf