kernel: rename supported kernel to linux-yocto
cover kernel: rename supported kernel to linux-yocto
This is the first of several staged changes to update the kernel support for the 1.0 release.
This series is step 1:
- rename the supported kernel to 'linux-yocto' and update the boards, and recipes that have references to linux-wrs.
Step 2 will refactor the code into reusable blocks Step 3 will do internal branch renames for scalability Step 4 will launch and updated 2.6.34.x and 2.6.37-rcX kernel
This has been built and booted on the relevant boards. If I've missed a reference to the existing kernel name, let me know and I'll make those updates as well.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: zedd/kernel-rename
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-rename
Thanks,
Bruce Ashfield <[email protected]>
---
Bruce Ashfield (3):
linux-wrs: rename to linux-yocto
linux-yocto: update board configurations
linux-yocto: update SRCREVs for linux-yocto rename
meta-emenlow/conf/machine/emenlow.conf | 2 +-
...x-wrs_git.bbappend => linux-yocto_git.bbappend} | 0
.../conf/distro/include/poky-default-revisions.inc | 24 +++---
meta/conf/machine/atom-pc.conf | 2 +-
meta/conf/machine/beagleboard.conf | 2 +-
meta/conf/machine/include/qemu.inc | 2 +-
meta/conf/machine/mpc8315e-rdb.conf | 2 +-
meta/conf/machine/routerstationpro.conf | 2 +-
...-wrs_git.bb => linux-libc-headers-yocto_git.bb} | 4 +-
.../linux/{linux-wrs_git.bb => linux-yocto_git.bb} | 73 ++++++++++----------
10 files changed, 57 insertions(+), 56 deletions(-)
rename meta-emenlow/recipes/linux/{linux-wrs_git.bbappend => linux-yocto_git.bbappend} (100%)
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers-wrs_git.bb => linux-libc-headers-yocto_git.bb} (91%)
rename meta/recipes-kernel/linux/{linux-wrs_git.bb => linux-yocto_git.bb} (74%)PATCH 1/3 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.
--- .../linux-libc-headers-wrs_git.bb | 4 +- meta/recipes-kernel/linux/linux-wrs_git.bb | 73 ++++++++++---------- 2 files changed, 39 insertions(+), 38 deletions(-)
meta/recipes-kernel/linux-libc-headers/linux-libc-headers-wrs_git.bb +2 -2
@@ -26,7 +26,7 @@ do_configure() { oe_runmake allnoconfig ARCH=$ARCH } -do_wrlinux_checkout() { +do_kernel_checkout() { if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then rm -rf ${S} mkdir ${S}
@@ -38,7 +38,7 @@ do_wrlinux_checkout() { git checkout -f standard } -addtask wrlinux_checkout before do_patch after do_unpack +addtask kernel_checkout before do_patch after do_unpack do_compile () { }
meta/recipes-kernel/linux/linux-wrs_git.bb +37 -36
155 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 2/3 linux-yocto: update board configurations
In reply to Bruce AshfieldNow that linuy-wrs has been renamed linux-yocto, we need to rename and update an board configurations and append files.
---
meta-emenlow/conf/machine/emenlow.conf | 2 +-
...x-wrs_git.bbappend => linux-yocto_git.bbappend} | 0
meta/conf/machine/atom-pc.conf | 2 +-
meta/conf/machine/beagleboard.conf | 2 +-
meta/conf/machine/include/qemu.inc | 2 +-
meta/conf/machine/mpc8315e-rdb.conf | 2 +-
meta/conf/machine/routerstationpro.conf | 2 +-
...-wrs_git.bb => linux-libc-headers-yocto_git.bb} | 0
.../linux/{linux-wrs_git.bb => linux-yocto_git.bb} | 0
9 files changed, 6 insertions(+), 6 deletions(-)
rename meta-emenlow/recipes/linux/{linux-wrs_git.bbappend => linux-yocto_git.bbappend} (100%)
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers-wrs_git.bb => linux-libc-headers-yocto_git.bb} (100%)
rename meta/recipes-kernel/linux/{linux-wrs_git.bb => linux-yocto_git.bb} (100%)meta-emenlow/conf/machine/emenlow.conf +1 -1
@@ -16,7 +16,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ KERNEL_IMAGETYPE = "bzImage" -PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo" PREFERRED_PROVIDER_drm = "libdrm-poulsbo" PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
meta-emenlow/recipes/linux/linux-yocto_git.bbappend renamed from meta-emenlow/recipes/linux/linux-wrs_git.bbappend +0 -0
meta/conf/machine/atom-pc.conf +1 -1
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ KERNEL_IMAGETYPE = "bzImage" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
meta/conf/machine/beagleboard.conf +1 -1
@@ -22,7 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " # Guesswork SERIAL_CONSOLE = "115200 ttyS2" -PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" KERNEL_IMAGETYPE = "uImage"
meta/conf/machine/include/qemu.inc +1 -1
@@ -15,6 +15,6 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000" RDEPENDS_kernel-base = "" # 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"
meta/conf/machine/mpc8315e-rdb.conf +1 -1
@@ -13,4 +13,4 @@ SERIAL_CONSOLE = "115200 ttyS0" MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" -PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
meta/conf/machine/routerstationpro.conf +1 -1
@@ -12,7 +12,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" -PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" SERIAL_CONSOLE = "115200 ttyS0"
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 +0 -0
meta/recipes-kernel/linux/linux-yocto_git.bb renamed from meta/recipes-kernel/linux/linux-wrs_git.bb +0 -0
Signature · 1 line
1.7.0.4
PATCH 3/3 linux-yocto: update SRCREVs for linux-yocto rename
In reply to Bruce AshfieldNow that linux-wrs has been renamed linux-yocto, we need to update the SRCREVs to have the new name.
--- .../conf/distro/include/poky-default-revisions.inc | 24 ++++++++++---------- 1 files changed, 12 insertions(+), 12 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +12 -12
@@ -82,18 +82,18 @@ SRCREV_pn-linux-omap-zoomsync ??= "015cbaf1035cd9a61d33a27de2a22902555db3c5" SRCREV_pn-linux-omap2 ??= "d3b3ae0fe6c71641da19c8de466ec366d39847e3" SRCREV_pn-linux-omap3 ??= "de1121fdb899f762b9e717f44eaf3fae7c00cd3e" SRCREV_pn-linux-omap3-pm ??= "totallybroken" -SRCREV_machine_pn-linux-wrs_qemuarm ?= "4f4177b4bea5b8858acc1eeb788d80b7af0df962" -SRCREV_machine_pn-linux-wrs_qemumips ?= "81f3cd467b9d51fa1dfa2d5939337cc756ae8061" -SRCREV_machine_pn-linux-wrs_qemuppc ?= "9ac0daee43dd19d8bea828cf79450c9748ae0daa" -SRCREV_machine_pn-linux-wrs_qemux86 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" -SRCREV_machine_pn-linux-wrs_qemux86-64 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" -SRCREV_machine_pn-linux-wrs_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7" -SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" -SRCREV_machine_pn-linux-wrs_routerstationpro ?= "2ec2edaf256dd8500ee3d4763fee6ca3ecd6da4b" -SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f" -SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" -SRCREV_meta_pn-linux-wrs ?= "d1cd5c80ee97e81e130be8c3de3965b770f320d6" -SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" +SRCREV_machine_pn-linux-yocto_qemuarm ?= "4f4177b4bea5b8858acc1eeb788d80b7af0df962" +SRCREV_machine_pn-linux-yocto_qemumips ?= "81f3cd467b9d51fa1dfa2d5939337cc756ae8061" +SRCREV_machine_pn-linux-yocto_qemuppc ?= "9ac0daee43dd19d8bea828cf79450c9748ae0daa" +SRCREV_machine_pn-linux-yocto_qemux86 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" +SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" +SRCREV_machine_pn-linux-yocto_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7" +SRCREV_machine_pn-linux-yocto_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" +SRCREV_machine_pn-linux-yocto_routerstationpro ?= "2ec2edaf256dd8500ee3d4763fee6ca3ecd6da4b" +SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f" +SRCREV_machine_pn-linux-yocto_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" +SRCREV_meta_pn-linux-yocto ?= "d1cd5c80ee97e81e130be8c3de3965b770f320d6" +SRCREV_pn-linux-libc-headers-yocto ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" SRCREV_pn-matchbox-config-gtk ??= "2081" SRCREV_pn-matchbox-desktop-sato ??= "76" SRCREV_pn-matchbox-desktop ??= "2096"
Signature · 1 line
1.7.0.4
Quoted 25 lines · Bruce Ashfield
This is the first of several staged changes to update the kernel support for the 1.0 release.
This series is step 1:
- rename the supported kernel to 'linux-yocto' and update the boards, and recipes that have references to linux-wrs.
Step 2 will refactor the code into reusable blocks Step 3 will do internal branch renames for scalability Step 4 will launch and updated 2.6.34.x and 2.6.37-rcX kernel
This has been built and booted on the relevant boards. If I've missed a reference to the existing kernel name, let me know and I'll make those updates as well.
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: zedd/kernel-rename
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-renameThanks,
Bruce Ashfield<[email protected]>
---
Quoted 4 lines
Bruce Ashfield (3):
linux-wrs: rename to linux-yocto
linux-yocto: update board configurations
linux-yocto: update SRCREVs for linux-yocto rename
From what I can tell these changes are not "bisectable" - the build would fail if all three are not applied. If I'm not missing something, I'd prefer to see these squashed into a single commit.
Signature · 2 lines
Darren Hart Embedded Linux Kernel
Quoted 28 lines · Darren Hart
Quoted 27 lines · Bruce Ashfield
This is the first of several staged changes to update the kernel support for the 1.0 release.
This series is step 1:
- rename the supported kernel to 'linux-yocto' and update the boards, and recipes that have references to linux-wrs.
Step 2 will refactor the code into reusable blocks Step 3 will do internal branch renames for scalability Step 4 will launch and updated 2.6.34.x and 2.6.37-rcX kernel
This has been built and booted on the relevant boards. If I've missed a reference to the existing kernel name, let me know and I'll make those updates as well.
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: zedd/kernel-rename
Browse:
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-renameThanks,
Bruce Ashfield<[email protected]>
---
Quoted 8 lines
Quoted 4 lines
Bruce Ashfield (3):
linux-wrs: rename to linux-yocto
linux-yocto: update board configurations
linux-yocto: update SRCREVs for linux-yocto renameFrom what I can tell these changes are not "bisectable" - the build would fail if all three are not applied. If I'm not missing something, I'd prefer to see these squashed into a single commit.
Definitely. Not bisectable, but I wanted to keep the changes logically separated,
since it allowed a commit message that wasn't too long to read and be useful. Since there are several recipe categories, boards and layers involved, I made the choice to split things up.
I typically insist on bisectable series as well, but have made exceptions :)
I'm happy to squash things though, if Richard wants them squashed I'll resend .. or it might be quicker to rebase and squash on merge, either works for me.
Bruce
Quoted 9 lines
--
Darren Hart
Embedded Linux Kernel
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Quoted 28 lines · Darren Hart
Quoted 27 lines · Bruce Ashfield
This is the first of several staged changes to update the kernel support for the 1.0 release.
This series is step 1:
- rename the supported kernel to 'linux-yocto' and update the boards, and recipes that have references to linux-wrs.
Step 2 will refactor the code into reusable blocks Step 3 will do internal branch renames for scalability Step 4 will launch and updated 2.6.34.x and 2.6.37-rcX kernel
This has been built and booted on the relevant boards. If I've missed a reference to the existing kernel name, let me know and I'll make those updates as well.
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: zedd/kernel-rename
Browse:
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-renameThanks,
Bruce Ashfield<[email protected]>
---
Quoted 8 lines
Quoted 4 lines
Bruce Ashfield (3):
linux-wrs: rename to linux-yocto
linux-yocto: update board configurations
linux-yocto: update SRCREVs for linux-yocto renameFrom what I can tell these changes are not "bisectable" - the build would fail if all three are not applied. If I'm not missing something, I'd prefer to see these squashed into a single commit.
Hmmm. I was largely thinking about another patch series. The commit messages for these are pretty small. I've squashed and updated my contrib branch.
Cheers,
Bruce
Quoted 9 lines
--
Darren Hart
Embedded Linux Kernel
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"