bb files: Revert the introduction of FILE_PR

    This is a partial revert of aa03004ace2fabb135a6208ef8c2d2b312aa7b0b. The
    approach that was taken leads to disagreement and the change was pushed
    too early. DISTRO_PR is going to say and will be used inside the package
    creation. There will be more disucssion on the list about where to continue
    from here.

26 files changed, 26 insertions, 26 deletions

diff --git a/packages/meta/cross-linkage_1.0.bb b/packages/meta/cross-linkage_1.0.bb
index bfb7aa9ee8..9be09aa6f8 100644
--- a/packages/meta/cross-linkage_1.0.bb
+++ b/packages/meta/cross-linkage_1.0.bb
@@ -4,7 +4,7 @@ PACKAGES = ""
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = ""
 
diff --git a/packages/meta/distro-feed-configs.bb b/packages/meta/distro-feed-configs.bb
index eaa422dcff..5884f85c21 100644
--- a/packages/meta/distro-feed-configs.bb
+++ b/packages/meta/distro-feed-configs.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
-FILE_PR = "r0"
+PR = "r0"
 
 DISTRO_FEED_PREFIX ?= "remote"
 DISTRO_FEED_URI ?= "http://my-distribution.example/remote-feed/"
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
index 6e3050598f..e1dae5a2fe 100644
--- a/packages/meta/external-toolchain.bb
+++ b/packages/meta/external-toolchain.bb
@@ -16,7 +16,7 @@ PROVIDES = "\
 
 RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libgcc libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit sdk
 
diff --git a/packages/meta/foonas-packages.bb b/packages/meta/foonas-packages.bb
index 5bbf10ca43..2bd8437f13 100644
--- a/packages/meta/foonas-packages.bb
+++ b/packages/meta/foonas-packages.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Packages that are compatible with FooNAS"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 CONFLICTS = "db3"
 PROVIDES += "${FOONAS_IMAGENAME}-packages"
 
diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb
index 33d3dd8cd3..cdc76402e1 100644
--- a/packages/meta/meta-e-x11-core.bb
+++ b/packages/meta/meta-e-x11-core.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 SECTION = "x11/base"
 ALLOW_EMPTY = "1"
-FILE_PR = "r1"
+PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 180385366e..1182b0cf42 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 SECTION = "x11/base"
 ALLOW_EMPTY = "1"
-FILE_PR = "r1"
+PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 91af42be9c..24be1295e4 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
 LICENSE = "MIT"
-FILE_PR ="r3"
+PR ="r3"
 
 RDEPENDS = "\
     task-gpe-apps \
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index c1e1fe3dd3..15e9fd1911 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 LICENSE = "MIT"
-FILE_PR = "r43"
+PR = "r43"
 
 RDEPENDS = "\
     task-gpe-base \
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 9926b71d57..72216a6304 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for maemo environment"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 
 RDEPENDS = "\
     maemo-task-base \
diff --git a/packages/meta/meta-mamona-light.bb b/packages/meta/meta-mamona-light.bb
index f04a118390..562ba5b639 100644
--- a/packages/meta/meta-mamona-light.bb
+++ b/packages/meta/meta-mamona-light.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta package for Mamona"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit meta
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/meta-mamona.bb b/packages/meta/meta-mamona.bb
index b750f508d7..e4fb4bdfb7 100644
--- a/packages/meta/meta-mamona.bb
+++ b/packages/meta/meta-mamona.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta package for Mamona"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit meta
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/meta-nas-server.bb b/packages/meta/meta-nas-server.bb
index 83ed4f0ee8..3deb44c2bd 100644
--- a/packages/meta/meta-nas-server.bb
+++ b/packages/meta/meta-nas-server.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for a network attached storage server"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 
 RDEPENDS = "\
 	task-nas-server-everything \
diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
index e40f038d84..ccdbbe973d 100644
--- a/packages/meta/meta-opie-all.bb
+++ b/packages/meta/meta-opie-all.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for QPE stuff"
 SECTION = "opie/base"
 LICENSE = "MIT"
-FILE_PR = "r3"
+PR = "r3"
 
 RDEPENDS = " \
     task-qpe-applets \
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 7f499a3a9c..6a9c35c5e3 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for Opie"
 SECTION = "opie/base"
-FILE_PR = "r34"
+PR = "r34"
 LICENSE = "MIT"
 
 RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \
diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb
index aeb863c84f..a1ab3918b7 100644
--- a/packages/meta/meta-sdl.bb
+++ b/packages/meta/meta-sdl.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for SDL"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators"
 
diff --git a/packages/meta/meta-toolchain-neuros.bb b/packages/meta/meta-toolchain-neuros.bb
index 794fbf90b1..f60fbf0063 100644
--- a/packages/meta/meta-toolchain-neuros.bb
+++ b/packages/meta/meta-toolchain-neuros.bb
@@ -1,6 +1,6 @@
 # Toolchain for neuros-osd devices
 
-FILE_PR = "r3"
+PR = "r3"
 
 TOOLCHAIN_HOST_TASK = "task-sdk-host \
                        qmake2-sdk uicmoc4-sdk"
diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
index 375e89e51b..b7e5626f61 100644
--- a/packages/meta/meta-toolchain-openmoko.bb
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
 TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
diff --git a/packages/meta/meta-toolchain-slugos.bb b/packages/meta/meta-toolchain-slugos.bb
index 7461a0377a..60326c0bc1 100644
--- a/packages/meta/meta-toolchain-slugos.bb
+++ b/packages/meta/meta-toolchain-slugos.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 TOOLCHAIN_HOST_TASK = "task-slugos-toolchain-host"
 
diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index b966d9e635..7d66ee5d61 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the Openprotium on the iomega Storcenter"
 HOMEPAGE = "http://www.openprotium.org"
 LICENSE = "MIT"
-FILE_PR = "r4"
+PR = "r4"
 CONFLICTS = "db3"
 PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages"
 
diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb
index e37a2cf0d8..190f323838 100644
--- a/packages/meta/oplinux-packages.bb
+++ b/packages/meta/oplinux-packages.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Packages that are compatible with the OPLinux distro"
 HOMEPAGE = "http://www.digital-opsis/oplinux"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 PROVIDES += "${OPLINUX_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb
index a42ee71218..1e60e8c8af 100644
--- a/packages/meta/slugos-native-packages.bb
+++ b/packages/meta/slugos-native-packages.bb
@@ -1,7 +1,7 @@
 # Only list packages which will not build 'cross' in here.
 DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index ca004734df..9dae7e8df3 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,7 +5,7 @@
 #
 DESCRIPTION = "Packages that are required for the SlugOS native build environment"
 LICENSE = "MIT"
-FILE_PR = "r7"
+PR = "r7"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 740677eddb..dd19abccaf 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-FILE_PR = "r59"
+PR = "r59"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
diff --git a/packages/meta/staging-linkage_1.0.bb b/packages/meta/staging-linkage_1.0.bb
index f02ff6bd17..95d82d3273 100644
--- a/packages/meta/staging-linkage_1.0.bb
+++ b/packages/meta/staging-linkage_1.0.bb
@@ -4,7 +4,7 @@ PACKAGES = ""
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = ""
 
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 28550ad1e3..ca194979e7 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Packages that are compatible with the Unslung firmware"
 LICENSE = "MIT"
-FILE_PR = "r5"
+PR = "r5"
 COMPATIBLE_MACHINE = "nslu2"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb
index ff59e3e30e..5f3c640f00 100644
--- a/packages/meta/xbase-clients.bb
+++ b/packages/meta/xbase-clients.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Basic X clients (meta package)"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"