summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-01-04 00:20:14 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-10 21:04:44 +0000
commit1759fee63889219ab5ee52124c237eec902de525 (patch)
tree5295c70a8f1cf8c58e6737790758539045206c11
parent2b2dbf76126650750cb8a6778b837af6fe4c8b21 (diff)
downloadpoky-1759fee63889219ab5ee52124c237eec902de525.tar.gz
kernel-yocto: pass the build directory to configme
configme used to be able to calculate the output/build directory when branches were always <machine>-<kernel type>. Branch names can now be widely different and to avoid embedding complexity in the scripts it is easier to just pass ${B} from the build system down to the scripts. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta/classes/kernel-yocto.bbclass2
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 7ebe5d69aa..df2a8a43bc 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -121,7 +121,7 @@ do_kernel_configme() {
121 echo "[INFO] doing kernel configme" 121 echo "[INFO] doing kernel configme"
122 122
123 cd ${S} 123 cd ${S}
124 configme --reconfig 124 configme --reconfig --output ${B}
125 if [ $? -ne 0 ]; then 125 if [ $? -ne 0 ]; then
126 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 126 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
127 exit 1 127 exit 1
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index c11faf9316..c4b00a6473 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -57,7 +57,7 @@ SRCREV_pn-gypsy ??= "147"
57SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" 57SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
58SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" 58SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
59SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" 59SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
60SRCREV_pn-kern-tools-native ??= "72683bf61fdb83a1c0b4110763f803ff3e39f8ca" 60SRCREV_pn-kern-tools-native ??= "a494ddaf1c9151af8af8050e8427c9958440ec4c"
61SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" 61SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
62SRCREV_pn-libfakekey ??= "2031" 62SRCREV_pn-libfakekey ??= "2031"
63SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f" 63SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"