mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 15:32:14 +02:00
linux-yocto: remove user-specific description/config files from machine description
Remove user-specific descrition files and config fragments from main machine description file otherwise double patch/config inclusion may happen. These files/fragments are already included on the SRC_URI (see poky commit 2db8f3), so no need to reference these inside machine.scc files. [YOCTO #11586] (From meta-yocto rev: 86ab7ab6688f250bb5777371d2cbc28c770847d4) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
014efb83d7
commit
cc9b77bab0
@@ -4,5 +4,3 @@ kconf non-hardware {{machine}}-non_hardware.cfg
|
||||
|
||||
include features/usb-net/usb-net.scc
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
@@ -14,5 +14,3 @@ kconf hardware {{=machine}}.cfg
|
||||
# These are used by yocto-kernel to add config fragments and features.
|
||||
# Don't remove if you plan on using yocto-kernel with this BSP.
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
@@ -17,5 +17,3 @@ include cfg/usb-mass-storage.scc
|
||||
include cfg/boot-live.scc
|
||||
include features/power/intel.scc
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
@@ -4,5 +4,3 @@ kconf hardware {{=machine}}.cfg
|
||||
include cfg/usb-mass-storage.scc
|
||||
include cfg/fs/vfat.scc
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
@@ -4,5 +4,3 @@ kconf hardware {{=machine}}.cfg
|
||||
include cfg/usb-mass-storage.scc
|
||||
include cfg/fs/vfat.scc
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
@@ -6,5 +6,3 @@ include cfg/fs/vfat.scc
|
||||
|
||||
include cfg/dmaengine.scc
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
# yocto-bsp-filename {{=machine}}.scc
|
||||
kconf hardware {{=machine}}.cfg
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
@@ -10,5 +10,3 @@ include features/i915/i915.scc
|
||||
include cfg/usb-mass-storage.scc
|
||||
include features/power/intel.scc
|
||||
|
||||
kconf hardware {{=machine}}-user-config.cfg
|
||||
include {{=machine}}-user-patches.scc
|
||||
|
||||
Reference in New Issue
Block a user