Merge branch 'shared/file-pr-revert' into org.openembedded.dev

Conflicts:

	packages/busybox/busybox_1.11.3.bb
	packages/dsplink/codec-engine_2.10.bb
	packages/gdb/gdb_6.3.bb
	packages/gdb/gdb_6.4.bb
	packages/gdb/gdb_6.6.bb
	packages/gdb/gdb_6.8.bb
	packages/glibc/glibc_2.2.5.bb
	packages/glibc/glibc_2.3.2+cvs20040726.bb
	packages/glibc/glibc_2.3.2.bb
	packages/glibc/glibc_2.3.3+cvs20041128.bb
	packages/glibc/glibc_2.3.3+cvs20050221.bb
	packages/glibc/glibc_2.3.3+cvs20050420.bb
	packages/glibc/glibc_2.3.3.bb
	packages/glibc/glibc_2.3.5+cvs20050627.bb
	packages/glibc/glibc_2.3.6.bb
	packages/glibc/glibc_2.4.bb
	packages/glibc/glibc_2.5.bb
	packages/glibc/glibc_2.6.1.bb
	packages/glibc/glibc_2.7.bb
	packages/kexecboot/linux-kexecboot_2.6.26.bb
	packages/libsdl/libsdl-x11_1.2.11.bb
	packages/linux/linux-rp_2.6.26.bb
	packages/mozilla/fennec_hg.bb
	packages/python/python_2.5.2.bb
	packages/tasks/task-xfce-base.bb
	packages/xorg-driver/xf86-video-omapfb_git.bb
	packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb

54 files changed, 54 insertions, 54 deletions

diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index c755bc0206..e8051dde22 100644
--- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 require gcc-cross-initial_csl-arm-2005q3.bb
 require gcc-cross-kernel.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
 
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 796ea7efaf..02d860b1f7 100644
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index d51f9fc7b6..c76b5b3c07 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 9895ba58f8..b00c86617d 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index 97ca15c06c..ee769e034e 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 2a3eff93b5..6b6097fb00 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 96401593c7..c632169f23 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index bbb7227a31..ee4ce855af 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.3.bb b/packages/gcc/gcc-cross-sdk_4.2.3.bb
index 9361acae3f..8057608e0d 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.4.bb b/packages/gcc/gcc-cross-sdk_4.2.4.bb
index 2d36cb3dc1..482e9a63f6 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb
index 7d0fe973e4..93a33894ab 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r11"
+PR = "r11"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.2.bb b/packages/gcc/gcc-cross-sdk_4.3.2.bb
index 1763852293..7e3a459ea8 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
index 2d5f40c68e..fc5c2e5deb 100644
--- a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index d8396c24b6..38488642fd 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 3de4e41583..1f5e5f7876 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,4 +1,4 @@
-FILE_PR ="r8"
+PR ="r8"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 64cb8d0e4c..271509b32e 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r16"
+PR = "r16"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 4a71ef2985..515b41628c 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r11"
+PR = "r11"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 6627c66169..dd3fbbc000 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r7"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 0278217299..bb4c6f0366 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r13"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 7284d1a729..33042da5a2 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r7"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 02b545c45c..da797597d7 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r22"
+PR = "r22"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index e52614051d..b3c6437467 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r18"
+PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 29e32784d6..5986fad253 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r18"
+PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 00a46404f6..fe25ae2857 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r12"
+PR = "r12"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.3.bb b/packages/gcc/gcc-cross_4.2.3.bb
index c6c2a8e1dd..4149179d8e 100644
--- a/packages/gcc/gcc-cross_4.2.3.bb
+++ b/packages/gcc/gcc-cross_4.2.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.4.bb b/packages/gcc/gcc-cross_4.2.4.bb
index 06c50be78d..cac2550f0e 100644
--- a/packages/gcc/gcc-cross_4.2.4.bb
+++ b/packages/gcc/gcc-cross_4.2.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb
index 96857dc745..bfc8561a4c 100644
--- a/packages/gcc/gcc-cross_4.3.1.bb
+++ b/packages/gcc/gcc-cross_4.3.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r15"
+PR = "r15"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb
index 301bee33d0..18d5abd32e 100644
--- a/packages/gcc/gcc-cross_4.3.2.bb
+++ b/packages/gcc/gcc-cross_4.3.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 require gcc-configure-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index f946396826..858459c026 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-csl-arm-2005q3.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2006q1.bb b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
index 70f0d5e822..a8c662e462 100644
--- a/packages/gcc/gcc-cross_csl-arm-2006q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-csl-arm-2006q1.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
index 047b42e2cd..6ae42784cb 100644
--- a/packages/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-csl-arm-2007q3.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index 9f966b0ef5..69127daea6 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q3.bb b/packages/gcc/gcc-cross_csl-arm-2008q3.bb
index d2fc9b43d5..d2a1102776 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 require gcc-csl-arm-2008q3.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-native_3.4.4.bb b/packages/gcc/gcc-native_3.4.4.bb
index e1087fa081..5f39f1bbb3 100644
--- a/packages/gcc/gcc-native_3.4.4.bb
+++ b/packages/gcc/gcc-native_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc-native_3.4.6.bb b/packages/gcc/gcc-native_3.4.6.bb
index 0e144774af..c3f8106d3a 100644
--- a/packages/gcc/gcc-native_3.4.6.bb
+++ b/packages/gcc/gcc-native_3.4.6.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r9"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index edadd2c7fe..9fd2b0acc3 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index edadd2c7fe..9fd2b0acc3 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index 4f3737b0c0..10d868893b 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r16"
+PR = "r16"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 4267e680e0..5bc3761068 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 9906f98782..1bbab50930 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 4267e680e0..5bc3761068 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 9906f98782..1bbab50930 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 84dfa34f51..6ba5972fc1 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r22"
+PR = "r22"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 5566d8a739..dd88ccdc27 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r14"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index 8c088863cf..a8c8b71648 100644
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r13"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index 59357731f7..582fff49ac 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.3.bb b/packages/gcc/gcc_4.2.3.bb
index f9ceb3ccb7..a2ae0c0e92 100644
--- a/packages/gcc/gcc_4.2.3.bb
+++ b/packages/gcc/gcc_4.2.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.4.bb b/packages/gcc/gcc_4.2.4.bb
index d491c952d6..033f33f8d3 100644
--- a/packages/gcc/gcc_4.2.4.bb
+++ b/packages/gcc/gcc_4.2.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.3.1.bb b/packages/gcc/gcc_4.3.1.bb
index eddbbf18f1..4634820ff2 100644
--- a/packages/gcc/gcc_4.3.1.bb
+++ b/packages/gcc/gcc_4.3.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.3.2.bb b/packages/gcc/gcc_4.3.2.bb
index ea5336f690..e2c6e48a85 100644
--- a/packages/gcc/gcc_4.3.2.bb
+++ b/packages/gcc/gcc_4.3.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 9906f98782..1bbab50930 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2006q1.bb b/packages/gcc/gcc_csl-arm-2006q1.bb
index fc9c15a039..2df12ef9ef 100644
--- a/packages/gcc/gcc_csl-arm-2006q1.bb
+++ b/packages/gcc/gcc_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2007q3.bb b/packages/gcc/gcc_csl-arm-2007q3.bb
index b4f2a95dba..cc7540af15 100644
--- a/packages/gcc/gcc_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2008q1.bb b/packages/gcc/gcc_csl-arm-2008q1.bb
index 3dc4b8ff55..4999c6a53e 100644
--- a/packages/gcc/gcc_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc