1 files changed, 19 insertions, 0 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 1405bf4..8b7dee3 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -88,6 +88,9 @@ get_groups() {
     imx53qsb|imx6qsabresd|nitrogen6x)
       PROJECT_GROUPS="fsl"
     ;;
+    tibidabo)
+      PROJECT_GROUPS="architech"
+    ;;
     beagleboard|am335x-evm)
       PROJECT_GROUPS="ti"
     ;;
@@ -124,6 +127,20 @@ mirror() {
   ${REPO} sync
 }
 
+patch_poky() {
+    cd sources/poky
+    found=$(git rev-list --grep="bitbake: cooker: add support for using % as a wildcard in bbappend filename" HEAD)
+    if [ -z "$found" ]; then
+        git cherry-pick 381d5920188398bc53b2454843054c8690bca243 > /dev/null
+    fi
+
+    found=$(git rev-list --grep="bitbake: cooker: Fix support for wildcards in bbappend filenames" HEAD)
+    if [ -z "$found" ]; then
+        git cherry-pick f91a3f46a1ee586e330be0868e8fbc4d2e78d361 > /dev/null
+    fi
+    cd -
+}
+
 init() {
   if [ -z "${DEVICE}" ]; then
     echo "device not defined"
@@ -142,6 +159,8 @@ init() {
   ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
   ${REPO} sync
 
+  patch_poky
+
   if [ ! -e "sources/meta-b2qt" ]; then
     ln -s ${DIR} sources/meta-b2qt
   fi