summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/c7x0-kernels-2.4-embedix.bb2
-rw-r--r--packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb2
-rw-r--r--packages/linux/collie-kernels-2.4-embedix.bb2
-rw-r--r--packages/linux/compulab-pxa270_2.6.16.bb2
-rw-r--r--packages/linux/devkitidp-pxa255_2.6.19.bb2
-rw-r--r--packages/linux/em-x270_2.6.23.bb2
-rw-r--r--packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb2
-rw-r--r--packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb2
-rw-r--r--packages/linux/fsg3-kernel_2.6.18.bb2
-rw-r--r--packages/linux/gumstix-linux.inc2
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb2
-rw-r--r--packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb2
-rw-r--r--packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.18.bb2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.19.bb2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.20.bb2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.6.bb2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.23.8.bb2
-rw-r--r--packages/linux/linux-bd-neon-2.6_2.6.22.bb2
-rw-r--r--packages/linux/linux-davinci_2.6.x+git-davinci.bb2
-rw-r--r--packages/linux/linux-dht-walnut_2.6.20.bb2
-rw-r--r--packages/linux/linux-dht-walnut_2.6.23.bb2
-rw-r--r--packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb2
-rw-r--r--packages/linux/linux-efika_2.6.20.20.bb2
-rw-r--r--packages/linux/linux-efika_2.6.20.bb2
-rw-r--r--packages/linux/linux-efika_2.6.21+git.bb2
-rw-r--r--packages/linux/linux-epia_2.6.11.bb2
-rw-r--r--packages/linux/linux-epia_2.6.12.bb2
-rw-r--r--packages/linux/linux-epia_2.6.19.2.bb2
-rw-r--r--packages/linux/linux-epia_2.6.8.1.bb2
-rw-r--r--packages/linux/linux-ezx_2.6.21.bb2
-rw-r--r--packages/linux/linux-ezx_2.6.23.bb2
-rw-r--r--packages/linux/linux-ezx_2.6.24.bb2
-rw-r--r--packages/linux/linux-geodelx_2.6.11.bb2
-rw-r--r--packages/linux/linux-gumstix_2.6.15.bb2
-rw-r--r--packages/linux/linux-h1940_2.6.17-h1940.bb2
-rw-r--r--packages/linux/linux-hackndev-2.6_git.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_cvs.bb2
-rw-r--r--packages/linux/linux-ixp4xx_2.6.18.bb2
-rw-r--r--packages/linux/linux-ixp4xx_2.6.19.bb2
-rw-r--r--packages/linux/linux-ixp4xx_2.6.20.bb2
-rw-r--r--packages/linux/linux-ixp4xx_2.6.21.7.bb2
-rw-r--r--packages/linux/linux-ixp4xx_2.6.23.14.bb2
-rw-r--r--packages/linux/linux-jlime-current.bb2
-rw-r--r--packages/linux/linux-jlime-jornada6xx_2.6.11.bb2
-rw-r--r--packages/linux/linux-jlime-jornada6xx_2.6.17.bb2
-rw-r--r--packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb2
-rw-r--r--packages/linux/linux-jlime-jornada6xx_2.6.25.bb2
-rw-r--r--packages/linux/linux-jlime-jornada7xx_2.6.17.bb2
-rw-r--r--packages/linux/linux-jlime-jornada7xx_2.6.18.bb2
-rw-r--r--packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb2
-rw-r--r--packages/linux/linux-kaiser_2.6.24+git.bb2
-rw-r--r--packages/linux/linux-ks8695_2.6.16.bb2
-rw-r--r--packages/linux/linux-linkstationarm_2.6.12.bb2
-rw-r--r--packages/linux/linux-linkstationppc_2.6.21-rc5.bb2
-rw-r--r--packages/linux/linux-magicbox_2.6.18.6.bb2
-rw-r--r--packages/linux/linux-magicbox_2.6.19.2.bb2
-rw-r--r--packages/linux/linux-mainstone_2.6.25.bb2
-rw-r--r--packages/linux/linux-ml403-mvista-2.6.x_git.bb2
-rw-r--r--packages/linux/linux-mtx-1_2.4.27.bb2
-rw-r--r--packages/linux/linux-mtx-1u_2.4.27.bb2
-rw-r--r--packages/linux/linux-mtx-2_2.4.27.bb2
-rw-r--r--packages/linux/linux-mtx-3_2.6.15.4.bb2
-rw-r--r--packages/linux/linux-mtx-3_2.6.15.bb2
-rw-r--r--packages/linux/linux-navman_2.6.18.bb2
-rw-r--r--packages/linux/linux-neuros_2.6.15.bb2
-rw-r--r--packages/linux/linux-neuros_git.bb2
-rw-r--r--packages/linux/linux-nokia800_2.6.18-osso40.bb2
-rw-r--r--packages/linux/linux-nokia800_2.6.21-osso71.bb2
-rw-r--r--packages/linux/linux-omap1_2.6.12-rc2.bb2
-rw-r--r--packages/linux/linux-omap1_2.6.18+git.bb2
-rw-r--r--packages/linux/linux-omap2_git.bb2
-rw-r--r--packages/linux/linux-omap_git.bb2
-rw-r--r--packages/linux/linux-openezx-devel_svn.bb2
-rw-r--r--packages/linux/linux-openmoko-devel_git.bb2
-rw-r--r--packages/linux/linux-openmoko_2.6.24+git.bb2
-rw-r--r--packages/linux/linux-palm-omap1_2.6.22-omap1.bb2
-rw-r--r--packages/linux/linux-rp_2.6.23.bb2
-rw-r--r--packages/linux/linux-rp_2.6.24.bb2
-rw-r--r--packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb2
-rw-r--r--packages/linux/linux-rp_2.6.26.bb2
-rw-r--r--packages/linux/linux-rt_2.6.24.bb2
-rw-r--r--packages/linux/linux-rt_2.6.25.bb2
-rw-r--r--packages/linux/linux-sequoia_2.6.21.bb2
-rw-r--r--packages/linux/linux-smdk2440_2.6.20+git.bb2
-rw-r--r--packages/linux/linux-smdk2443_2.6.20+git.bb2
-rw-r--r--packages/linux/linux-storcenter_2.6.12.6.bb2
-rw-r--r--packages/linux/linux-storcenter_2.6.15.7.bb2
-rw-r--r--packages/linux/linux-sun4cdm_2.4.26.bb2
-rw-r--r--packages/linux/linux-sun4cdm_2.6.8.1.bb2
-rw-r--r--packages/linux/linux-titan-sh4_2.6.21.bb2
-rw-r--r--packages/linux/linux-tornado-omap2_2.6.16.16.bb2
-rw-r--r--packages/linux/linux-turbostation_2.6.20.2.bb2
-rw-r--r--packages/linux/linux-wrap-geode_2.6.17.bb2
-rw-r--r--packages/linux/linux-wrt_2.4.20.bb2
-rw-r--r--packages/linux/linux-wrt_2.4.30.bb2
-rw-r--r--packages/linux/linux-x86_2.6.17.9.bb2
-rw-r--r--packages/linux/linux-x86_2.6.20.bb2
-rw-r--r--packages/linux/linux-xilinx-slab_git.bb2
-rw-r--r--packages/linux/linux_2.6.18.bb2
-rw-r--r--packages/linux/linux_2.6.20.bb2
-rw-r--r--packages/linux/linux_2.6.21+2.6.22-rc1.bb2
-rw-r--r--packages/linux/linux_2.6.21.bb2
-rw-r--r--packages/linux/linux_2.6.22+2.6.23-rc3.bb2
-rw-r--r--packages/linux/linux_2.6.22+2.6.23-rc5.bb2
-rw-r--r--packages/linux/linux_2.6.22.6.bb2
-rw-r--r--packages/linux/linux_2.6.22.bb2
-rw-r--r--packages/linux/linux_2.6.23+2.6.24-rc5.bb2
-rw-r--r--packages/linux/linux_2.6.23+2.6.24-rc6.bb2
-rw-r--r--packages/linux/linux_2.6.23.bb2
-rw-r--r--packages/linux/linux_2.6.24.bb2
-rw-r--r--packages/linux/linux_2.6.25.bb2
-rw-r--r--packages/linux/linux_2.6.26.bb2
-rw-r--r--packages/linux/logicpd-pxa270_2.6.17-rc5.bb2
-rw-r--r--packages/linux/logicpd-pxa270_2.6.19.2.bb2
-rw-r--r--packages/linux/mainstone-kernel_2.6.11.bb2
-rw-r--r--packages/linux/mainstone-kernel_2.6.18.bb2
-rw-r--r--packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb2
-rw-r--r--packages/linux/mx21ads-kernel_2.6.19rc6.bb2
-rw-r--r--packages/linux/mx31ads-kernel_2.6.19rc6.bb2
-rw-r--r--packages/linux/netbook-pro-kernel_2.6.17.bb2
-rw-r--r--packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb2
-rw-r--r--packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb2
-rw-r--r--packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb2
-rw-r--r--packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc2
-rw-r--r--packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb2
-rw-r--r--packages/linux/triton-kernel_2.6.11.bb2
-rw-r--r--packages/linux/unslung-kernel_2.4.22.l2.3r63.bb2
-rw-r--r--packages/linux/xanadux-ba-2.6_2.6.12.bb2
-rw-r--r--packages/linux/xanadux-un-2.6_2.6.12.bb2
138 files changed, 138 insertions, 138 deletions
diff --git a/packages/linux/c7x0-kernels-2.4-embedix.bb b/packages/linux/c7x0-kernels-2.4-embedix.bb
index 0fa5e2a0e0..3a2c3b1205 100644
--- a/packages/linux/c7x0-kernels-2.4-embedix.bb
+++ b/packages/linux/c7x0-kernels-2.4-embedix.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Build all c7x0 kernels in one go"
SECTION = "kernel"
LICENSE = "GPL"
PROVIDES = "virtual/kernel"
-FILE_PR = "r1"
+PR = "r1"
COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
index a2f115a5fd..b6cdf48144 100644
--- a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
+++ b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
@@ -3,7 +3,7 @@ require linux.inc
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Chumby"
LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz \
http://files.chumby.com/source/ironforge/build396/align.pl \
diff --git a/packages/linux/collie-kernels-2.4-embedix.bb b/packages/linux/collie-kernels-2.4-embedix.bb
index 21168aff26..022aca9ff8 100644
--- a/packages/linux/collie-kernels-2.4-embedix.bb
+++ b/packages/linux/collie-kernels-2.4-embedix.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Build all collie kernels in one go"
SECTION = "kernel"
LICENSE = "GPL"
PROVIDES = "virtual/kernel"
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index 5c0d70cf11..fe72df8213 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
LICENSE = "GPL"
-FILE_PR = "r6"
+PR = "r6"
# Note, the compulab package contains a binary NAND driver that is not
# EABI compatible
diff --git a/packages/linux/devkitidp-pxa255_2.6.19.bb b/packages/linux/devkitidp-pxa255_2.6.19.bb
index 357e8ced27..f9eb6a7777 100644
--- a/packages/linux/devkitidp-pxa255_2.6.19.bb
+++ b/packages/linux/devkitidp-pxa255_2.6.19.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP"
LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
DEPENDS = "u-boot"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
diff --git a/packages/linux/em-x270_2.6.23.bb b/packages/linux/em-x270_2.6.23.bb
index 8d0aae78d0..fcef7280d0 100644
--- a/packages/linux/em-x270_2.6.23.bb
+++ b/packages/linux/em-x270_2.6.23.bb
@@ -4,7 +4,7 @@ SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Compulab EM-X270 system"
LICENSE = "GPL"
DEPENDS = "u-boot-utils-native"
-FILE_PR = "r1"
+PR = "r1"
KERNEL_IMAGETYPE = "uImage"
diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index 567a1d83d8..79d90bc4c7 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
COMPATIBLE_MACHINE = "ep93xx"
diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
index 3bc3fb6e2d..642b13f607 100644
--- a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
+++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
COMPATIBLE_MACHINE = "ep93xx"
diff --git a/packages/linux/fsg3-kernel_2.6.18.bb b/packages/linux/fsg3-kernel_2.6.18.bb
index 8740adb953..5c6688a0af 100644
--- a/packages/linux/fsg3-kernel_2.6.18.bb
+++ b/packages/linux/fsg3-kernel_2.6.18.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.18-fsg3"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-FILE_PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/gumstix-linux.inc b/packages/linux/gumstix-linux.inc
index b6f79ff355..50111cb545 100644
--- a/packages/linux/gumstix-linux.inc
+++ b/packages/linux/gumstix-linux.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux kernel for custom configurations"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
inherit kernel
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
index 628883d44e..3b1c1a073d 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
index b86781626f..adca8740de 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
DEFAULT_PREFERENCE = "-1"
KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
index b86781626f..adca8740de 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
DEFAULT_PREFERENCE = "-1"
KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index 335cf67f32..96fe2b2f64 100644
--- a/packages/linux/ixp4xx-kernel_2.6.18.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.18"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-FILE_PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index b711a68a6d..d83a0ed0d8 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.19"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-FILE_PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index ef793841c1..8e6f1b27df 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-FILE_PR = "r4.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r4.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
index f108a3b4c6..e943cb47be 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.21"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-FILE_PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.23.8.bb b/packages/linux/ixp4xx-kernel_2.6.23.8.bb
index bab68232d3..081195855d 100644
--- a/packages/linux/ixp4xx-kernel_2.6.23.8.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.23.8.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.23"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-FILE_PR = "r0.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r0.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/linux-bd-neon-2.6_2.6.22.bb b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
index 2304241c91..05ceb28ee5 100644
--- a/packages/linux/linux-bd-neon-2.6_2.6.22.bb
+++ b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "N/A"
LICENSE = "GPL"
DEPENDS += "u-boot-utils-native"
-FILE_PR = "r2"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1 \
diff --git a/packages/linux/linux-davinci_2.6.x+git-davinci.bb b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
index 56c57f13f7..6560fc9fbb 100644
--- a/packages/linux/linux-davinci_2.6.x+git-davinci.bb
+++ b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
@@ -8,7 +8,7 @@ SRCREV = "${DAVINCI_SRCREV}"
PV = "2.6.25"
#PV = "2.6.25+2.6.26-rc0+git${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)"
diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb
index 929ce5be89..61836ac204 100644
--- a/packages/linux/linux-dht-walnut_2.6.20.bb
+++ b/packages/linux/linux-dht-walnut_2.6.20.bb
@@ -4,7 +4,7 @@ require linux.inc
DESCRIPTION = "Linux kernel for DHT-Walnut (ppc) machine"
-FILE_PR = "r4"
+PR = "r4"
DEPENDS = "u-boot"
COMPATIBLE_MACHINE = "dht-walnut"
diff --git a/packages/linux/linux-dht-walnut_2.6.23.bb b/packages/linux/linux-dht-walnut_2.6.23.bb
index 29f3e78c49..181488190e 100644
--- a/packages/linux/linux-dht-walnut_2.6.23.bb
+++ b/packages/linux/linux-dht-walnut_2.6.23.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Linux kernel for DHT-Walnut (ppc) machine"
DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r0"
+PR = "r0"
DEPENDS = "u-boot"
COMPATIBLE_MACHINE = "dht-walnut"
diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index a22ab3352a..1907b09f75 100644
--- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
COMPATIBLE_MACHINE = "efika"
diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb
index 6f505725c3..2f707a17e3 100644
--- a/packages/linux/linux-efika_2.6.20.20.bb
+++ b/packages/linux/linux-efika_2.6.20.20.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_MACHINE = "efika"
diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb
index 803676fd6d..839d206cd1 100644
--- a/packages/linux/linux-efika_2.6.20.bb
+++ b/packages/linux/linux-efika_2.6.20.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_MACHINE = "efika"
diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb
index 6edc71406e..20b5bf86b6 100644
--- a/packages/linux/linux-efika_2.6.21+git.bb
+++ b/packages/linux/linux-efika_2.6.21+git.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
PV = "2.6.21+git${SRCDATE}"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-epia_2.6.11.bb b/packages/linux/linux-epia_2.6.11.bb
index 31546294db..04c47ca397 100644
--- a/packages/linux/linux-epia_2.6.11.bb
+++ b/packages/linux/linux-epia_2.6.11.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for VIA EPiA"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/linux-epia_2.6.12.bb b/packages/linux/linux-epia_2.6.12.bb
index 31546294db..04c47ca397 100644
--- a/packages/linux/linux-epia_2.6.12.bb
+++ b/packages/linux/linux-epia_2.6.12.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for VIA EPiA"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/linux-epia_2.6.19.2.bb b/packages/linux/linux-epia_2.6.19.2.bb
index a8e540c776..29f53a4dae 100644
--- a/packages/linux/linux-epia_2.6.19.2.bb
+++ b/packages/linux/linux-epia_2.6.19.2.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for VIA EPiA"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/linux-epia_2.6.8.1.bb b/packages/linux/linux-epia_2.6.8.1.bb
index 1bd2ea03da..315ff118e8 100644
--- a/packages/linux/linux-epia_2.6.8.1.bb
+++ b/packages/linux/linux-epia_2.6.8.1.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for VIA EPiA"
LICENSE = "GPL"
-FILE_PR = "r15"
+PR = "r15"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;patch=1 \
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index 4520833c45..150a4a153c 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-FILE_PR = "${EZX}-r24"
+PR = "${EZX}-r24"
require linux.inc
diff --git a/packages/linux/linux-ezx_2.6.23.bb b/packages/linux/linux-ezx_2.6.23.bb
index 36c3d4a80a..42624dd5a8 100644
--- a/packages/linux/linux-ezx_2.6.23.bb
+++ b/packages/linux/linux-ezx_2.6.23.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-FILE_PR = "${EZX}-r2"
+PR = "${EZX}-r2"
# unstable branch, use 2.6.21 if you want something working
DEFAULT_PREFERENCE = "-99"
diff --git a/packages/linux/linux-ezx_2.6.24.bb b/packages/linux/linux-ezx_2.6.24.bb
index 16e2c90dc3..093ee1e94a 100644
--- a/packages/linux/linux-ezx_2.6.24.bb
+++ b/packages/linux/linux-ezx_2.6.24.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-FILE_PR = "${EZX}-r0"
+PR = "${EZX}-r0"
# unstable branch, use 2.6.21 if you want something working
DEFAULT_PREFERENCE = "-99"
diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb
index 0712fc5a77..adfd7475bb 100644
--- a/packages/linux/linux-geodelx_2.6.11.bb
+++ b/packages/linux/linux-geodelx_2.6.11.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Linux kernel for the AMD Geode GX5535/LX5536"
HOMEPAGE = "http://www.amd.com/embedded"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
AMD_DRIVER_VERSION = "02.03.0100"
AMD_DRIVER_LABEL = "Patches_Linux2.6.11_Common_${AMD_DRIVER_VERSION}"
diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index c2423f5cf4..1812148f6e 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for the Gumstix"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
DEPENDS = "u-boot-utils-native"
diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb
index 3a08b66c31..f7ad0185f3 100644
--- a/packages/linux/linux-h1940_2.6.17-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.17-h1940.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for h1940 devices."
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = "h1940"
diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb
index 510c199ac9..387a1da89c 100644
--- a/packages/linux/linux-hackndev-2.6_git.bb
+++ b/packages/linux/linux-hackndev-2.6_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
HOMEPAGE = "http://www.hackndev.com/"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r14"
+PR = "r14"
COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb
index 4fc37555fd..8b1f153f11 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
# Override where to look for defconfigs and patches,
# we have per-kernel-release sets.
diff --git a/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb b/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb
index 5e9466a743..c19678efe2 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb b/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb
index 704de3059d..724971cacb 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
index ac8acadf26..77f55415ba 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
index f9f2afa801..8e760267f4 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
index 7fe7448418..a9dd604d8f 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
index 2baa457fd7..cb6e7efc13 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 645632f50d..3df1102761 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-FILE_PR = "r20"
+PR = "r20"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index bae606ac2a..89cb68548f 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-ixp4xx_2.6.18.bb b/packages/linux/linux-ixp4xx_2.6.18.bb
index 7b2a006ad4..1fb86f15eb 100644
--- a/packages/linux/linux-ixp4xx_2.6.18.bb
+++ b/packages/linux/linux-ixp4xx_2.6.18.bb
@@ -4,7 +4,7 @@ require linux-ixp4xx.inc
KERNEL_RELEASE = "2.6.18"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${KERNEL_RELEASE};proto=http \
diff --git a/packages/linux/linux-ixp4xx_2.6.19.bb b/packages/linux/linux-ixp4xx_2.6.19.bb
index 0ac9efb2d4..550313ca94 100644
--- a/packages/linux/linux-ixp4xx_2.6.19.bb
+++ b/packages/linux/linux-ixp4xx_2.6.19.bb
@@ -4,7 +4,7 @@ require linux-ixp4xx.inc
KERNEL_RELEASE = "2.6.19"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${KERNEL_RELEASE};proto=http \
diff --git a/packages/linux/linux-ixp4xx_2.6.20.bb b/packages/linux/linux-ixp4xx_2.6.20.bb
index f9751ca189..f70992ea86 100644
--- a/packages/linux/linux-ixp4xx_2.6.20.bb
+++ b/packages/linux/linux-ixp4xx_2.6.20.bb
@@ -4,7 +4,7 @@ require linux-ixp4xx.inc
KERNEL_RELEASE = "2.6.20"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${KERNEL_RELEASE};proto=http \
diff --git a/packages/linux/linux-ixp4xx_2.6.21.7.bb b/packages/linux/linux-ixp4xx_2.6.21.7.bb
index 00d798c554..4d26621241 100644
--- a/packages/linux/linux-ixp4xx_2.6.21.7.bb
+++ b/packages/linux/linux-ixp4xx_2.6.21.7.bb
@@ -5,7 +5,7 @@ VANILLA_VERSION = "2.6.21"
KERNEL_RELEASE = "2.6.21.7"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
diff --git a/packages/linux/linux-ixp4xx_2.6.23.14.bb b/packages/linux/linux-ixp4xx_2.6.23.14.bb
index 294c43896a..b7c7682370 100644
--- a/packages/linux/linux-ixp4xx_2.6.23.14.bb
+++ b/packages/linux/linux-ixp4xx_2.6.23.14.bb
@@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.23.14"
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
diff --git a/packages/linux/linux-jlime-current.bb b/packages/linux/linux-jlime-current.bb
index 2090c7de60..21cf1a224b 100644
--- a/packages/linux/linux-jlime-current.bb
+++ b/packages/linux/linux-jlime-current.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "fillmein"
inherit kernel
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "git://filip.eu.org/jlime-current.git;protocol=git \
git://filip.eu.org/jlime.git;protocol=git"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
index 661b0963bd..654b02788c 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
COMPATIBLE_HOST = "sh.*-linux"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
index dc4d38123f..86a5f6083f 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
COMPATIBLE_HOST = "sh.*-linux"
#COMPATIBLE_MACHINE = "jornada6xx"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
index 37725199cc..c7ebe829c4 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
COMPATIBLE_HOST = "sh.*-linux"
#COMPATIBLE_MACHINE = "jornada6xx"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.25.bb b/packages/linux/linux-jlime-jornada6xx_2.6.25.bb
index ae46863515..c55cf1578f 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.25.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.25.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
SRCREV = "${AUTOREV}"
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
index e675624fbc..0d95972010 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = "jornada7xx"
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
index 7c623574ad..789dddf9b8 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = "jornada7xx"
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
index d27fb77b02..f756d4f259 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = "jornada7xx"
diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb
index db7deef21e..73eb1e3b46 100644
--- a/packages/linux/linux-kaiser_2.6.24+git.bb
+++ b/packages/linux/linux-kaiser_2.6.24+git.bb
@@ -1,7 +1,7 @@
require linux.inc
PV = "2.6.24+git${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
COMPATIBLE_MACHINE = "htckaiser|htcpolaris"
diff --git a/packages/linux/linux-ks8695_2.6.16.bb b/packages/linux/linux-ks8695_2.6.16.bb
index 712d83ee4d..a357443fdb 100644
--- a/packages/linux/linux-ks8695_2.6.16.bb
+++ b/packages/linux/linux-ks8695_2.6.16.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux kernel for Micrel KS8695(P) based devices"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://ks8695-headers-r0.patch;patch=1 \
diff --git a/packages/linux/linux-linkstationarm_2.6.12.bb b/packages/linux/linux-linkstationarm_2.6.12.bb
index 36d9a608fb..df984a02c3 100644
--- a/packages/linux/linux-linkstationarm_2.6.12.bb
+++ b/packages/linux/linux-linkstationarm_2.6.12.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations"
SECTION = "kernel"
LICENSE = "GPL"
DEPENDS += "u-boot-utils-native"
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_MACHINE = "lsarm"
diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
index dcb94f799b..f04e1f591c 100644
--- a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
+++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc5"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
DEPENDS = "dtc-native u-boot-utils-native"
COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb
index 757b6324dc..bd9a1c4060 100644
--- a/packages/linux/linux-magicbox_2.6.18.6.bb
+++ b/packages/linux/linux-magicbox_2.6.18.6.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
DEPENDS = "u-boot"
COMPATIBLE_MACHINE = "magicbox"
diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb
index 8ab96c1c14..2c79a94e10 100644
--- a/packages/linux/linux-magicbox_2.6.19.2.bb
+++ b/packages/linux/linux-magicbox_2.6.19.2.bb
@@ -3,7 +3,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards"
LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
DEPENDS = "u-boot"
COMPATIBLE_MACHINE = "magicbox"
diff --git a/packages/linux/linux-mainstone_2.6.25.bb b/packages/linux/linux-mainstone_2.6.25.bb
index 6abfbe1e2c..d9599ef76c 100644
--- a/packages/linux/linux-mainstone_2.6.25.bb
+++ b/packages/linux/linux-mainstone_2.6.25.bb
@@ -3,7 +3,7 @@ require linux.inc
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2;patch=1 \
diff --git a/packages/linux/linux-ml403-mvista-2.6.x_git.bb b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
index cf5cef8ae8..59bcff431e 100644
--- a/packages/linux/linux-ml403-mvista-2.6.x_git.bb
+++ b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
@@ -4,7 +4,7 @@ SECTION = "kernel"
DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
LICENSE = "GPL"
DEPENDS = "git-native"
-FILE_PR = "r1"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
COMPATIBLE_MACHINE = "xilinx-ml403"
SRC_URI = "git://source.mvista.com/git/linux-xilinx-26;protocol=git \
diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb
index fa063fa936..5815a570ee 100644
--- a/packages/linux/linux-mtx-1_2.4.27.bb
+++ b/packages/linux/linux-mtx-1_2.4.27.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
HOMEPAGE = "http://meshcube.org/meshwiki/"
LICENSE = "GPL"
KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
inherit module-base kernel
PROVIDES = "virtual/kernel"
diff --git a/packages/linux/linux-mtx-1u_2.4.27.bb b/packages/linux/linux-mtx-1u_2.4.27.bb
index 05c6f3b9bc..00132f54cd 100644
--- a/packages/linux/linux-mtx-1u_2.4.27.bb
+++ b/packages/linux/linux-mtx-1u_2.4.27.bb
@@ -2,7 +2,7 @@ include linux-mtx-1_2.4.27.bb
COMPATIBLE_MACHINE = "mtx-1u"
-FILE_PR = "r11"
+PR = "r11"
SRC_URI += "\
file://22-umts.diff;patch=1 \
diff --git a/packages/linux/linux-mtx-2_2.4.27.bb b/packages/linux/linux-mtx-2_2.4.27.bb
index 91ab09f923..66ce06c6ca 100644
--- a/packages/linux/linux-mtx-2_2.4.27.bb
+++ b/packages/linux/linux-mtx-2_2.4.27.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-2 (Surfbox2)"
HOMEPAGE = "http://meshcube.org/meshwiki/"
LICENSE = "GPL"
KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
inherit module-base kernel
PROVIDES = "virtual/kernel"
diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb
index a6274f6561..e3b23b1968 100644
--- a/packages/linux/linux-mtx-3_2.6.15.4.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)"
HOMEPAGE = "http://meshcube.org/meshwiki/"
LICENSE = "GPL"
KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
inherit kernel
# therefore
diff --git a/packages/linux/linux-mtx-3_2.6.15.bb b/packages/linux/linux-mtx-3_2.6.15.bb
index 49cb4403d0..e1613d6f60 100644
--- a/packages/linux/linux-mtx-3_2.6.15.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)"
HOMEPAGE = "http://meshcube.org/meshwiki/"
LICENSE = "GPL"
KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
inherit module-base kernel
PROVIDES = "virtual/kernel"
diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb
index 41e0e0c564..b37b68e8c9 100644
--- a/packages/linux/linux-navman_2.6.18.bb
+++ b/packages/linux/linux-navman_2.6.18.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
#DEPENDS = "u-boot"
-FILE_PR = "r0"
+PR = "r0"
COMPATIBLE_MACHINE = "navman-icn330"
diff --git a/packages/linux/linux-neuros_2.6.15.bb b/packages/linux/linux-neuros_2.6.15.bb
index c419a424ed..f103d2c35f 100644
--- a/packages/linux/linux-neuros_2.6.15.bb
+++ b/packages/linux/linux-neuros_2.6.15.bb
@@ -1,7 +1,7 @@
#require linux-omap.inc
PV = "2.6.15-torfu"
-FILE_PR = "r5"
+PR = "r5"
COMPATIBLE_MACHINE = "(neuros-osd)"
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 19967fbce6..883bb69a2a 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Linux kernel for Neuros OSD devices"
SRCREV = "2eaa4a30d599203ceed1b5a42d713b29151a39eb"
PV = "2.6.23-${PR}+git${SRCREV}"
-FILE_PR = "r13"
+PR = "r13"
COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
diff --git a/packages/linux/linux-nokia800_2.6.18-osso40.bb b/packages/linux/linux-nokia800_2.6.18-osso40.bb
index b57e28af6d..3ffa1d838a 100644
--- a/packages/linux/linux-nokia800_2.6.18-osso40.bb
+++ b/packages/linux/linux-nokia800_2.6.18-osso40.bb
@@ -1,6 +1,6 @@
require linux-nokia800.inc
-FILE_PR = "r4"
+PR = "r4"
SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \
http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \
diff --git a/packages/linux/linux-nokia800_2.6.21-osso71.bb b/packages/linux/linux-nokia800_2.6.21-osso71.bb
index 108019764e..904d2021c1 100644
--- a/packages/linux/linux-nokia800_2.6.21-osso71.bb
+++ b/packages/linux/linux-nokia800_2.6.21-osso71.bb
@@ -1,5 +1,5 @@
require linux-nokia800.inc
-FILE_PR = "r4"
+PR = "r4"
DEFAULT_PREFERENCE_nokia770 = "-1"
diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 0be1bb8c94..91f82575ce 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -1,6 +1,6 @@
require linux-omap.inc
-FILE_PR = "r4"
+PR = "r4"
COMPATIBLE_MACHINE = "omap5912osk"
diff --git a/packages/linux/linux-omap1_2.6.18+git.bb b/packages/linux/linux-omap1_2.6.18+git.bb
index d317c83d74..7fac38a77b 100644
--- a/packages/linux/linux-omap1_2.6.18+git.bb
+++ b/packages/linux/linux-omap1_2.6.18+git.bb
@@ -1,6 +1,6 @@
require linux-omap.inc
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_MACHINE = "omap5912osk"
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index e40a9c9fc6..dcb8139486 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848"
PV = "2.6.26"
#PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
-FILE_PR = "r64"
+PR = "r64"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 7c54292c17..14de954e7c 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}"
-FILE_PR = "r14"
+PR = "r14"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
diff --git a/packages/linux/linux-openezx-devel_svn.bb b/packages/linux/linux-openezx-devel_svn.bb
index 2e95555c11..17156535ea 100644
--- a/packages/linux/linux-openezx-devel_svn.bb
+++ b/packages/linux/linux-openezx-devel_svn.bb
@@ -11,7 +11,7 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
KERNEL_RELEASE = "2.6.25"
KERNEL_PATCHES = "kernel-${KERNEL_RELEASE}.x-patches"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "\
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 8df15bb5b8..dac670abf9 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.26"
KERNEL_VERSION = "${KERNEL_RELEASE}"
PV = "${KERNEL_RELEASE}+${PR}-gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable-tracking \
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 524b22a311..9133688bf8 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.24"
KERNEL_VERSION = "${KERNEL_RELEASE}"
PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}"
-FILE_PR = "r10"
+PR = "r10"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
diff --git a/packages/linux/linux-palm-omap1_2.6.22-omap1.bb b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
index ac02cbf322..786e4901c3 100644
--- a/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
+++ b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
@@ -14,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
S = "${WORKDIR}/linux-2.6.22"
-FILE_PR = "r2"
+PR = "r2"
do_configure() {
diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb
index 8cf6c15a24..ebc969f1bf 100644
--- a/packages/linux/linux-rp_2.6.23.bb
+++ b/packages/linux/linux-rp_2.6.23.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-FILE_PR = "r34"
+PR = "r34"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index 1ef479678f..b19111ebcb 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-FILE_PR = "r15"
+PR = "r15"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
diff --git a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
index 22e4909fb0..3f9eac86a5 100644
--- a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
+++ b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-FILE_PR = "r5"
+PR = "r5"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "1"
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index 47932fdf0d..dd126285ea 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-FILE_PR = "r5"
+PR = "r5"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb
index fb1f4d2038..eefe72f1e5 100644
--- a/packages/linux/linux-rt_2.6.24.bb
+++ b/packages/linux/linux-rt_2.6.24.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
-FILE_PR = "r6"
+PR = "r6"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
diff --git a/packages/linux/linux-rt_2.6.25.bb b/packages/linux/linux-rt_2.6.25.bb
index 9848a8859d..998fc13685 100644
--- a/packages/linux/linux-rt_2.6.25.bb
+++ b/packages/linux/linux-rt_2.6.25.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
DEFAULT_PREFERENCE_efika = "1"
-FILE_PR = "r4"
+PR = "r4"
#KERNEL_IMAGETYPE_efika = "Image"
diff --git a/packages/linux/linux-sequoia_2.6.21.bb b/packages/linux/linux-sequoia_2.6.21.bb
index 5a02aed052..006fd3a51d 100644
--- a/packages/linux/linux-sequoia_2.6.21.bb
+++ b/packages/linux/linux-sequoia_2.6.21.bb
@@ -3,7 +3,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for AMCC's Sequoia dev board"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
#DEPENDS = "u-boot"
COMPATIBLE_MACHINE = "sequoia"
diff --git a/packages/linux/linux-smdk2440_2.6.20+git.bb b/packages/linux/linux-smdk2440_2.6.20+git.bb
index 6c7c26e6c8..b86d970e50 100644
--- a/packages/linux/linux-smdk2440_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2440_2.6.20+git.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for smdk2440 compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
GGSRC = "http://www.xora.org.uk/oe/patches/"
diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb
index e14cc23f90..034137e89c 100644
--- a/packages/linux/linux-smdk2443_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2443_2.6.20+git.bb
@@ -3,7 +3,7 @@ SECTION = "kernel"
LICENSE = "GPL"
DEPENDS += "u-boot-mkimage-openmoko-native"
-FILE_PR = "r1"
+PR = "r1"
GGSRC = "http://www.xora.org.uk/oe/patches/"
diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb
index 1da4ea5fe1..b0e8c4d61c 100644
--- a/packages/linux/linux-storcenter_2.6.12.6.bb
+++ b/packages/linux/linux-storcenter_2.6.12.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the Iomega storcenter platform"
SECTION = "kernel"
LICENSE = "GPL"
DEPENDS = "uboot-utils"
-FILE_PR = "r0"
+PR = "r0"
# notes on iom def kernel:
#
diff --git a/packages/linux/linux-storcenter_2.6.15.7.bb b/packages/linux/linux-storcenter_2.6.15.7.bb
index 4acfa836ea..74dfd8fb3a 100644
--- a/packages/linux/linux-storcenter_2.6.15.7.bb
+++ b/packages/linux/linux-storcenter_2.6.15.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the Iomega storcenter platform"
SECTION = "kernel"
LICENSE = "GPL"
DEPENDS = "u-boot-utils-native"
-FILE_PR = "r1"
+PR = "r1"
COMPATIBLE_MACHINE = "storcenter"
diff --git a/packages/linux/linux-sun4cdm_2.4.26.bb b/packages/linux/linux-sun4cdm_2.4.26.bb
index ee5daef12c..52b3ecb26c 100644
--- a/packages/linux/linux-sun4cdm_2.4.26.bb
+++ b/packages/linux/linux-sun4cdm_2.4.26.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for sparc32/sun4c"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
DEPENDS += "elftoaout-native"
KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/linux-sun4cdm_2.6.8.1.bb b/packages/linux/linux-sun4cdm_2.6.8.1.bb
index f810497336..40583903d8 100644
--- a/packages/linux/linux-sun4cdm_2.6.8.1.bb
+++ b/packages/linux/linux-sun4cdm_2.6.8.1.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for sparc32/sun4c"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://sun4c_defconfig"
diff --git a/packages/linux/linux-titan-sh4_2.6.21.bb b/packages/linux/linux-titan-sh4_2.6.21.bb
index afee97160f..c760669bde 100644
--- a/packages/linux/linux-titan-sh4_2.6.21.bb
+++ b/packages/linux/linux-titan-sh4_2.6.21.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for SH4 based TITAN (NP51R/LinkGear Series 100) router appliance"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://titan-flash.patch;patch=1 \
diff --git a/packages/linux/linux-tornado-omap2_2.6.16.16.bb b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
index 7146656a3c..a9ebee14cd 100644
--- a/packages/linux/linux-tornado-omap2_2.6.16.16.bb
+++ b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones."
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;patch=1 \
diff --git a/packages/linux/linux-turbostation_2.6.20.2.bb b/packages/linux/linux-turbostation_2.6.20.2.bb
index e7f2229117..308c5e7a46 100644
--- a/packages/linux/linux-turbostation_2.6.20.2.bb
+++ b/packages/linux/linux-turbostation_2.6.20.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
SECTION = "kernel"
LICENSE = "GPL"
DEPENDS = "u-boot-utils-native"
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_MACHINE = "turbostation"
diff --git a/packages/linux/linux-wrap-geode_2.6.17.bb b/packages/linux/linux-wrap-geode_2.6.17.bb
index 4b5a53f9d5..3d9b81a936 100644
--- a/packages/linux/linux-wrap-geode_2.6.17.bb
+++ b/packages/linux/linux-wrap-geode_2.6.17.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "Linux kernel for PC-Engines WRAP which are \
Geode SC1100 (i486) based wirless router appliance boards"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://defconfig"
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index f43496c334..23a5d4f203 100644
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Linksys WRT54 devices"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \
file://linux-2.4.20-mipscvs.patch;patch=1 \
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index 20466f73c6..db285710b2 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Linksys WRT54 devices"
HOMEPAGE = "http://openwrt.org"
DEPENDS = "lzma-native"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \
cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \
diff --git a/packages/linux/linux-x86_2.6.17.9.bb b/packages/linux/linux-x86_2.6.17.9.bb
index b609e38b11..829c884560 100644
--- a/packages/linux/linux-x86_2.6.17.9.bb
+++ b/packages/linux/linux-x86_2.6.17.9.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for x86 compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://defconfig"
diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index 161929ceb9..3872c50cba 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for x86 compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 "
diff --git a/packages/linux/linux-xilinx-slab_git.bb b/packages/linux/linux-xilinx-slab_git.bb
index c7e531d040..df71fee865 100644
--- a/packages/linux/linux-xilinx-slab_git.bb
+++ b/packages/linux/linux-xilinx-slab_git.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
-FILE_PR = "r3"
+PR = "r3"
PV = "2.6.25+2.6.26+${PR}+git${SRCREV}"
COMPATIBLE_MACHINE = "xilinx-ml403"
diff --git a/packages/linux/linux_2.6.18.bb b/packages/linux/linux_2.6.18.bb
index 9588fde11d..91a89c31f1 100644
--- a/packages/linux/linux_2.6.18.bb
+++ b/packages/linux/linux_2.6.18.bb
@@ -5,7 +5,7 @@ require linux.inc
DEFAULT_PREFERENCE_avr32 = "1"
-FILE_PR = "r0"
+PR = "r0"
PARALLEL_MAKE=""
diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb
index 7efcaca203..81033e09ee 100644
--- a/packages/linux/linux_2.6.20.bb
+++ b/packages/linux/linux_2.6.20.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "20"
DEFAULT_PREFERENCE_at91sam9261ek = "20"
DEFAULT_PREFERENCE_at91sam9260ek = "20"
-FILE_PR = "r8"
+PR = "r8"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://defconfig"
diff --git a/packages/linux/linux_2.6.21+2.6.22-rc1.bb b/packages/linux/linux_2.6.21+2.6.22-rc1.bb
index 3ea4fb008c..35b2efe74a 100644
--- a/packages/linux/linux_2.6.21+2.6.22-rc1.bb
+++ b/packages/linux/linux_2.6.21+2.6.22-rc1.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
KERNEL_VERSION = "2.6.22-rc1"
KERNEL_RELEASE = "2.6.22-rc1"
-FILE_PR = "r2"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc1.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb
index 177b7e19c9..265a35a4b3 100644
--- a/packages/linux/linux_2.6.21.bb
+++ b/packages/linux/linux_2.6.21.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
DEFAULT_PREFERENCE_gumstix-connex = "1"
DEFAULT_PREFERENCE_gumstix-verdex = "1"
-FILE_PR = "r12"
+PR = "r12"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://tsc2003.c \
diff --git a/packages/linux/linux_2.6.22+2.6.23-rc3.bb b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
index 54e5a82328..47c3564087 100644
--- a/packages/linux/linux_2.6.22+2.6.23-rc3.bb
+++ b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
@@ -7,7 +7,7 @@ BASE_KERNEL_VERSION = "2.6.22"
KERNEL_VERSION = "2.6.23-rc3"
KERNEL_RELEASE = "2.6.23-rc3"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.22+2.6.23-rc5.bb b/packages/linux/linux_2.6.22+2.6.23-rc5.bb
index 2b94f8f1ab..3165c39a11 100644
--- a/packages/linux/linux_2.6.22+2.6.23-rc5.bb
+++ b/packages/linux/linux_2.6.22+2.6.23-rc5.bb
@@ -3,7 +3,7 @@ require linux.inc
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_ts72xx = "-1"
-FILE_PR = "r1"
+PR = "r1"
BASE_KERNEL_VERSION = "2.6.22"
KERNEL_VERSION = "2.6.23-rc5"
diff --git a/packages/linux/linux_2.6.22.6.bb b/packages/linux/linux_2.6.22.6.bb
index 496f178c89..69b988e332 100644
--- a/packages/linux/linux_2.6.22.6.bb
+++ b/packages/linux/linux_2.6.22.6.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_ts72xx = "1"
DEFAULT_PREFERENCE_mx31moboard = "1"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb
index b7b584b21e..bb8749f0d6 100644
--- a/packages/linux/linux_2.6.22.bb
+++ b/packages/linux/linux_2.6.22.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_cm-x270 = "-1"
DEFAULT_PREFERENCE_bd-neon = "0"
-FILE_PR = "r5"
+PR = "r5"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
file://defconfig \
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 1f485a0117..d22d5e8f27 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -3,7 +3,7 @@ require linux.inc
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r3"
+PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc6.bb b/packages/linux/linux_2.6.23+2.6.24-rc6.bb
index f35899045f..73100b62c3 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc6.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc6.bb
@@ -3,7 +3,7 @@ require linux.inc
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc6.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index ff3dc83569..76ebbbe917 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
DEFAULT_PREFERENCE_avr32 = "1"
-FILE_PR = "r12"
+PR = "r12"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
file://binutils-buildid-arm.patch;patch=1 \
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index 0870561414..e787663bc7 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -10,7 +10,7 @@ DEFAULT_PREFERENCE_at32stk1000 = "1"
DEFAULT_PREFERENCE_ts72xx = "1"
DEFAULT_PREFERENCE_cs-e9302 = "1"
-FILE_PR = "r17"
+PR = "r17"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb
index c9db598b81..c095e5c3a2 100644
--- a/packages/linux/linux_2.6.25.bb
+++ b/packages/linux/linux_2.6.25.bb
@@ -1,6 +1,6 @@
require linux.inc
-FILE_PR = "r6"
+PR = "r6"
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux_2.6.26.bb b/packages/linux/linux_2.6.26.bb
index e87cb9df73..5b6cd14fba 100644
--- a/packages/linux/linux_2.6.26.bb
+++ b/packages/linux/linux_2.6.26.bb
@@ -1,6 +1,6 @@
require linux.inc
-FILE_PR = "r1"
+PR = "r1"
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
index ee6bb06c8a..e7ab462c0b 100644
--- a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
+++ b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)"
LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \
file://linux-2.6.17-rc5.patch;pnum=0;patch=1 \
diff --git a/packages/linux/logicpd-pxa270_2.6.19.2.bb b/packages/linux/logicpd-pxa270_2.6.19.2.bb
index d042c8d98c..7a4eaae99b 100644
--- a/packages/linux/logicpd-pxa270_2.6.19.2.bb
+++ b/packages/linux/logicpd-pxa270_2.6.19.2.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \
file://asoc-v0.12.4.patch;patch=1 \
diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
index f960771919..cae3bf799c 100644
--- a/packages/linux/mainstone-kernel_2.6.11.bb
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
file://mainstone_defconfig"
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
index 09257e57ef..290bb5911d 100644
--- a/packages/linux/mainstone-kernel_2.6.18.bb
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -3,7 +3,7 @@ require linux.inc
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
file://flash-unlock.patch;patch=1;pnum=0 \
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index ee40cd688e..b001763710 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "mnci"
KV = "2.4.21"
RMKV = "2"
PXAV = "1"
-FILE_PR = "r5"
+PR = "r5"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \
diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
index 7a218f3d75..47f363d7df 100644
--- a/packages/linux/mx21ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the MX21ADS"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
PV = "2.6.18+2.6.19-rc6"
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
index 33bbd07d03..90463936d8 100644
--- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the MX31ADS"
LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
PV = "2.6.18+2.6.19-rc6"
diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb
index 74f3de2d8b..1d24646b3b 100644
--- a/packages/linux/netbook-pro-kernel_2.6.17.bb
+++ b/packages/linux/netbook-pro-kernel_2.6.17.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
COMPATIBLE_MACHINE = "netbook-pro"
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index 04d275cc19..547010996d 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -5,7 +5,7 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
-FILE_PR = "r22"
+PR = "r22"
COMPATIBLE_MACHINE = 'simpad'
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 08b11bdef9..d9324e9883 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -6,7 +6,7 @@ VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
USBV= "usb20040610"
-FILE_PR = "r4"
+PR = "r4"
COMPATIBLE_MACHINE = 'simpad'
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index babeff3503..5a90d415fb 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -4,7 +4,7 @@ SECTION = "kernel"
PV = "2.4.20-rmk2-embedix"
LICENSE = "GPL"
KV = "2.4.20"
-FILE_PR = "r18"
+PR = "r18"
COMPATIBLE_MACHINE = "(akita|spitz)"
SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3100/20050602/linux-c3100-20050602-rom1_01.tar.bz2 \
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 32346ff16d..7e7548491f 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
SECTION = "kernel"
LICENSE = "GPL"
PV = "2.4.18-rmk7-pxa3-embedix"
-FILE_PR = "r46"
+PR = "r46"
KV = "2.4.18"
RMKV = "7"
PXAV = "3"
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index fa32c07ddf..b21a0c9328 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -6,7 +6,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20030509"
-FILE_PR = "r23"
+PR = "r23"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
COMPATIBLE_MACHINE = "collie"
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index b2e438a29e..c580706b25 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the KARO TRITON XScale Board"
LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 1915d278a2..cf9ef31c95 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
LICENSE = "GPL"
-FILE_PR = "r22"
+PR = "r22"
COMPATIBLE_HOST = 'arm.*-linux'
COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/linux/xanadux-ba-2.6_2.6.12.bb b/packages/linux/xanadux-ba-2.6_2.6.12.bb
index 10e09b1401..1e8274fa11 100644
--- a/packages/linux/xanadux-ba-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-ba-2.6_2.6.12.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Xanadux Blueangel kernel based on the hh 2.6.12"
LICENSE = "GPL"
-FILE_PR ="r0"
+PR ="r0"
SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-ba0"
S = "${WORKDIR}/linux-2.6-xda"
diff --git a/packages/linux/xanadux-un-2.6_2.6.12.bb b/packages/linux/xanadux-un-2.6_2.6.12.bb
index 699be7a830..1cc983aa77 100644
--- a/packages/linux/xanadux-un-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-un-2.6_2.6.12.bb
@@ -2,7 +2,7 @@
DESCRIPTION = "Xanadux HTC-Universal kernel based on the hh 2.6.12"
LICENSE = "GPL"
-FILE_PR ="r2"
+PR ="r2"
SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-un0"
S = "${WORKDIR}/linux-2.6-xda"