[oe-commits] org.oe.oz354x machines.conf: switched ZKERNEL_VERSION to MACHINE_KERNEL_VERSION like in .dev

[hrw commit]

machines.conf: switched ZKERNEL_VERSION to MACHINE_KERNEL_VERSION like in .dev

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: aed8d2757a9c0efeb639f8c95ea8c5e9f11d0536
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aed8d2757a9c0efeb639f8c95ea8c5e9f11d0536
Files:
1
conf/machine/akita.conf
conf/machine/c7x0.conf
conf/machine/collie.conf
conf/machine/poodle.conf
conf/machine/spitz.conf
conf/machine/tosa.conf
Diffs:

#
# mt diff -rff425a550178460880328762d12c24959cee2f04 -raed8d2757a9c0efeb639f8c95ea8c5e9f11d0536
#
# 
# 
# patch "conf/machine/akita.conf"
#  from [569ab2629c61924e4cc7eb834f6fa5dcb620d7f7]
#    to [a1fec176a70fcf2cc865e8549d18d3219001e389]
# 
# patch "conf/machine/c7x0.conf"
#  from [97beb6336a1cc616669478350c718fcb231645fe]
#    to [4b87df1bc040abec2b2e245b4405b8dec3a04c6b]
# 
# patch "conf/machine/collie.conf"
#  from [5c215297c6ec7aa0ad96513ab55ba111c7c9c61d]
#    to [e714f8d47d8e57a584d62a082e067812c59478d2]
# 
# patch "conf/machine/poodle.conf"
#  from [a978b9ce7144a1d12ebd985897e45eec24a23cd8]
#    to [42b7f80fea8522baabe36e7b4a2e7db70f1961eb]
# 
# patch "conf/machine/spitz.conf"
#  from [045f9d670b5ce14bb7657bbceb6f8db04b8113bf]
#    to [c852e9e99942b54beffe56c57250ddabad0dde69]
# 
# patch "conf/machine/tosa.conf"
#  from [2a3c885ca88c65ce832b04c1c329410a0df46571]
#    to [eb79fce2d2c5f7cc5abe94ffd10f741be16e9804]
# 
============================================================
--- conf/machine/akita.conf	569ab2629c61924e4cc7eb834f6fa5dcb620d7f7
+++ conf/machine/akita.conf	a1fec176a70fcf2cc865e8549d18d3219001e389
@@ -1,8 +1,8 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-ZKERNEL_VERSION = "2.6"
+MACHINE_KERNEL_VERSION = "2.6"
 
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
============================================================
--- conf/machine/c7x0.conf	97beb6336a1cc616669478350c718fcb231645fe
+++ conf/machine/c7x0.conf	4b87df1bc040abec2b2e245b4405b8dec3a04c6b
@@ -1,8 +1,8 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-ZKERNEL_VERSION = "2.6"
+MACHINE_KERNEL_VERSION = "2.6"
 
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
============================================================
--- conf/machine/collie.conf	5c215297c6ec7aa0ad96513ab55ba111c7c9c61d
+++ conf/machine/collie.conf	e714f8d47d8e57a584d62a082e067812c59478d2
@@ -1,11 +1,11 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
 
-ZKERNEL_VERSION ?= "2.6"
-include conf/machine/include/collie-${ZKERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION ?= "2.6"
+include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
 
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel altboot"
============================================================
--- conf/machine/poodle.conf	a978b9ce7144a1d12ebd985897e45eec24a23cd8
+++ conf/machine/poodle.conf	42b7f80fea8522baabe36e7b4a2e7db70f1961eb
@@ -5,8 +5,8 @@ IPKG_EXTRA_ARCHS = "armv4 armv5te"
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-ZKERNEL_VERSION ?= "2.6"
-include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION ?= "2.6"
+include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
============================================================
--- conf/machine/spitz.conf	045f9d670b5ce14bb7657bbceb6f8db04b8113bf
+++ conf/machine/spitz.conf	c852e9e99942b54beffe56c57250ddabad0dde69
@@ -1,8 +1,8 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-ZKERNEL_VERSION = "2.6"
+MACHINE_KERNEL_VERSION = "2.6"
 
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
============================================================
--- conf/machine/tosa.conf	2a3c885ca88c65ce832b04c1c329410a0df46571
+++ conf/machine/tosa.conf	eb79fce2d2c5f7cc5abe94ffd10f741be16e9804
@@ -5,8 +5,8 @@ IPKG_EXTRA_ARCHS = "armv4 armv5te"
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-ZKERNEL_VERSION ?= "2.6"
-include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION ?= "2.6"
+include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"