mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

yocto-bsp: qualify user files with machine name

Browse Source 
The bblayer abstraction makes it where multiple layers can be
configured and used at the same time.  Some layers make changes to
support a specific machine, and should not have any affect when other
machines are in use.

For linux-yocto, all bsps are created with a user-config.cfg and
user-config.cfg and user-patches.scc.  This means that those files
will be pulled from the first location found, which might correspond
to files customized for a different machine.

Instead of using the names user-config.cfg and user-patches.scc, I
propose a machine specific name be used such as
{{=machine}}user-patches.scc and {{=machine}}user-config.cfg.  This
would necessitate that all references changed to these new names,
which would affect the yocto-bsp and yocto-kernel scripts.

With this change, it would be possible to have multiple machine BSPs
searched at the same time and to select which to build against by
using a command like MACHINE=qmeux86 bitbake core-image-sato to
override the default.

Note many of the standard BSPs do not seem to suffer this problem as
they do not use the common files user-config.cfg and user-patches.scc
that the yocto-* scripts depend upon.

Additions by Tom Zanussi:
 - renamed user-config.cfg to {{=machine}}-user-config.cfg everywhere
 - renamed user-patches.scc to {{=machine}}-user-patches.scc everywhere
 - added the user-config/patches SRC_URI items to the qemu -rt kernel recipes

Fixes [YOCTO #3731]

(From meta-yocto rev: b148d800773f3c2e6edeb4f05850b0291a8bb7d5)

Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Brian A. Lloyd
2013-01-21 15:14:22 -06:00
committed by Richard Purdie
parent 47b0864fbd
commit a7ce81df2f
42 changed files with 91 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/lib/bsp/kernel.py
View File

@@ -136,12 +136,12 @@ def gen_choices_str(choices):
def read_config_items(scripts_path, machine):
"""
Find and return a list of config items (CONFIG_XXX) in a machine's
user-defined config fragment [user-config.cfg].
user-defined config fragment [${machine}-user-config.cfg].
"""
config_items = []
layer = find_bsp_layer(scripts_path, machine)
cfg = os.path.join(layer, "recipes-kernel/linux/files/user-config.cfg")
cfg = os.path.join(layer, "recipes-kernel/linux/files/"+machine+"-user-config.cfg")
f = open(cfg, "r")
lines = f.readlines()
@@ -157,10 +157,10 @@ def read_config_items(scripts_path, machine):
def write_config_items(scripts_path, machine, config_items):
"""
Write (replace) the list of config items (CONFIG_XXX) in a
machine's user-defined config fragment [user-config.cfg].
machine's user-defined config fragment [${machine}=user-config.cfg].
"""
layer = find_bsp_layer(scripts_path, machine)
cfg = os.path.join(layer, "recipes-kernel/linux/files/user-config.cfg")
cfg = os.path.join(layer, "recipes-kernel/linux/files/"+machine+"-user-config.cfg")
f = open(cfg, "w")
for item in config_items:
@@ -173,7 +173,7 @@ def write_config_items(scripts_path, machine, config_items):
def yocto_kernel_config_list(scripts_path, machine):
"""
Display the list of config items (CONFIG_XXX) in a machine's
user-defined config fragment [user-config.cfg].
user-defined config fragment [${machine}-user-config.cfg].
"""
config_items = read_config_items(scripts_path, machine)
@@ -196,7 +196,7 @@ def map_choice(choice_str, array):
def yocto_kernel_config_rm(scripts_path, machine):
"""
Display the list of config items (CONFIG_XXX) in a machine's
user-defined config fragment [user-config.cfg], prompt the user
user-defined config fragment [${machine}-user-config.cfg], prompt the user
for one or more to remove, and remove them.
"""
config_items = read_config_items(scripts_path, machine)
@@ -229,7 +229,7 @@ def yocto_kernel_config_rm(scripts_path, machine):
def yocto_kernel_config_add(scripts_path, machine, config_items):
"""
Add one or more config items (CONFIG_XXX) to a machine's
user-defined config fragment [user-config.cfg].
user-defined config fragment [${machine}-user-config.cfg].
"""
new_items = []
@@ -373,12 +373,12 @@ def find_patches(src_uri):
def read_patch_items(scripts_path, machine):
"""
Find and return a list of patch items in a machine's user-defined
patch list [user-patches.scc].
patch list [${machine}-user-patches.scc].
"""
patch_items = []
layer = find_bsp_layer(scripts_path, machine)
patches = os.path.join(layer, "recipes-kernel/linux/files/user-patches.scc")
patches = os.path.join(layer, "recipes-kernel/linux/files/"+machine+"-user-patches.scc")
f = open(patches, "r")
lines = f.readlines()
@@ -397,11 +397,11 @@ def read_patch_items(scripts_path, machine):
def write_patch_items(scripts_path, machine, patch_items):
"""
Write (replace) the list of patches in a machine's user-defined
patch list [user-patches.scc].
patch list [${machine}-user-patches.scc].
"""
layer = find_bsp_layer(scripts_path, machine)
patches = os.path.join(layer, "recipes-kernel/linux/files/user-patches.scc")
patches = os.path.join(layer, "recipes-kernel/linux/files/"+machine+"-user-patches.scc")
f = open(patches, "w")
for item in patch_items:
@@ -417,7 +417,7 @@ def write_patch_items(scripts_path, machine, patch_items):
def yocto_kernel_patch_list(scripts_path, machine):
"""
Display the list of patches in a machine's user-defined patch list
[user-patches.scc].
[${machine}-user-patches.scc].
"""
(start_line, end_line, src_uri) = find_bsp_kernel_src_uri(scripts_path, machine)
patches = find_patches(src_uri)
@@ -429,7 +429,7 @@ def yocto_kernel_patch_list(scripts_path, machine):
def yocto_kernel_patch_rm(scripts_path, machine):
"""
Remove one or more patches from a machine's user-defined patch
list [user-patches.scc].
list [${machine}-user-patches.scc].
"""
(start_line, end_line, src_uri) = find_bsp_kernel_src_uri(scripts_path, machine)
patches = find_patches(src_uri)
@@ -470,7 +470,7 @@ def yocto_kernel_patch_rm(scripts_path, machine):
def yocto_kernel_patch_add(scripts_path, machine, patches):
"""
Add one or more patches to a machine's user-defined patch list
[user-patches.scc].
[${machine}-user-patches.scc].
"""
(start_line, end_line, src_uri) = find_bsp_kernel_src_uri(scripts_path, machine)
src_uri_patches = find_patches(src_uri)

2
scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
View File

@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"

0
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/user-config.cfg → scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-user-config.cfg
View File

0
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/user-patches.scc → scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-user-patches.scc
View File

6
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

2
scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
View File

@@ -1,3 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
PRINC = "1"

2
scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
View File

@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"

0
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/user-config.cfg → scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/ {{=machine}}-user-config.cfg
View File

0
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/user-patches.scc → scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-user-patches.scc
View File

6
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

0
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/user-config.cfg → scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-user-config.cfg
View File

0
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/user-patches.scc → scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-user-patches.scc
View File

6
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

0
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/user-config.cfg → scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-user-config.cfg
View File

0
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/user-patches.scc → scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-user-patches.scc
View File

6
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

2
scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
View File

@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"

0
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-config.cfg → scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-user-config.cfg
View File

0
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-patches.scc → scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-user-patches.scc
View File

4
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -51,6 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

4
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -51,6 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -51,8 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -51,8 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

2
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
View File

@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"

0
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/user-config.cfg → scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-user-config.cfg
View File

0
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/user-patches.scc → scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-user-patches.scc
View File

6
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-preempt-rt.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had

6
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
View File

@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
PR := "${PR}.1"
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
SRC_URI += "file://{{=machine}}-standard.scc \
file://{{=machine}}.scc \
file://{{=machine}}.cfg \
file://user-config.cfg \
file://user-patches.scc \
file://{{=machine}}-user-config.cfg \
file://{{=machine}}-user-patches.scc \
"
# uncomment and replace these SRCREVs with the real commit ids once you've had