[PATCH 0/3] kernel26 cleanup

[PATCH 0/3] kernel26 cleanup

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This (post-1.2) patchset removes the last vestiges of kernel26 from poky.

The following changes since commit c936fca6e163bc19bc08cbd0036b31ca6f6c3ed6:
  Richard Purdie (1):
        bitbake.conf: Add PARALLEL_MAKE to BB_HASHBASE_WHITELIST

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/kernel26-removal
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/kernel26-removal

Tom Zanussi (3):
  yocto-bsp: remove kernel26 machine feature from templates
  meta-yocto: remove kernel26 machine feature usage
  dev-manual: remove kernel26 machine feature mention

 .../dev-manual/dev-manual-common-tasks.xml         |    2 +-
 meta-yocto/conf/machine/atom-pc.conf               |    3 +--
 meta-yocto/conf/machine/beagleboard.conf           |    2 +-
 meta-yocto/conf/machine/mpc8315e-rdb.conf          |    2 +-
 meta-yocto/conf/machine/routerstationpro.conf      |    3 +--
 .../target/arch/arm/conf/machine/{{=machine}}.conf |    2 +-
 .../arch/mips/conf/machine/{{=machine}}.conf       |    3 +--
 .../arch/powerpc/conf/machine/{{=machine}}.conf    |    2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)

[PATCH 1/3] yocto-bsp: remove kernel26 machine feature from templates

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

kernel26 is now obsolete so remove it from the templates that use it.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../target/arch/arm/conf/machine/{{=machine}}.conf |    2 +-
 .../arch/mips/conf/machine/{{=machine}}.conf       |    3 +--
 .../arch/powerpc/conf/machine/{{=machine}}.conf    |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
index 101dd60..1cf6097 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
@@ -84,4 +84,4 @@ UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}"
 {{ input type:"edit" name:"uboot_loadaddress" prio:"40" msg:"Please specify a value for UBOOT_LOADADDRESS:" default:"0x80008000" }}
 UBOOT_LOADADDRESS = "{{=uboot_loadaddress}}"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf
index 51157e5..ae27fe6 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf
@@ -5,8 +5,7 @@
 
 require conf/machine/include/tune-mips32.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \
-                    serial"
+MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial"
 
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
index 4f83dbb..18f5247 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
@@ -32,7 +32,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 
 {{ preferred_kernel = kernel_choice.split('_')[0] }}
 {{ preferred_kernel_version = kernel_choice.split('_')[1] }}
-- 
1.7.0.4

[PATCH 2/3] meta-yocto: remove kernel26 machine feature usage

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

kernel26 is now obsolete so remove it from the machine configs that
use it.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-yocto/conf/machine/atom-pc.conf          |    3 +--
 meta-yocto/conf/machine/beagleboard.conf      |    2 +-
 meta-yocto/conf/machine/mpc8315e-rdb.conf     |    2 +-
 meta-yocto/conf/machine/routerstationpro.conf |    3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index 7cbe157..73aba58 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -5,8 +5,7 @@
 
 include conf/machine/include/tune-atom.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
-                    acpi alsa"
+MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa"
 
 KERNEL_IMAGETYPE = "bzImage"
 
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 06a0ecd..aa8fa07 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -37,4 +37,4 @@ UBOOT_MACHINE = "omap3_beagle_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
index d3a5b1c..03b5f34 100644
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
@@ -9,7 +9,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 
 PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index a3d520d..3c2f56f 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -4,8 +4,7 @@
 
 require conf/machine/include/tune-mips32.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \
-                    serial"
+MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial"
 
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
-- 
1.7.0.4

[PATCH 3/3] dev-manual: remove kernel26 machine feature mention

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

kernel26 is now obsolete so remove mention of it from the docs.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../dev-manual/dev-manual-common-tasks.xml         |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index a32085d..0de6a91 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -1082,7 +1082,7 @@ so that there are some definite steps on how to do this.  I need more detail her
                     <listitem><para><filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PREFERRED_PROVIDER'>
                         PREFERRED_PROVIDER</ulink></filename>_virtual/kernel (see below)</para></listitem>
                     <listitem><para><filename><ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE_FEATURES'>
-                        MACHINE_FEATURES</ulink></filename> (e.g. "kernel26 apm screen wifi")</para></listitem>
+                        MACHINE_FEATURES</ulink></filename> (e.g. "apm screen wifi")</para></listitem>
                 </itemizedlist>
             </para>
 
-- 
1.7.0.4

Re: [PATCH 0/3] kernel26 cleanup

[Richard Purdie]

On Mon, 2012-04-16 at 22:29 -0500, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
> 
> This (post-1.2) patchset removes the last vestiges of kernel26 from poky.
> 
> The following changes since commit c936fca6e163bc19bc08cbd0036b31ca6f6c3ed6:
>   Richard Purdie (1):
>         bitbake.conf: Add PARALLEL_MAKE to BB_HASHBASE_WHITELIST
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib.git tzanussi/kernel26-removal
>   http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/kernel26-removal
> 
> Tom Zanussi (3):
>   yocto-bsp: remove kernel26 machine feature from templates
>   meta-yocto: remove kernel26 machine feature usage

I've merged these, thanks.

>   dev-manual: remove kernel26 machine feature mention

and I've passed this on to Scott to handle.

Cheers,

Richard