summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-01-24 11:54:32 -0500
committerSaul Wold <sgw@linux.intel.com>2011-01-24 14:42:55 -0800
commit97cb3124ec958650895ebae907eb946517c2e1ef (patch)
tree765425372e91172f7694967421314ef53c1e2cfe /meta
parente144427cb91a503a3a7a564a3410cf0eb0546173 (diff)
downloadpoky-97cb3124ec958650895ebae907eb946517c2e1ef.tar.gz
linux-yocto: allow multiple BSPs per branch
By default the linux-yocto recipes operate on the current branch and use it as a trigger to locate the description of a board. This model works well when using the git repo outside of a build system since the commands can be simply invoked and will do something useful. However, it does mean that you can't have two BSPs that differ only by configuration, building out of a single branch in the repository. This means that you must have many branches for very similar BSPs. This model is still preferred, but having the choice of branching strategies is better. With this change we can have multiple BSPs using a single branch with the preferred description being hinted from the build system by passing the $machine value to updateme/configme. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass4
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 32d2e20a71..8479b395cd 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -74,7 +74,7 @@ do_patch() {
74 if [ -n "${KERNEL_FEATURES}" ]; then 74 if [ -n "${KERNEL_FEATURES}" ]; then
75 addon_features="--features ${KERNEL_FEATURES}" 75 addon_features="--features ${KERNEL_FEATURES}"
76 fi 76 fi
77 updateme ${addon_features} ${ARCH} ${WORKDIR} 77 updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR}
78 if [ $? -ne 0 ]; then 78 if [ $? -ne 0 ]; then
79 echo "ERROR. Could not update ${kbranch}" 79 echo "ERROR. Could not update ${kbranch}"
80 exit 1 80 exit 1
@@ -126,7 +126,7 @@ do_kernel_configme() {
126 echo "[INFO] doing kernel configme" 126 echo "[INFO] doing kernel configme"
127 127
128 cd ${S} 128 cd ${S}
129 configme --reconfig --output ${B} 129 configme --reconfig --output ${B} ${KBRANCH} ${MACHINE}
130 if [ $? -ne 0 ]; then 130 if [ $? -ne 0 ]; then
131 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 131 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
132 exit 1 132 exit 1
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index e73c971b33..b9602eafaf 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 ??= "f553af044615ba75c2b4b7ef1f382e6f75087213" 60SRCREV_pn-kern-tools-native ??= "8832b75dc2e494ae96ca3e1dee7bfde2f3096904"
61SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" 61SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
62SRCREV_pn-libfakekey ??= "2031" 62SRCREV_pn-libfakekey ??= "2031"
63SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f" 63SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 7350746b8c..58e64709f2 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7PR = r8 7PR = r9
8PV = "0.1+git${SRCPV}" 8PV = "0.1+git${SRCPV}"
9 9
10inherit native 10inherit native