From cc9b77bab0b60b52e5887723784965a3e5a01d21 Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Tue, 13 Jun 2017 12:48:18 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../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(-) (limited to 'scripts/lib/bsp') 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 -- cgit v1.2.3-54-g00ecf