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>
This commit is contained in:
parent
771d890d08
commit
c70816cb90
|
@ -16,7 +16,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
|
||||||
|
|
||||||
KERNEL_IMAGETYPE = "bzImage"
|
KERNEL_IMAGETYPE = "bzImage"
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
|
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
|
||||||
PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
|
PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
|
||||||
PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
|
PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
|
||||||
PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
|
PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
|
||||||
|
|
|
@ -82,18 +82,18 @@ SRCREV_pn-linux-omap-zoomsync ??= "015cbaf1035cd9a61d33a27de2a22902555db3c5"
|
||||||
SRCREV_pn-linux-omap2 ??= "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
|
SRCREV_pn-linux-omap2 ??= "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
|
||||||
SRCREV_pn-linux-omap3 ??= "de1121fdb899f762b9e717f44eaf3fae7c00cd3e"
|
SRCREV_pn-linux-omap3 ??= "de1121fdb899f762b9e717f44eaf3fae7c00cd3e"
|
||||||
SRCREV_pn-linux-omap3-pm ??= "totallybroken"
|
SRCREV_pn-linux-omap3-pm ??= "totallybroken"
|
||||||
SRCREV_machine_pn-linux-wrs_qemuarm ?= "4f4177b4bea5b8858acc1eeb788d80b7af0df962"
|
SRCREV_machine_pn-linux-yocto_qemuarm ?= "4f4177b4bea5b8858acc1eeb788d80b7af0df962"
|
||||||
SRCREV_machine_pn-linux-wrs_qemumips ?= "81f3cd467b9d51fa1dfa2d5939337cc756ae8061"
|
SRCREV_machine_pn-linux-yocto_qemumips ?= "81f3cd467b9d51fa1dfa2d5939337cc756ae8061"
|
||||||
SRCREV_machine_pn-linux-wrs_qemuppc ?= "9ac0daee43dd19d8bea828cf79450c9748ae0daa"
|
SRCREV_machine_pn-linux-yocto_qemuppc ?= "9ac0daee43dd19d8bea828cf79450c9748ae0daa"
|
||||||
SRCREV_machine_pn-linux-wrs_qemux86 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
SRCREV_machine_pn-linux-yocto_qemux86 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
||||||
SRCREV_machine_pn-linux-wrs_qemux86-64 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
||||||
SRCREV_machine_pn-linux-wrs_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7"
|
SRCREV_machine_pn-linux-yocto_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7"
|
||||||
SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
SRCREV_machine_pn-linux-yocto_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
||||||
SRCREV_machine_pn-linux-wrs_routerstationpro ?= "2ec2edaf256dd8500ee3d4763fee6ca3ecd6da4b"
|
SRCREV_machine_pn-linux-yocto_routerstationpro ?= "2ec2edaf256dd8500ee3d4763fee6ca3ecd6da4b"
|
||||||
SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f"
|
SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f"
|
||||||
SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
SRCREV_machine_pn-linux-yocto_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
|
||||||
SRCREV_meta_pn-linux-wrs ?= "d1cd5c80ee97e81e130be8c3de3965b770f320d6"
|
SRCREV_meta_pn-linux-yocto ?= "d1cd5c80ee97e81e130be8c3de3965b770f320d6"
|
||||||
SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
|
SRCREV_pn-linux-libc-headers-yocto ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
|
||||||
SRCREV_pn-matchbox-config-gtk ??= "2081"
|
SRCREV_pn-matchbox-config-gtk ??= "2081"
|
||||||
SRCREV_pn-matchbox-desktop-sato ??= "76"
|
SRCREV_pn-matchbox-desktop-sato ??= "76"
|
||||||
SRCREV_pn-matchbox-desktop ??= "2096"
|
SRCREV_pn-matchbox-desktop ??= "2096"
|
||||||
|
|
|
@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
|
||||||
|
|
||||||
KERNEL_IMAGETYPE = "bzImage"
|
KERNEL_IMAGETYPE = "bzImage"
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs"
|
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
|
||||||
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
|
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
|
||||||
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
|
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
|
||||||
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
|
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
|
||||||
|
|
|
@ -22,7 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
|
||||||
# Guesswork
|
# Guesswork
|
||||||
SERIAL_CONSOLE = "115200 ttyS2"
|
SERIAL_CONSOLE = "115200 ttyS2"
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
|
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
|
||||||
|
|
||||||
KERNEL_IMAGETYPE = "uImage"
|
KERNEL_IMAGETYPE = "uImage"
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,6 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000"
|
||||||
RDEPENDS_kernel-base = ""
|
RDEPENDS_kernel-base = ""
|
||||||
|
|
||||||
# Use a common kernel recipe for all QEMU machines
|
# Use a common kernel recipe for all QEMU machines
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
|
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
|
||||||
|
|
||||||
EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
|
EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
|
||||||
|
|
|
@ -13,4 +13,4 @@ SERIAL_CONSOLE = "115200 ttyS0"
|
||||||
|
|
||||||
MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
|
MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
|
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
|
||||||
|
|
|
@ -12,7 +12,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \
|
||||||
KERNEL_IMAGETYPE = "vmlinux"
|
KERNEL_IMAGETYPE = "vmlinux"
|
||||||
KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
|
KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
|
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
|
||||||
|
|
||||||
SERIAL_CONSOLE = "115200 ttyS0"
|
SERIAL_CONSOLE = "115200 ttyS0"
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ do_configure() {
|
||||||
oe_runmake allnoconfig ARCH=$ARCH
|
oe_runmake allnoconfig ARCH=$ARCH
|
||||||
}
|
}
|
||||||
|
|
||||||
do_wrlinux_checkout() {
|
do_kernel_checkout() {
|
||||||
if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then
|
if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then
|
||||||
rm -rf ${S}
|
rm -rf ${S}
|
||||||
mkdir ${S}
|
mkdir ${S}
|
||||||
|
@ -38,7 +38,7 @@ do_wrlinux_checkout() {
|
||||||
git checkout -f standard
|
git checkout -f standard
|
||||||
}
|
}
|
||||||
|
|
||||||
addtask wrlinux_checkout before do_patch after do_unpack
|
addtask kernel_checkout before do_patch after do_unpack
|
||||||
|
|
||||||
do_compile () {
|
do_compile () {
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
DESCRIPTION = "Wind River Kernel"
|
DESCRIPTION = "Yocto Kernel"
|
||||||
SECTION = "kernel"
|
SECTION = "kernel"
|
||||||
LICENSE = "GPL"
|
LICENSE = "GPL"
|
||||||
|
|
||||||
|
@ -13,16 +13,17 @@ PV = "2.6.34+git${SRCPV}"
|
||||||
SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \
|
SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \
|
||||||
git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
|
git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
|
||||||
|
|
||||||
WRMACHINE = "UNDEFINED"
|
# map the poky machine to a 'kernel machine'
|
||||||
WRMACHINE_qemux86 = "common_pc"
|
KMACHINE = "UNDEFINED"
|
||||||
WRMACHINE_qemux86-64 = "common_pc_64"
|
KMACHINE_qemux86 = "common_pc"
|
||||||
WRMACHINE_qemuppc = "qemu_ppc32"
|
KMACHINE_qemux86-64 = "common_pc_64"
|
||||||
WRMACHINE_qemumips = "mti_malta32_be"
|
KMACHINE_qemuppc = "qemu_ppc32"
|
||||||
WRMACHINE_qemuarm = "arm_versatile_926ejs"
|
KMACHINE_qemumips = "mti_malta32_be"
|
||||||
WRMACHINE_atom-pc = "atom-pc"
|
KMACHINE_qemuarm = "arm_versatile_926ejs"
|
||||||
WRMACHINE_routerstationpro = "routerstationpro"
|
KMACHINE_atom-pc = "atom-pc"
|
||||||
WRMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
|
KMACHINE_routerstationpro = "routerstationpro"
|
||||||
WRMACHINE_beagleboard = "beagleboard"
|
KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
|
||||||
|
KMACHINE_beagleboard = "beagleboard"
|
||||||
|
|
||||||
# Determine which branch to fetch and build. Not all branches are in the
|
# Determine which branch to fetch and build. Not all branches are in the
|
||||||
# upstream repo (but will be locally created after the fetchers run) so
|
# upstream repo (but will be locally created after the fetchers run) so
|
||||||
|
@ -36,11 +37,11 @@ WRMACHINE_beagleboard = "beagleboard"
|
||||||
python __anonymous () {
|
python __anonymous () {
|
||||||
import bb, re
|
import bb, re
|
||||||
|
|
||||||
bb.data.setVar("KBRANCH", "${WRMACHINE}-${LINUX_KERNEL_TYPE}", d)
|
bb.data.setVar("KBRANCH", "${KMACHINE}-${LINUX_KERNEL_TYPE}", d)
|
||||||
mach = bb.data.getVar("WRMACHINE", d, 1)
|
mach = bb.data.getVar("KMACHINE", d, 1)
|
||||||
if mach == "UNDEFINED":
|
if mach == "UNDEFINED":
|
||||||
bb.data.setVar("KBRANCH", "standard", d)
|
bb.data.setVar("KBRANCH", "standard", d)
|
||||||
bb.data.setVar("WRMACHINE", "${MACHINE}", d)
|
bb.data.setVar("KMACHINE", "${MACHINE}", d)
|
||||||
# track the global configuration on a bootstrapped BSP
|
# track the global configuration on a bootstrapped BSP
|
||||||
bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d)
|
bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d)
|
||||||
bb.data.setVar("BOOTSTRAP", "t", d)
|
bb.data.setVar("BOOTSTRAP", "t", d)
|
||||||
|
@ -53,7 +54,7 @@ LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}"
|
||||||
PR = "r13"
|
PR = "r13"
|
||||||
|
|
||||||
S = "${WORKDIR}/linux"
|
S = "${WORKDIR}/linux"
|
||||||
B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build"
|
B = "${WORKDIR}/linux-${KMACHINE}-${LINUX_KERNEL_TYPE}-build"
|
||||||
|
|
||||||
# functionality flags
|
# functionality flags
|
||||||
KERNEL_REVISION_CHECKING ?= "t"
|
KERNEL_REVISION_CHECKING ?= "t"
|
||||||
|
@ -66,9 +67,9 @@ do_patch() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# simply ensures that a branch of the right name has been created
|
# simply ensures that a branch of the right name has been created
|
||||||
createme ${ARCH} ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${defconfig}
|
createme ${ARCH} ${KMACHINE}-${LINUX_KERNEL_TYPE} ${defconfig}
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "ERROR. Could not create ${WRMACHINE}-${LINUX_KERNEL_TYPE}"
|
echo "ERROR. Could not create ${KMACHINE}-${LINUX_KERNEL_TYPE}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -78,14 +79,14 @@ do_patch() {
|
||||||
fi
|
fi
|
||||||
updateme ${addon_features} ${ARCH} ${WORKDIR}
|
updateme ${addon_features} ${ARCH} ${WORKDIR}
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "ERROR. Could not update ${WRMACHINE}-${LINUX_KERNEL_TYPE}"
|
echo "ERROR. Could not update ${KMACHINE}-${LINUX_KERNEL_TYPE}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# executes and modifies the source tree as required
|
# executes and modifies the source tree as required
|
||||||
patchme ${WRMACHINE}-${LINUX_KERNEL_TYPE}
|
patchme ${KMACHINE}-${LINUX_KERNEL_TYPE}
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "ERROR. Could not modify ${WRMACHINE}-${LINUX_KERNEL_TYPE}"
|
echo "ERROR. Could not modify ${KMACHINE}-${LINUX_KERNEL_TYPE}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -100,9 +101,9 @@ validate_branches() {
|
||||||
if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
|
if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
|
||||||
git show ${target_branch_head} > /dev/null 2>&1
|
git show ${target_branch_head} > /dev/null 2>&1
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Forcing branch ${WRMACHINE}-${LINUX_KERNEL_TYPE} to ${target_branch_head}"
|
echo "Forcing branch ${KMACHINE}-${LINUX_KERNEL_TYPE} to ${target_branch_head}"
|
||||||
git branch -m ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${WRMACHINE}-${LINUX_KERNEL_TYPE}-orig
|
git branch -m ${KMACHINE}-${LINUX_KERNEL_TYPE} ${KMACHINE}-${LINUX_KERNEL_TYPE}-orig
|
||||||
git checkout -b ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${target_branch_head}
|
git checkout -b ${KMACHINE}-${LINUX_KERNEL_TYPE} ${target_branch_head}
|
||||||
else
|
else
|
||||||
echo "ERROR ${target_branch_head} is not a valid commit ID."
|
echo "ERROR ${target_branch_head} is not a valid commit ID."
|
||||||
echo "The kernel source tree may be out of sync"
|
echo "The kernel source tree may be out of sync"
|
||||||
|
@ -127,9 +128,9 @@ validate_branches() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
do_wrlinux_checkout() {
|
do_kernel_checkout() {
|
||||||
if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then
|
if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then
|
||||||
echo "Fixing up git directory for ${WRMACHINE}-${LINUX_KERNEL_TYPE}"
|
echo "Fixing up git directory for ${KMACHINE}-${LINUX_KERNEL_TYPE}"
|
||||||
rm -rf ${S}
|
rm -rf ${S}
|
||||||
mkdir ${S}
|
mkdir ${S}
|
||||||
mv ${WORKDIR}/.git ${S}
|
mv ${WORKDIR}/.git ${S}
|
||||||
|
@ -165,17 +166,17 @@ IFS='
|
||||||
# our initial checkout. So we do it a second time to be sure
|
# our initial checkout. So we do it a second time to be sure
|
||||||
git checkout -f ${KBRANCH}
|
git checkout -f ${KBRANCH}
|
||||||
}
|
}
|
||||||
do_wrlinux_checkout[dirs] = "${S}"
|
do_kernel_checkout[dirs] = "${S}"
|
||||||
|
|
||||||
addtask wrlinux_checkout before do_patch after do_unpack
|
addtask kernel_checkout before do_patch after do_unpack
|
||||||
|
|
||||||
do_wrlinux_configme() {
|
do_kernel_configme() {
|
||||||
echo "Doing wrlinux configme"
|
echo "Doing kernel configme"
|
||||||
|
|
||||||
cd ${S}
|
cd ${S}
|
||||||
configme --reconfig
|
configme --reconfig
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "ERROR. Could not configure ${WRMACHINE}-${LINUX_KERNEL_TYPE}"
|
echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -184,13 +185,13 @@ do_wrlinux_configme() {
|
||||||
echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
|
echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
|
||||||
}
|
}
|
||||||
|
|
||||||
do_wrlinux_configcheck() {
|
do_kernel_configcheck() {
|
||||||
echo "[INFO] validating kernel configuration"
|
echo "[INFO] validating kernel configuration"
|
||||||
cd ${B}/..
|
cd ${B}/..
|
||||||
kconf_check ${B}/.config ${B} ${S} ${B} ${LINUX_VERSION} ${WRMACHINE}-${LINUX_KERNEL_TYPE}
|
kconf_check ${B}/.config ${B} ${S} ${B} ${LINUX_VERSION} ${KMACHINE}-${LINUX_KERNEL_TYPE}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_wrlinux_link_vmlinux() {
|
do_kernel_link_vmlinux() {
|
||||||
if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
|
if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
|
||||||
mkdir ${B}/arch/${ARCH}/boot
|
mkdir ${B}/arch/${ARCH}/boot
|
||||||
fi
|
fi
|
||||||
|
@ -207,9 +208,9 @@ do_install_perf() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_patch[depends] = "kern-tools-native:do_populate_sysroot"
|
do_patch[depends] = "kern-tools-native:do_populate_sysroot"
|
||||||
addtask wrlinux_configme before do_configure after do_patch
|
addtask kernel_configme before do_configure after do_patch
|
||||||
addtask wrlinux_link_vmlinux after do_compile before do_install
|
addtask kernel_link_vmlinux after do_compile before do_install
|
||||||
addtask wrlinux_configcheck after do_configure before do_compile
|
addtask kernel_configcheck after do_configure before do_compile
|
||||||
|
|
||||||
inherit kernel
|
inherit kernel
|
||||||
|
|
Loading…
Reference in New Issue