[oe-commits] org.oe.dev kernels: fix parse errors
hrw commit
openembedded-commits at lists.openembedded.org
Mon Nov 20 15:08:30 UTC 2006
kernels: fix parse errors
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 01d82c547046c2125dffd5ba0ccb8ee9b2b5e861
ViewMTN: http://monotone.openembedded.org/revision.psp?id=01d82c547046c2125dffd5ba0ccb8ee9b2b5e861
Files:
1
packages/linux/LAB-kernel_cvs.bb
packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/linux-ezx_2.6.16.13.bb
packages/linux/linux-geodelx_2.6.11.bb
packages/linux/linux-gumstix_2.6.15.bb
packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
Diffs:
#
# mt diff -rf063ce041e967738f1bcdd3b31280fbe36c8681b -r01d82c547046c2125dffd5ba0ccb8ee9b2b5e861
#
#
#
# patch "packages/linux/LAB-kernel_cvs.bb"
# from [58abaeadd5fc3f4c83e2ae68b2b224a83ed8b584]
# to [8e3505b3794e207d9b975e0eed86f0c570836ecc]
#
# patch "packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [6709e47164ad9e0212003144ef31645728818892]
# to [5d7975c7b024f904c480268145ec6c032d417a7f]
#
# patch "packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [99b038850b1be417026d491d785fb831ec0caa94]
# to [2cf343b6170f1b28d20023a7bb7375bf7ff2b655]
#
# patch "packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [4730eaeb8e6e12340c68e90a7abffa5e4a6b08b1]
# to [702963ebe4a4ef1175cedb4c45770c190c96331b]
#
# patch "packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [18c0556316e9cf20227c6c0a339cad49e10b4506]
# to [5a5c341ecda5ab6956b54dce7bb9709bf15f8557]
#
# patch "packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [87c7de02ab1ffe89b9dcded2ec50ef398051e817]
# to [295b7386d7f6449d3aad7cdd05b4e1426a597cd9]
#
# patch "packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [dce955fb5b432a6120df16d36df91d4c07c5ad86]
# to [95b4838142802f9a9d5f2e61083b8c8443be384a]
#
# patch "packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [7820eefcdadd24d446014d2b931ecf2b317be52d]
# to [a72eb0a0b65dfa493ab4ca9f223870391f7a584b]
#
# patch "packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [aa33554b1df8ee3c59f9499295c68ff715190344]
# to [a4c7fa2e8353a4d57140aed1f15f5a1a65cbc618]
#
# patch "packages/linux/linux-ezx_2.6.16.13.bb"
# from [5814e1e7fc351fa2d0e669c308fe9f353ed59617]
# to [9914a9bc4c9a6b74c6f899b992f9402badd11f66]
#
# patch "packages/linux/linux-geodelx_2.6.11.bb"
# from [18c98ae23f82819193af85eb586beeb074a41803]
# to [0bff66d47cf18c7a305d1b3e1548f895adc7e02b]
#
# patch "packages/linux/linux-gumstix_2.6.15.bb"
# from [47fe910002d159ed791665fcd906f9de7616b993]
# to [99cfae119fc0f0ea7dae47530af06f87ef60a26e]
#
# patch "packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb"
# from [e59c93649b6aae5acc1b215a3eea66d5f90ad227]
# to [38e297d651db5998707af0f9d0d1e428a4348c22]
#
# patch "packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb"
# from [eb5036d4ee00be06fe51e356953cac152f20581e]
# to [4451ad51edf76390963ebc27cd5338a2297c9bf9]
#
# patch "packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb"
# from [4dd220b604b621850422e4dc6a15a68b31d129ca]
# to [9bbcf208056b80f14f2e385fab46321b51937e5c]
#
============================================================
--- packages/linux/LAB-kernel_cvs.bb 58abaeadd5fc3f4c83e2ae68b2b224a83ed8b584
+++ packages/linux/LAB-kernel_cvs.bb 8e3505b3794e207d9b975e0eed86f0c570836ecc
@@ -23,7 +23,7 @@ FILES_kernel-image_h2200 = ""
inherit kernel
FILES_kernel-image_h2200 = ""
-ALLOW_EMPTY_kernel-image_h2200 = 1
+ALLOW_EMPTY_kernel-image_h2200 = "1"
K_MAJOR = "2"
K_MINOR = "6"
============================================================
--- packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb 6709e47164ad9e0212003144ef31645728818892
+++ packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb 5d7975c7b024f904c480268145ec6c032d417a7f
@@ -1,4 +1,4 @@
-COLLIE_MEMORY_SIZE=24
-COLLIE_RAMDISK_SIZE=8
+COLLIE_MEMORY_SIZE = "24"
+COLLIE_RAMDISK_SIZE = "8"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb 99b038850b1be417026d491d785fb831ec0caa94
+++ packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb 2cf343b6170f1b28d20023a7bb7375bf7ff2b655
@@ -1,4 +1,4 @@
-COLLIE_MEMORY_SIZE=32
-COLLIE_RAMDISK_SIZE=0
+COLLIE_MEMORY_SIZE = "32"
+COLLIE_RAMDISK_SIZE = "0"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb 4730eaeb8e6e12340c68e90a7abffa5e4a6b08b1
+++ packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb 702963ebe4a4ef1175cedb4c45770c190c96331b
@@ -1,4 +1,4 @@
-COLLIE_MEMORY_SIZE=32
-COLLIE_RAMDISK_SIZE=32
+COLLIE_MEMORY_SIZE = "32"
+COLLIE_RAMDISK_SIZE = "32"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb 18c0556316e9cf20227c6c0a339cad49e10b4506
+++ packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb 5a5c341ecda5ab6956b54dce7bb9709bf15f8557
@@ -1,4 +1,4 @@
-COLLIE_MEMORY_SIZE=40
-COLLIE_RAMDISK_SIZE=24
+COLLIE_MEMORY_SIZE = "40"
+COLLIE_RAMDISK_SIZE = "24"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb 87c7de02ab1ffe89b9dcded2ec50ef398051e817
+++ packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb 295b7386d7f6449d3aad7cdd05b4e1426a597cd9
@@ -1,4 +1,4 @@
-COLLIE_MEMORY_SIZE=48
-COLLIE_RAMDISK_SIZE=16
+COLLIE_MEMORY_SIZE = "48"
+COLLIE_RAMDISK_SIZE = "16"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb dce955fb5b432a6120df16d36df91d4c07c5ad86
+++ packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb 95b4838142802f9a9d5f2e61083b8c8443be384a
@@ -1,5 +1,5 @@
-COLLIE_MEMORY_SIZE=58
-COLLIE_RAMDISK_SIZE=6
+COLLIE_MEMORY_SIZE = "58"
+COLLIE_RAMDISK_SIZE = "6"
KERNEL_CONSOLE = "tty0"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb 7820eefcdadd24d446014d2b931ecf2b317be52d
+++ packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb a72eb0a0b65dfa493ab4ca9f223870391f7a584b
@@ -1,4 +1,4 @@
-COLLIE_MEMORY_SIZE=58
-COLLIE_RAMDISK_SIZE=6
+COLLIE_MEMORY_SIZE = "58"
+COLLIE_RAMDISK_SIZE = "6"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb aa33554b1df8ee3c59f9499295c68ff715190344
+++ packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb a4c7fa2e8353a4d57140aed1f15f5a1a65cbc618
@@ -1,4 +1,4 @@
-COLLIE_MEMORY_SIZE=64
-COLLIE_RAMDISK_SIZE=0
+COLLIE_MEMORY_SIZE = "64"
+COLLIE_RAMDISK_SIZE = "0"
require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
============================================================
--- packages/linux/linux-ezx_2.6.16.13.bb 5814e1e7fc351fa2d0e669c308fe9f353ed59617
+++ packages/linux/linux-ezx_2.6.16.13.bb 9914a9bc4c9a6b74c6f899b992f9402badd11f66
@@ -30,7 +30,7 @@ FILES_kernel-image = ""
# kernel image resides on a seperate flash partition (for now)
#
FILES_kernel-image = ""
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = '(a780|e680)'
============================================================
--- packages/linux/linux-geodelx_2.6.11.bb 18c98ae23f82819193af85eb586beeb074a41803
+++ packages/linux/linux-geodelx_2.6.11.bb 0bff66d47cf18c7a305d1b3e1548f895adc7e02b
@@ -10,7 +10,7 @@ AMD_DRIVER_LABEL = "Patches_Linux2.6.11_
AMD_DRIVER_VERSION = "02.03.0100"
AMD_DRIVER_LABEL = "Patches_Linux2.6.11_Common_${AMD_DRIVER_VERSION}"
-KV=${PV}
+KV = "${PV}"
S = "${WORKDIR}/linux-${KV}"
============================================================
--- packages/linux/linux-gumstix_2.6.15.bb 47fe910002d159ed791665fcd906f9de7616b993
+++ packages/linux/linux-gumstix_2.6.15.bb 99cfae119fc0f0ea7dae47530af06f87ef60a26e
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linu
COMPATIBLE_MACHINE = "gumstix"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
- cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd;date=20060223 \
+ cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd;date=20060223 \
file://defconfig-gumstix \
file://arch-config.patch;patch=1 \
file://board-init.patch;patch=1 \
============================================================
--- packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb e59c93649b6aae5acc1b215a3eea66d5f90ad227
+++ packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb 38e297d651db5998707af0f9d0d1e428a4348c22
@@ -44,9 +44,9 @@ COMPATIBLE_HOST = "arm.*-linux"
KERNEL_CCSUFFIX = "-3.3.4"
COMPATIBLE_HOST = "arm.*-linux"
-SIMPAD_MEM = ${@bb.data.getVar("SIMPAD_MEMORY_SIZE",d,1) or "32"}
-SIMPAD_RD = ${@bb.data.getVar("SIMPAD_RAMDISK_SIZE",d,1) or "32"}
-export CMDLINE = ${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or "mtdparts=sa1100:512k(boot),1m(kernel),14848k(root),-(home) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}
+SIMPAD_MEM = '${@bb.data.getVar("SIMPAD_MEMORY_SIZE",d,1) or "32"}'
+SIMPAD_RD = '${@bb.data.getVar("SIMPAD_RAMDISK_SIZE",d,1) or "32"}'
+export CMDLINE = '${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or "mtdparts=sa1100:512k(boot),1m(kernel),14848k(root),-(home) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}'
EXTRA_OEMAKE = ""
module_conf_sa1100_ir = "alias irda0 sa1100_ir"
============================================================
--- packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb eb5036d4ee00be06fe51e356953cac152f20581e
+++ packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb 4451ad51edf76390963ebc27cd5338a2297c9bf9
@@ -53,9 +53,9 @@ COMPATIBLE_HOST = "arm.*-linux"
KERNEL_CCSUFFIX = "-3.3.4"
COMPATIBLE_HOST = "arm.*-linux"
-SIMPAD_MEM = ${@bb.data.getVar("SIMPAD_MEMORY_SIZE",d,1) or "32"}
-SIMPAD_RD = ${@bb.data.getVar("SIMPAD_RAMDISK_SIZE",d,1) or "32"}
-export CMDLINE = ${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or "mtdparts=sa1100:512k(boot),1m(kernel),14848k(root),-(home) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}
+SIMPAD_MEM = '${@bb.data.getVar("SIMPAD_MEMORY_SIZE",d,1) or "32"}'
+SIMPAD_RD = '${@bb.data.getVar("SIMPAD_RAMDISK_SIZE",d,1) or "32"}'
+export CMDLINE = '${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or "mtdparts=sa1100:512k(boot),1m(kernel),14848k(root),-(home) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}'
#EXTRA_OEMAKE = ""
module_conf_sa1100_ir = "alias irda0 sa1100_ir"
============================================================
--- packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb 4dd220b604b621850422e4dc6a15a68b31d129ca
+++ packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb 9bbcf208056b80f14f2e385fab46321b51937e5c
@@ -53,7 +53,7 @@ FILES_kernel-image = ""
# Compensate for sucky bootloader on all Sharp Zaurus models
#
FILES_kernel-image = ""
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
KERNEL_CCSUFFIX = "-2.95"
KERNEL_LDSUFFIX = "-2.11.2"
More information about the Openembedded-commits
mailing list