Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into...

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 0baf0e0..a901f02 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1240,7 +1240,7 @@ def check_gcc3(data):
        # Start by checking for the program name as we build it, was not
        # all host-provided gcc-3.4's will work.
 
-       gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32'
+       gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32'
 
        for gcc3 in gcc3_versions.split():
                if check_app_exists(gcc3, data):

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 95ee9c6..e7ac03e 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -164,7 +164,7 @@ P = "${PN}-${PV}"
 
 # Define a PR for kernels that machines can override so things like
 # modules get rebuilt
-MACHINE_KERNEL_PR ?= "r0"
+MACHINE_KERNEL_PR ?= "${PR}"
 
 # Base package name
 # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"