diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-02-05 19:15:29 -0800 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2014-02-05 20:43:54 -0800 |
| commit | c7bf6a327b9b9ebb982324c6ef9f595f7a14f94a (patch) | |
| tree | 9a3170b066ee4bea9b1926b129c625714be7af63 /conf/machine/intel-corei7-64.conf | |
| parent | dd0bd45aa410929d0af1be63ab7397fa40148c41 (diff) | |
| download | meta-intel-c7bf6a327b9b9ebb982324c6ef9f595f7a14f94a.tar.gz | |
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 <dvhart@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'conf/machine/intel-corei7-64.conf')
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 5 | 5 | ||
| 6 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" | 6 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" |
| 7 | 7 | ||
| 8 | # Should these be require? | 8 | require conf/machine/include/intel-corei7-64-common.inc |
| 9 | include conf/machine/include/intel-corei7-64-common.inc | 9 | require conf/machine/include/intel-common-pkgarch.inc |