[poky] [PATCH] linux-yocto: remove user-specific description/config files from machine description

[Bruce Ashfield]

On 06/13/2017 09:48 PM, leonardo.sandoval.gonzalez at linux.intel.com wrote:
> From: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
> 
> 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.

Looks good to me.

Acked-by: Bruce Ashfield <bruce.ashfield at windriver.com>

Bruce

> 
> [YOCTO #11586]
> 
> Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
> ---
>   .../substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc    | 2 --
>   .../arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc     | 2 --
>   .../substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc   | 2 --
>   .../substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc   | 2 --
>   .../substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc | 2 --
>   .../target/arch/powerpc/recipes-kernel/linux/files/machine.scc          | 2 --
>   .../substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc   | 2 --
>   .../substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc | 2 --
>   8 files changed, 16 deletions(-)
> 
> diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
> index 828400df40..fb3866f119 100644
> --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
> @@ -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
> diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
> index 0b6b413377..64d3ed181b 100644
> --- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.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
> diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
> index 3d32f111b0..3e4c54fcf5 100644
> --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.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
> diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
> index f39dc3edf1..792fdc94a4 100644
> --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.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
> diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
> index f39dc3edf1..792fdc94a4 100644
> --- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.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
> diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
> index 7aac8b0801..89bb97efd6 100644
> --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.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
> diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc
> index 8301e05f7d..d25d0a0377 100644
> --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.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
> diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
> index 9b7c291a8f..9d20d199b2 100644
> --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
> +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.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
>