diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-09-23 08:42:51 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 12:01:47 +0100 |
commit | 0fc8317c6385eb1ed69ca4522ee6424c456dbb92 (patch) | |
tree | 8b878687d9309556c4476ccb17467f52faa36d62 /scripts/lib/bsp/substrate/target/arch/common | |
parent | bf6b0d95db3863a2cfbccb154c0c7ad5b3bbf0b0 (diff) | |
download | poky-0fc8317c6385eb1ed69ca4522ee6424c456dbb92.tar.gz |
yocto-bsp: add 3.10/remove 3.8 kernel from templates
For Yocto 1.5, 3.10 is the preferred kernel and 3.8 is obsolete.
This also removes any mention of emgd from the templates - we want to
discourage users from using it - it will be obsolete soon in any case.
Fixes [YOCTO #5107]
(From meta-yocto rev: 4dd4bf6ac2dcc7652ec8f807df02298546bdb41b)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/common')
3 files changed, 5 insertions, 13 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/common/README b/scripts/lib/bsp/substrate/target/arch/common/README index 93af973740..928659f302 100644 --- a/scripts/lib/bsp/substrate/target/arch/common/README +++ b/scripts/lib/bsp/substrate/target/arch/common/README | |||
@@ -65,14 +65,6 @@ You should then be able to build a {{=machine}} image as such: | |||
65 | $ source oe-init-build-env | 65 | $ source oe-init-build-env |
66 | $ bitbake core-image-sato | 66 | $ bitbake core-image-sato |
67 | 67 | ||
68 | NOTE: if the '{{=machine}}' machine includes the emgd-driver-bin | ||
69 | package (i.e. if the emgd version of the xserver is being used), it | ||
70 | has a proprietary license that must be whitelisted by adding the | ||
71 | string "license_emgd-driver-bin_1.16" to the LICENSE_FLAGS_WHITELIST | ||
72 | variable in your local.conf. For example: | ||
73 | |||
74 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16" | ||
75 | |||
76 | At the end of a successful build, you should have a live image that | 68 | At the end of a successful build, you should have a live image that |
77 | you can boot from a USB flash drive (see instructions on how to do | 69 | you can boot from a USB flash drive (see instructions on how to do |
78 | that below, in the section 'Booting the images from /binary'). | 70 | that below, in the section 'Booting the images from /binary'). |
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 ae924484d1..6d4804d127 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,2 +1,2 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall index 2f9f10641b..426cadd369 100644 --- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall | |||
@@ -2,22 +2,22 @@ | |||
2 | {{ input type:"boolean" name:"custom_kernel_remote" prio:"20" msg:"Is the custom kernel you'd like to use in a remote git repo? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"custom_kernel_remote" prio:"20" msg:"Is the custom kernel you'd like to use in a remote git repo? (y/n)" default:"y"}} |
3 | 3 | ||
4 | {{ if kernel_choice == "custom" and custom_kernel_remote == "y": }} | 4 | {{ if kernel_choice == "custom" and custom_kernel_remote == "y": }} |
5 | {{ input type:"edit-git-repo" name:"custom_kernel_remote_path" prio:"20" msg:"Please enter the full URI to the remote git repo (the default corresponds to linux-stable v3.8.1)" default:"git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"}} | 5 | {{ input type:"edit-git-repo" name:"custom_kernel_remote_path" prio:"20" msg:"Please enter the full URI to the remote git repo (the default corresponds to linux-stable v3.10.9)" default:"git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"}} |
6 | 6 | ||
7 | {{ if kernel_choice == "custom" and custom_kernel_remote == "n": }} | 7 | {{ if kernel_choice == "custom" and custom_kernel_remote == "n": }} |
8 | {{ input type:"edit-git-repo" name:"custom_kernel_local_path" prio:"20" msg:"You've indicated that you're not using a remote git repo. Please enter the full path to the local git repo you want to use (the default assumes a local linux-stable v3.8.1)" default:"/home/trz/yocto/kernels/linux-stable.git"}} | 8 | {{ input type:"edit-git-repo" name:"custom_kernel_local_path" prio:"20" msg:"You've indicated that you're not using a remote git repo. Please enter the full path to the local git repo you want to use (the default assumes a local linux-stable v3.10.9)" default:"/home/trz/yocto/kernels/linux-stable.git"}} |
9 | 9 | ||
10 | {{ if kernel_choice == "custom": }} | 10 | {{ if kernel_choice == "custom": }} |
11 | {{ input type:"boolean" name:"custom_kernel_need_kbranch" prio:"20" msg:"Do you need to use a specific (non-master) branch? (y/n)" default:"n"}} | 11 | {{ input type:"boolean" name:"custom_kernel_need_kbranch" prio:"20" msg:"Do you need to use a specific (non-master) branch? (y/n)" default:"n"}} |
12 | 12 | ||
13 | {{ if kernel_choice == "custom" and custom_kernel_need_kbranch == "y": }} | 13 | {{ if kernel_choice == "custom" and custom_kernel_need_kbranch == "y": }} |
14 | {{ input type:"edit" name:"custom_kernel_kbranch" prio:"20" msg:"Please enter the branch you want to use (the default branch corresponds to the linux-stable 'linux-3.8.y' branch):" default:"linux-3.8.y"}} | 14 | {{ input type:"edit" name:"custom_kernel_kbranch" prio:"20" msg:"Please enter the branch you want to use (the default branch corresponds to the linux-stable 'linux-3.10.y' branch):" default:"linux-3.10.y"}} |
15 | 15 | ||
16 | {{ if kernel_choice == "custom": }} | 16 | {{ if kernel_choice == "custom": }} |
17 | {{ input type:"edit" name:"custom_kernel_srcrev" prio:"20" msg:"Please enter the SRCREV (commit id) you'd like to use (use '${AUTOREV}' to track the current HEAD):" default:"${AUTOREV}"}} | 17 | {{ input type:"edit" name:"custom_kernel_srcrev" prio:"20" msg:"Please enter the SRCREV (commit id) you'd like to use (use '${AUTOREV}' to track the current HEAD):" default:"${AUTOREV}"}} |
18 | 18 | ||
19 | {{ if kernel_choice == "custom": }} | 19 | {{ if kernel_choice == "custom": }} |
20 | {{ input type:"edit" name:"custom_kernel_linux_version" prio:"20" msg:"Please enter the Linux version of the kernel you've specified:" default:"3.8.1"}} | 20 | {{ input type:"edit" name:"custom_kernel_linux_version" prio:"20" msg:"Please enter the Linux version of the kernel you've specified:" default:"3.10.9"}} |
21 | 21 | ||
22 | {{ if kernel_choice == "custom": }} | 22 | {{ if kernel_choice == "custom": }} |
23 | {{ input type:"edit" name:"custom_kernel_linux_version_extension" prio:"20" msg:"Please enter a Linux version extension if you want (it will show up at the end of the kernel name shown by uname):" default:"-custom"}} | 23 | {{ input type:"edit" name:"custom_kernel_linux_version_extension" prio:"20" msg:"Please enter a Linux version extension if you want (it will show up at the end of the kernel name shown by uname):" default:"-custom"}} |