From af74eaeda04ab4cbca42abc4bb4818a9b3df465e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 9 Jun 2015 13:29:16 +0300 Subject: tibidabo: use latest version poky for tibidabo Instead of using old patched version of poky for the meta-tibidabo layer, use the same version of all the meta layer as for the other devices. This requires the old u-boot, kernel, gpu driver and imx-lib recipes to be copied from meta-fsl-arm. Change-Id: I2e804fbe895370c23f8ae89cff4fe283302dabe1 Reviewed-by: Eirik Aavitsland --- b2qt-init-build-env | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'b2qt-init-build-env') 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() { ${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" @@ -153,6 +139,7 @@ init() { get_groups mkdir -p .repo/manifests + rm -f .repo/manifests/manifest*.xml cp ${DIR}/scripts/manifest*.xml .repo/manifests if [ -f .repo/manifests/manifest_${DEVICE}.xml ]; then MANIFEST="manifest_${DEVICE}.xml" @@ -162,8 +149,6 @@ 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 -- cgit v1.2.3-54-g00ecf