summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2010-11-15 11:25:58 -0500
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:22 -0800
commitc70816cb9022dfedd78817bb1dfe20219fe2dd90 (patch)
tree764704dc00eacf53e7a276a0840a32c71160f27f /meta/recipes-kernel
parent771d890d086534536ff4aa4a386f17e2b697c0be (diff)
downloadpoky-c70816cb9022dfedd78817bb1dfe20219fe2dd90.tar.gz
linux-wrs: rename to linux-yocto
The existing preferred yocto kernel wasn't named appropriately and needs to be updated. In keeping the changes small and isolated, this commit simply renames the recipe and some internal variables. Future commits will refactor the code into more usable blocks. Now that linuy-wrs has been renamed linux-yocto, we need to rename and update an board configurations and append files. Now that linux-wrs has been renamed linux-yocto, we need to update the SRCREVs to have the new name. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers-wrs_git.bb)4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_git.bb (renamed from meta/recipes-kernel/linux/linux-wrs_git.bb)73
2 files changed, 39 insertions, 38 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-wrs_git.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
index ab25e500ba..6ae6d5f642 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-wrs_git.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
@@ -26,7 +26,7 @@ do_configure() {
26 oe_runmake allnoconfig ARCH=$ARCH 26 oe_runmake allnoconfig ARCH=$ARCH
27} 27}
28 28
29do_wrlinux_checkout() { 29do_kernel_checkout() {
30 if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then 30 if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then
31 rm -rf ${S} 31 rm -rf ${S}
32 mkdir ${S} 32 mkdir ${S}
@@ -38,7 +38,7 @@ do_wrlinux_checkout() {
38 git checkout -f standard 38 git checkout -f standard
39} 39}
40 40
41addtask wrlinux_checkout before do_patch after do_unpack 41addtask kernel_checkout before do_patch after do_unpack
42 42
43do_compile () { 43do_compile () {
44} 44}
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb
index 209648b8e7..ef005aefca 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Wind River Kernel" 1DESCRIPTION = "Yocto Kernel"
2SECTION = "kernel" 2SECTION = "kernel"
3LICENSE = "GPL" 3LICENSE = "GPL"
4 4
@@ -13,16 +13,17 @@ PV = "2.6.34+git${SRCPV}"
13SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ 13SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \
14 git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta" 14 git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
15 15
16WRMACHINE = "UNDEFINED" 16# map the poky machine to a 'kernel machine'
17WRMACHINE_qemux86 = "common_pc" 17KMACHINE = "UNDEFINED"
18WRMACHINE_qemux86-64 = "common_pc_64" 18KMACHINE_qemux86 = "common_pc"
19WRMACHINE_qemuppc = "qemu_ppc32" 19KMACHINE_qemux86-64 = "common_pc_64"
20WRMACHINE_qemumips = "mti_malta32_be" 20KMACHINE_qemuppc = "qemu_ppc32"
21WRMACHINE_qemuarm = "arm_versatile_926ejs" 21KMACHINE_qemumips = "mti_malta32_be"
22WRMACHINE_atom-pc = "atom-pc" 22KMACHINE_qemuarm = "arm_versatile_926ejs"
23WRMACHINE_routerstationpro = "routerstationpro" 23KMACHINE_atom-pc = "atom-pc"
24WRMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" 24KMACHINE_routerstationpro = "routerstationpro"
25WRMACHINE_beagleboard = "beagleboard" 25KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
26KMACHINE_beagleboard = "beagleboard"
26 27
27# Determine which branch to fetch and build. Not all branches are in the 28# Determine which branch to fetch and build. Not all branches are in the
28# upstream repo (but will be locally created after the fetchers run) so 29# upstream repo (but will be locally created after the fetchers run) so
@@ -36,11 +37,11 @@ WRMACHINE_beagleboard = "beagleboard"
36python __anonymous () { 37python __anonymous () {
37 import bb, re 38 import bb, re
38 39
39 bb.data.setVar("KBRANCH", "${WRMACHINE}-${LINUX_KERNEL_TYPE}", d) 40 bb.data.setVar("KBRANCH", "${KMACHINE}-${LINUX_KERNEL_TYPE}", d)
40 mach = bb.data.getVar("WRMACHINE", d, 1) 41 mach = bb.data.getVar("KMACHINE", d, 1)
41 if mach == "UNDEFINED": 42 if mach == "UNDEFINED":
42 bb.data.setVar("KBRANCH", "standard", d) 43 bb.data.setVar("KBRANCH", "standard", d)
43 bb.data.setVar("WRMACHINE", "${MACHINE}", d) 44 bb.data.setVar("KMACHINE", "${MACHINE}", d)
44 # track the global configuration on a bootstrapped BSP 45 # track the global configuration on a bootstrapped BSP
45 bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d) 46 bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d)
46 bb.data.setVar("BOOTSTRAP", "t", d) 47 bb.data.setVar("BOOTSTRAP", "t", d)
@@ -53,7 +54,7 @@ LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}"
53PR = "r13" 54PR = "r13"
54 55
55S = "${WORKDIR}/linux" 56S = "${WORKDIR}/linux"
56B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build" 57B = "${WORKDIR}/linux-${KMACHINE}-${LINUX_KERNEL_TYPE}-build"
57 58
58# functionality flags 59# functionality flags
59KERNEL_REVISION_CHECKING ?= "t" 60KERNEL_REVISION_CHECKING ?= "t"
@@ -66,9 +67,9 @@ do_patch() {
66 fi 67 fi
67 68
68 # simply ensures that a branch of the right name has been created 69 # simply ensures that a branch of the right name has been created
69 createme ${ARCH} ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${defconfig} 70 createme ${ARCH} ${KMACHINE}-${LINUX_KERNEL_TYPE} ${defconfig}
70 if [ $? -ne 0 ]; then 71 if [ $? -ne 0 ]; then
71 echo "ERROR. Could not create ${WRMACHINE}-${LINUX_KERNEL_TYPE}" 72 echo "ERROR. Could not create ${KMACHINE}-${LINUX_KERNEL_TYPE}"
72 exit 1 73 exit 1
73 fi 74 fi
74 75
@@ -78,14 +79,14 @@ do_patch() {
78 fi 79 fi
79 updateme ${addon_features} ${ARCH} ${WORKDIR} 80 updateme ${addon_features} ${ARCH} ${WORKDIR}
80 if [ $? -ne 0 ]; then 81 if [ $? -ne 0 ]; then
81 echo "ERROR. Could not update ${WRMACHINE}-${LINUX_KERNEL_TYPE}" 82 echo "ERROR. Could not update ${KMACHINE}-${LINUX_KERNEL_TYPE}"
82 exit 1 83 exit 1
83 fi 84 fi
84 85
85 # executes and modifies the source tree as required 86 # executes and modifies the source tree as required
86 patchme ${WRMACHINE}-${LINUX_KERNEL_TYPE} 87 patchme ${KMACHINE}-${LINUX_KERNEL_TYPE}
87 if [ $? -ne 0 ]; then 88 if [ $? -ne 0 ]; then
88 echo "ERROR. Could not modify ${WRMACHINE}-${LINUX_KERNEL_TYPE}" 89 echo "ERROR. Could not modify ${KMACHINE}-${LINUX_KERNEL_TYPE}"
89 exit 1 90 exit 1
90 fi 91 fi
91} 92}
@@ -100,9 +101,9 @@ validate_branches() {
100 if [ -n "${KERNEL_REVISION_CHECKING}" ]; then 101 if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
101 git show ${target_branch_head} > /dev/null 2>&1 102 git show ${target_branch_head} > /dev/null 2>&1
102 if [ $? -eq 0 ]; then 103 if [ $? -eq 0 ]; then
103 echo "Forcing branch ${WRMACHINE}-${LINUX_KERNEL_TYPE} to ${target_branch_head}" 104 echo "Forcing branch ${KMACHINE}-${LINUX_KERNEL_TYPE} to ${target_branch_head}"
104 git branch -m ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${WRMACHINE}-${LINUX_KERNEL_TYPE}-orig 105 git branch -m ${KMACHINE}-${LINUX_KERNEL_TYPE} ${KMACHINE}-${LINUX_KERNEL_TYPE}-orig
105 git checkout -b ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${target_branch_head} 106 git checkout -b ${KMACHINE}-${LINUX_KERNEL_TYPE} ${target_branch_head}
106 else 107 else
107 echo "ERROR ${target_branch_head} is not a valid commit ID." 108 echo "ERROR ${target_branch_head} is not a valid commit ID."
108 echo "The kernel source tree may be out of sync" 109 echo "The kernel source tree may be out of sync"
@@ -127,9 +128,9 @@ validate_branches() {
127 fi 128 fi
128} 129}
129 130
130do_wrlinux_checkout() { 131do_kernel_checkout() {
131 if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then 132 if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then
132 echo "Fixing up git directory for ${WRMACHINE}-${LINUX_KERNEL_TYPE}" 133 echo "Fixing up git directory for ${KMACHINE}-${LINUX_KERNEL_TYPE}"
133 rm -rf ${S} 134 rm -rf ${S}
134 mkdir ${S} 135 mkdir ${S}
135 mv ${WORKDIR}/.git ${S} 136 mv ${WORKDIR}/.git ${S}
@@ -165,17 +166,17 @@ IFS='
165 # our initial checkout. So we do it a second time to be sure 166 # our initial checkout. So we do it a second time to be sure
166 git checkout -f ${KBRANCH} 167 git checkout -f ${KBRANCH}
167} 168}
168do_wrlinux_checkout[dirs] = "${S}" 169do_kernel_checkout[dirs] = "${S}"
169 170
170addtask wrlinux_checkout before do_patch after do_unpack 171addtask kernel_checkout before do_patch after do_unpack
171 172
172do_wrlinux_configme() { 173do_kernel_configme() {
173 echo "Doing wrlinux configme" 174 echo "Doing kernel configme"
174 175
175 cd ${S} 176 cd ${S}
176 configme --reconfig 177 configme --reconfig
177 if [ $? -ne 0 ]; then 178 if [ $? -ne 0 ]; then
178 echo "ERROR. Could not configure ${WRMACHINE}-${LINUX_KERNEL_TYPE}" 179 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
179 exit 1 180 exit 1
180 fi 181 fi
181 182
@@ -184,13 +185,13 @@ do_wrlinux_configme() {
184 echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config 185 echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
185} 186}
186 187
187do_wrlinux_configcheck() { 188do_kernel_configcheck() {
188 echo "[INFO] validating kernel configuration" 189 echo "[INFO] validating kernel configuration"
189 cd ${B}/.. 190 cd ${B}/..
190 kconf_check ${B}/.config ${B} ${S} ${B} ${LINUX_VERSION} ${WRMACHINE}-${LINUX_KERNEL_TYPE} 191 kconf_check ${B}/.config ${B} ${S} ${B} ${LINUX_VERSION} ${KMACHINE}-${LINUX_KERNEL_TYPE}
191} 192}
192 193
193do_wrlinux_link_vmlinux() { 194do_kernel_link_vmlinux() {
194 if [ ! -d "${B}/arch/${ARCH}/boot" ]; then 195 if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
195 mkdir ${B}/arch/${ARCH}/boot 196 mkdir ${B}/arch/${ARCH}/boot
196 fi 197 fi
@@ -207,9 +208,9 @@ do_install_perf() {
207} 208}
208 209
209do_patch[depends] = "kern-tools-native:do_populate_sysroot" 210do_patch[depends] = "kern-tools-native:do_populate_sysroot"
210addtask wrlinux_configme before do_configure after do_patch 211addtask kernel_configme before do_configure after do_patch
211addtask wrlinux_link_vmlinux after do_compile before do_install 212addtask kernel_link_vmlinux after do_compile before do_install
212addtask wrlinux_configcheck after do_configure before do_compile 213addtask kernel_configcheck after do_configure before do_compile
213 214
214inherit kernel 215inherit kernel
215 216