linux-yocto: remove user-specific description/config files from machine description
PATCH 1/1 linux-yocto: remove user-specific description/config files from machine description
From: Leonardo Sandoval <[email protected]>
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]
--- .../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(-)
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc +0 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc +0 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc +0 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc +0 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc +0 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc +0 -2
@@ -6,5 +6,3 @@ include cfg/fs/vfat.scc include cfg/dmaengine.scc -kconf hardware {{=machine}}-user-config.cfg -include {{=machine}}-user-patches.scc
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc +0 -2
@@ -1,5 +1,3 @@ # yocto-bsp-filename {{=machine}}.scc kconf hardware {{=machine}}.cfg -kconf hardware {{=machine}}-user-config.cfg -include {{=machine}}-user-patches.scc
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc +0 -2
@@ -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
Signature · 1 line
2.12.0
Quoted 6 lines · On 06/13/2017 09:48 PM, [email protected] wrote:
From: Leonardo Sandoval <[email protected]>
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.
Bruce
Quoted 96 lines
[YOCTO #11586]
Signed-off-by Leonardo Sandoval <[email protected]>--- .../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(-)scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc +0
-2@@ -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.sccscripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc +0
-2@@ -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.sccscripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc +0
-2@@ -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.sccscripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc +0
-2@@ -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.sccscripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc +0
-2@@ -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.sccscripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc +0
-2@@ -6,5 +6,3 @@ include cfg/fs/vfat.scc include cfg/dmaengine.scc -kconf hardware {{=machine}}-user-config.cfg -include {{=machine}}-user-patches.sccscripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc +0
-2@@ -1,5 +1,3 @@ # yocto-bsp-filename {{=machine}}.scc kconf hardware {{=machine}}.cfg -kconf hardware {{=machine}}-user-config.cfg -include {{=machine}}-user-patches.sccscripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc +0
-2@@ -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