diff options
| author |   Tom Rini <trini@embeddedalley.com> | 2009-05-04 12:22:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-05-04 12:22:58 -0400 |
| commit | 47a04595e621f84c35daba835fbb6f1e11787983 (patch) | |
| tree | 9a52f7e51ce4d5ed6a5a06d8f39a0d31fb0845a0 | |
| parent | d59fc6ce4782b882620fbaa60d682d29e63d0731 (diff) | |
| parent | 13f97da771882f6951c44346844e28c6bfd91d5d (diff) | |
| download | openembedded-47a04595e621f84c35daba835fbb6f1e11787983.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | classes/base.bbclass | 2 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 0baf0e0288..a901f02a6c 100644 --- 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 95ee9c6136..e7ac03e34c 100644 --- 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" |