summaryrefslogtreecommitdiffstats
path: root/b2qt-init-build-env
diff options
context:
space:
mode:
Diffstat (limited to 'b2qt-init-build-env')
-rwxr-xr-xb2qt-init-build-env17
1 files changed, 1 insertions, 16 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index c61e0c6..83776eb 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -130,20 +130,6 @@ mirror() {
130 ${REPO} sync 130 ${REPO} sync
131} 131}
132 132
133patch_poky() {
134 cd sources/poky
135 found=$(git rev-list --grep="bitbake: cooker: add support for using % as a wildcard in bbappend filename" HEAD)
136 if [ -z "$found" ]; then
137 git cherry-pick 381d5920188398bc53b2454843054c8690bca243 > /dev/null
138 fi
139
140 found=$(git rev-list --grep="bitbake: cooker: Fix support for wildcards in bbappend filenames" HEAD)
141 if [ -z "$found" ]; then
142 git cherry-pick f91a3f46a1ee586e330be0868e8fbc4d2e78d361 > /dev/null
143 fi
144 cd -
145}
146
147init() { 133init() {
148 if [ -z "${DEVICE}" ]; then 134 if [ -z "${DEVICE}" ]; then
149 echo "device not defined" 135 echo "device not defined"
@@ -153,6 +139,7 @@ init() {
153 139
154 get_groups 140 get_groups
155 mkdir -p .repo/manifests 141 mkdir -p .repo/manifests
142 rm -f .repo/manifests/manifest*.xml
156 cp ${DIR}/scripts/manifest*.xml .repo/manifests 143 cp ${DIR}/scripts/manifest*.xml .repo/manifests
157 if [ -f .repo/manifests/manifest_${DEVICE}.xml ]; then 144 if [ -f .repo/manifests/manifest_${DEVICE}.xml ]; then
158 MANIFEST="manifest_${DEVICE}.xml" 145 MANIFEST="manifest_${DEVICE}.xml"
@@ -162,8 +149,6 @@ init() {
162 ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} 149 ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
163 ${REPO} sync 150 ${REPO} sync
164 151
165 patch_poky
166
167 if [ ! -e "sources/meta-b2qt" ]; then 152 if [ ! -e "sources/meta-b2qt" ]; then
168 ln -s ${DIR} sources/meta-b2qt 153 ln -s ${DIR} sources/meta-b2qt
169 fi 154 fi