summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorBrian A. Lloyd <brian.lloyd@familyhonor.net>2013-01-24 20:57:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 14:12:36 (GMT)
commitffff37f8f911af44eb18dabb053605fb6badcd1f (patch)
treed06b659f446cf365ea7296047d66d871f330e302 /scripts/lib
parent2f1aba504c592b5983d09e84cba71f86e8cea02a (diff)
downloadpoky-ffff37f8f911af44eb18dabb053605fb6badcd1f.tar.gz
yocto-bsp: qualify user files with machine name
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 - fixed conflicts due to the new open_user_file() helper function - updated user filename conflicts caused by directory renaming - updated custom kernel files to match Fixes [YOCTO #3731] (From meta-yocto rev: c20bef60aa8d52971fb061d4b8d473ad19c03180) 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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/kernel.py28
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg (renamed from scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc (renamed from scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}-user-config.cfg (renamed from scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/user-config.cfg)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}-user-patches.scc (renamed from scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/user-patches.scc)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg (renamed from scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc (renamed from scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg (renamed from scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc (renamed from scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg (renamed from scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc (renamed from scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg (renamed from scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc (renamed from scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg (renamed from scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc (renamed from scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg)0
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend6
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend6
45 files changed, 93 insertions, 89 deletions
diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
index 5935e66..dabb9cf 100644
--- a/scripts/lib/bsp/kernel.py
+++ b/scripts/lib/bsp/kernel.py
@@ -160,11 +160,11 @@ def open_user_file(scripts_path, machine, userfile, mode):
160def read_config_items(scripts_path, machine): 160def read_config_items(scripts_path, machine):
161 """ 161 """
162 Find and return a list of config items (CONFIG_XXX) in a machine's 162 Find and return a list of config items (CONFIG_XXX) in a machine's
163 user-defined config fragment [user-config.cfg]. 163 user-defined config fragment [${machine}-user-config.cfg].
164 """ 164 """
165 config_items = [] 165 config_items = []
166 166
167 f = open_user_file(scripts_path, machine, "user-config.cfg", "r") 167 f = open_user_file(scripts_path, machine, machine+"-user-config.cfg", "r")
168 lines = f.readlines() 168 lines = f.readlines()
169 for line in lines: 169 for line in lines:
170 s = line.strip() 170 s = line.strip()
@@ -178,9 +178,9 @@ def read_config_items(scripts_path, machine):
178def write_config_items(scripts_path, machine, config_items): 178def write_config_items(scripts_path, machine, config_items):
179 """ 179 """
180 Write (replace) the list of config items (CONFIG_XXX) in a 180 Write (replace) the list of config items (CONFIG_XXX) in a
181 machine's user-defined config fragment [user-config.cfg]. 181 machine's user-defined config fragment [${machine}=user-config.cfg].
182 """ 182 """
183 f = open_user_file(scripts_path, machine, "user-config.cfg", "w") 183 f = open_user_file(scripts_path, machine, machine+"-user-config.cfg", "w")
184 for item in config_items: 184 for item in config_items:
185 f.write(item + "\n") 185 f.write(item + "\n")
186 f.close() 186 f.close()
@@ -191,7 +191,7 @@ def write_config_items(scripts_path, machine, config_items):
191def yocto_kernel_config_list(scripts_path, machine): 191def yocto_kernel_config_list(scripts_path, machine):
192 """ 192 """
193 Display the list of config items (CONFIG_XXX) in a machine's 193 Display the list of config items (CONFIG_XXX) in a machine's
194 user-defined config fragment [user-config.cfg]. 194 user-defined config fragment [${machine}-user-config.cfg].
195 """ 195 """
196 config_items = read_config_items(scripts_path, machine) 196 config_items = read_config_items(scripts_path, machine)
197 197
@@ -202,7 +202,7 @@ def yocto_kernel_config_list(scripts_path, machine):
202def yocto_kernel_config_rm(scripts_path, machine): 202def yocto_kernel_config_rm(scripts_path, machine):
203 """ 203 """
204 Display the list of config items (CONFIG_XXX) in a machine's 204 Display the list of config items (CONFIG_XXX) in a machine's
205 user-defined config fragment [user-config.cfg], prompt the user 205 user-defined config fragment [${machine}-user-config.cfg], prompt the user
206 for one or more to remove, and remove them. 206 for one or more to remove, and remove them.
207 """ 207 """
208 config_items = read_config_items(scripts_path, machine) 208 config_items = read_config_items(scripts_path, machine)
@@ -235,7 +235,7 @@ def yocto_kernel_config_rm(scripts_path, machine):
235def yocto_kernel_config_add(scripts_path, machine, config_items): 235def yocto_kernel_config_add(scripts_path, machine, config_items):
236 """ 236 """
237 Add one or more config items (CONFIG_XXX) to a machine's 237 Add one or more config items (CONFIG_XXX) to a machine's
238 user-defined config fragment [user-config.cfg]. 238 user-defined config fragment [${machine}-user-config.cfg].
239 """ 239 """
240 new_items = [] 240 new_items = []
241 241
@@ -304,11 +304,11 @@ def find_filesdir(scripts_path, machine):
304def read_patch_items(scripts_path, machine): 304def read_patch_items(scripts_path, machine):
305 """ 305 """
306 Find and return a list of patch items in a machine's user-defined 306 Find and return a list of patch items in a machine's user-defined
307 patch list [user-patches.scc]. 307 patch list [${machine}-user-patches.scc].
308 """ 308 """
309 patch_items = [] 309 patch_items = []
310 310
311 f = open_user_file(scripts_path, machine, "user-patches.scc", "r") 311 f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "r")
312 lines = f.readlines() 312 lines = f.readlines()
313 for line in lines: 313 for line in lines:
314 s = line.strip() 314 s = line.strip()
@@ -325,9 +325,9 @@ def read_patch_items(scripts_path, machine):
325def write_patch_items(scripts_path, machine, patch_items): 325def write_patch_items(scripts_path, machine, patch_items):
326 """ 326 """
327 Write (replace) the list of patches in a machine's user-defined 327 Write (replace) the list of patches in a machine's user-defined
328 patch list [user-patches.scc]. 328 patch list [${machine}-user-patches.scc].
329 """ 329 """
330 f = open_user_file(scripts_path, machine, "user-patches.scc", "w") 330 f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w")
331 for item in patch_items: 331 for item in patch_items:
332 f.write("patch " + item + "\n") 332 f.write("patch " + item + "\n")
333 f.close() 333 f.close()
@@ -338,7 +338,7 @@ def write_patch_items(scripts_path, machine, patch_items):
338def yocto_kernel_patch_list(scripts_path, machine): 338def yocto_kernel_patch_list(scripts_path, machine):
339 """ 339 """
340 Display the list of patches in a machine's user-defined patch list 340 Display the list of patches in a machine's user-defined patch list
341 [user-patches.scc]. 341 [${machine}-user-patches.scc].
342 """ 342 """
343 patches = read_patch_items(scripts_path, machine) 343 patches = read_patch_items(scripts_path, machine)
344 344
@@ -349,7 +349,7 @@ def yocto_kernel_patch_list(scripts_path, machine):
349def yocto_kernel_patch_rm(scripts_path, machine): 349def yocto_kernel_patch_rm(scripts_path, machine):
350 """ 350 """
351 Remove one or more patches from a machine's user-defined patch 351 Remove one or more patches from a machine's user-defined patch
352 list [user-patches.scc]. 352 list [${machine}-user-patches.scc].
353 """ 353 """
354 patches = read_patch_items(scripts_path, machine) 354 patches = read_patch_items(scripts_path, machine)
355 355
@@ -390,7 +390,7 @@ def yocto_kernel_patch_rm(scripts_path, machine):
390def yocto_kernel_patch_add(scripts_path, machine, patches): 390def yocto_kernel_patch_add(scripts_path, machine, patches):
391 """ 391 """
392 Add one or more patches to a machine's user-defined patch list 392 Add one or more patches to a machine's user-defined patch list
393 [user-patches.scc]. 393 [${machine}-user-patches.scc].
394 """ 394 """
395 existing_patches = read_patch_items(scripts_path, machine) 395 existing_patches = read_patch_items(scripts_path, machine)
396 396
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
index 72d991c..155f67b 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
index 3171cce..c2c047c 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
index f11bfa5..1ae5cee 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index 1278064..fcbe2d3 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
index 5b20bab..07aa9d1 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend b/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..a1e29f1 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
2 2
3PRINC = "1" 3PRINC = "1"
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb
index 5471c93..6d3cc6f 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb
@@ -39,8 +39,8 @@ SRC_URI += "file://defconfig"
39 39
40SRC_URI += "file://{{=machine}}.scc \ 40SRC_URI += "file://{{=machine}}.scc \
41 file://{{=machine}}.cfg \ 41 file://{{=machine}}.cfg \
42 file://user-config.cfg \ 42 file://{{=machine}}-user-config.cfg \
43 file://user-patches.scc \ 43 file://{{=machine}}-user-patches.scc \
44 " 44 "
45 45
46{{ if kernel_choice == "custom" and custom_kernel_need_kbranch == "y" and custom_kernel_kbranch and custom_kernel_kbranch != "master": }} 46{{ if kernel_choice == "custom" and custom_kernel_need_kbranch == "y" and custom_kernel_kbranch and custom_kernel_kbranch != "master": }}
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}-user-config.cfg
index 17c8b50..17c8b50 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/user-config.cfg
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}-user-patches.scc
index 7a598d9..7a598d9 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/user-patches.scc
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
index 72d991c..155f67b 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
index 8af3549..296eb65 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
index f11bfa5..1ae5cee 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index c5ff697..48ebad6 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
index 34aa4cc..0a96c7e 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
index 8af3549..296eb65 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
index f11bfa5..1ae5cee 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index c617070..277aa9e 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
index 5b20bab..07aa9d1 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
index 8af3549..296eb65 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
index f11bfa5..1ae5cee 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index c617070..277aa9e 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
index 5b20bab..07aa9d1 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 72d991c..155f67b 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
index 680973e..e580841 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -51,6 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
51SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 51SRC_URI += "file://{{=machine}}-preempt-rt.scc \
52 file://{{=machine}}.scc \ 52 file://{{=machine}}.scc \
53 file://{{=machine}}.cfg \ 53 file://{{=machine}}.cfg \
54 file://{{=machine}}-user-config.cfg \
55 file://{{=machine}}-user-patches.scc \
54 " 56 "
55 57
56# uncomment and replace these SRCREVs with the real commit ids once you've had 58# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
index 70ede9f..89c32c4 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -51,6 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
51SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 51SRC_URI += "file://{{=machine}}-preempt-rt.scc \
52 file://{{=machine}}.scc \ 52 file://{{=machine}}.scc \
53 file://{{=machine}}.cfg \ 53 file://{{=machine}}.cfg \
54 file://{{=machine}}-user-config.cfg \
55 file://{{=machine}}-user-patches.scc \
54 " 56 "
55 57
56# uncomment and replace these SRCREVs with the real commit ids once you've had 58# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index 9af21f2..93cbbb9 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -51,8 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
51SRC_URI += "file://{{=machine}}-standard.scc \ 51SRC_URI += "file://{{=machine}}-standard.scc \
52 file://{{=machine}}.scc \ 52 file://{{=machine}}.scc \
53 file://{{=machine}}.cfg \ 53 file://{{=machine}}.cfg \
54 file://user-config.cfg \ 54 file://{{=machine}}-user-config.cfg \
55 file://user-patches.scc \ 55 file://{{=machine}}-user-patches.scc \
56 " 56 "
57 57
58# uncomment and replace these SRCREVs with the real commit ids once you've had 58# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
index 1e90cf2..59359b3 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -51,8 +51,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
51SRC_URI += "file://{{=machine}}-standard.scc \ 51SRC_URI += "file://{{=machine}}-standard.scc \
52 file://{{=machine}}.scc \ 52 file://{{=machine}}.scc \
53 file://{{=machine}}.cfg \ 53 file://{{=machine}}.cfg \
54 file://user-config.cfg \ 54 file://{{=machine}}-user-config.cfg \
55 file://user-patches.scc \ 55 file://{{=machine}}-user-patches.scc \
56 " 56 "
57 57
58# uncomment and replace these SRCREVs with the real commit ids once you've had 58# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
index 72d991c..155f67b 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
index e69de29..e69de29 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-patches.scc
diff --git a/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 b/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
index 8af3549..296eb65 100644
--- a/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
+++ b/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
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/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 b/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
index f11bfa5..1ae5cee 100644
--- a/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
+++ b/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
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-preempt-rt.scc \ 27SRC_URI += "file://{{=machine}}-preempt-rt.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index 6f0d884..38507da 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
index e855037..16966e0 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
2 2
3PR := "${PR}.1" 3PR := "${PR}.1"
4 4
@@ -27,8 +27,8 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
27SRC_URI += "file://{{=machine}}-standard.scc \ 27SRC_URI += "file://{{=machine}}-standard.scc \
28 file://{{=machine}}.scc \ 28 file://{{=machine}}.scc \
29 file://{{=machine}}.cfg \ 29 file://{{=machine}}.cfg \
30 file://user-config.cfg \ 30 file://{{=machine}}-user-config.cfg \
31 file://user-patches.scc \ 31 file://{{=machine}}-user-patches.scc \
32 " 32 "
33 33
34# uncomment and replace these SRCREVs with the real commit ids once you've had 34# uncomment and replace these SRCREVs with the real commit ids once you've had