7852 2015-06-05 18:07:15 +0000 bitbake-layers layerindex-fetch doesn't respect branch (-b|--branch) option 2025-11-01 14:00:16 +0000 1 1 7 Build System, Metadata & Runtime BitBake bitbake unspecified x86 Multiple IN PROGRESS REVIEW Medium normal 5.99 1 twoerner osama.abdelkader bluelightning osama.abdelkader poky.bs.watcher poky.watcher randy.macleod tim.orling --- --- No (bug/feature does not impact docs) oldest_to_newest 51534 0 twoerner 2015-06-05 18:07:15 +0000 $ git clone git://git.yoctoproject.org/poky meta-poky $ source meta-poky/oe-init-build-env $ bitbake-layers layerindex-fetch --branch fido meta-fsl-arm Layer Required by Git repository Subdirectory =================================================================================================================== meta-fsl-arm - git://git.yoctoproject.org/meta-fsl-arm openembedded-core meta-fsl-arm git://git.openembedded.org/openembedded-core meta Cloning into '/home/trevor/tmp/build/meta-poky/meta-fsl-arm'... remote: Counting objects: 9908, done. remote: Compressing objects: 100% (3715/3715), done. remote: Total 9908 (delta 6104), reused 9579 (delta 5776) Receiving objects: 100% (9908/9908), 37.80 MiB | 292.00 KiB/s, done. Resolving deltas: 100% (6104/6104), done. Checking connectivity... done. Adding layer "meta-fsl-arm" to conf/bblayers.conf $ cat conf/bblayers.conf # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly LCONF_VERSION = "6" BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ /home/trevor/tmp/build/meta-poky/meta \ /home/trevor/tmp/build/meta-poky/meta-yocto \ /home/trevor/tmp/build/meta-poky/meta-yocto-bsp \ /home/trevor/tmp/build/meta-poky/meta-fsl-arm \ " BBLAYERS_NON_REMOVABLE ?= " \ /home/trevor/tmp/build/meta-poky/meta \ /home/trevor/tmp/build/meta-poky/meta-yocto \ " $ cd ../meta-poky/meta-fsl-arm $ git branch * master The same is also true even if the original clone of poky is done on the fido branch, i.e. $ git clone git://git.yoctoproject.org/poky meta-poky -b fido The same is also true even if you use the short option to bitbake-layers, i.e. $ bitbake-layers layerindex-fetch -b fido meta-fsl-arm 55820 1 bluelightning 2015-10-27 12:51:43 +0000 I meant to comment on this earlier - I'm pretty sure it is respecting the branch info in the layer index; what it's not doing is touching any of the cloned repositories on disk. I know that's not particularly useful though, it should at least be trying to checkout the appropriate branch. 87401 2 bluelightning 2020-06-03 21:40:20 +0000 So for checking out new branches this is fixed by the following commit: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=eae875dae728987575f1d797b6497900be5a0cb7 However, there are still two problems: 1) If the layer has already been fetched then it will add it to your bblayers.conf but will not check out the correct branch (and won't warn you). 2) If you have oe-core (or poky) checked out at the wrong branch it erroneously fetches it into a separate "openembedded-core" directory and adds it to your bblayers.conf. In both of these scenarios it seems to me that the correct course would be to at least try doing a "git checkout" of the appropriate branch (probably after a git fetch); if that fails for any reason then bail out. 96950 3 randy.macleod 2023-10-24 14:24:49 +0000 Bulk move from 4.99 or 0.00 to 5.99 103171 4 5153 osama.abdelkader 2025-11-01 14:00:16 +0000 Created attachment 5153 proposed fix Already submitted to bitbake-devel@lists.openembedded.org. 5153 2025-11-01 14:00:16 +0000 2025-11-01 14:00:16 +0000 proposed fix 0001-bitbake-layers-layerindex-fetch-respect-branch-for-a.patch text/plain 6896 osama.abdelkader RnJvbSBhYzI2OTk1OTIwYjU4YzgzOGE5NzQ5ZjkxNmYyZmYyZmNkNmFmOTAxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBPc2FtYSBBYmRlbGthZGVyIDxvc2FtYS5hYmRlbGthZGVyQGdt YWlsLmNvbT4KRGF0ZTogU2F0LCAxIE5vdiAyMDI1IDE1OjAwOjQ0ICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gYml0YmFrZS1sYXllcnM6IGxheWVyaW5kZXgtZmV0Y2g6IHJlc3BlY3QgLS1icmFuY2gg Zm9yCiBhbHJlYWR5LWNvbmZpZ3VyZWQgbGF5ZXJzCgpbWU9DVE8gIzc4NTJdCgpUaGUgbGF5ZXJp bmRleC1mZXRjaCBjb21tYW5kIGhhcyB0d28gaXNzdWVzIHdoZW4gLS1icmFuY2ggaXMgc3BlY2lm aWVkOgoKMS4gSWYgYSBsYXllciBpcyBhbHJlYWR5IGluIGJibGF5ZXJzLmNvbmYsIHRoZSBjb21t YW5kIGV4aXRzIGVhcmx5IHdpdGgKICAgIllvdSBhbHJlYWR5IGhhdmUgdGhlIHJlcXVlc3RlZCBs YXllcihzKSIgd2l0aG91dCBjaGVja2luZyBpZiB0aGUKICAgbGF5ZXIgaXMgb24gdGhlIHJlcXVl c3RlZCBicmFuY2guCgoyLiBGb3IgbGF5ZXJzIGluIGJibGF5ZXJzLmNvbmYgKGNvb2tlciBsYXll cnMpLCB0aGUgYnJhbmNoIGNoZWNraW5nIGNvZGUKICAgYWRkZWQgaW4gY29tbWl0IDEzOGRkNzg4 M2VlICgyMDIyKSBuZXZlciBleGVjdXRlcyBiZWNhdXNlIGNvb2tlciBsYXllcnMKICAgYXJlIHNr aXBwZWQgZW50aXJlbHkgaW4gdGhlIGZldGNoIGxvb3AuCgpUaGlzIHBhdGNoIGZpeGVzIGJvdGgg aXNzdWVzIGJ5OgoKLSBQcmV2ZW50aW5nIHRoZSBlYXJseSBleGl0IChmYXN0IHBhdGgpIHdoZW4g LS1icmFuY2ggaXMgc3BlY2lmaWVkLCBmb3JjaW5nCiAgYnJhbmNoIHZlcmlmaWNhdGlvbiBldmVu IGZvciBhbHJlYWR5LWNvbmZpZ3VyZWQgbGF5ZXJzLgoKLSBBZGRpbmcgYnJhbmNoIGNoZWNrL3N3 aXRjaCBsb2dpYyBmb3IgY29va2VyIGxheWVycyB3aGVuIC0tYnJhbmNoIGlzCiAgc3BlY2lmaWVk LiBUaGUgY29kZSBmaW5kcyBlYWNoIGxheWVyJ3MgZ2l0IHJlcG9zaXRvcnkgYW5kIGNhbGxzCiAg Z2V0X2ZldGNoX2xheWVyKCkgd2l0aCB0aGUgcmVxdWVzdGVkIGJyYW5jaCB0byBwZXJmb3JtIHRo ZSB2YWxpZGF0aW9uCiAgYW5kIGNoZWNrb3V0IGlmIG5lZWRlZC4KCi0gRml4aW5nIHRoZSBicmFu Y2ggZGV0ZWN0aW9uIGluIGdldF9mZXRjaF9sYXllcigpIHRvIHVzZQogICdnaXQgcmV2LXBhcnNl IC0tYWJicmV2LXJlZiBIRUFEJyBpbnN0ZWFkIG9mIHBhcnNpbmcgJ2dpdCBicmFuY2gnIG91dHB1 dC4KCi0gRml4aW5nIHVuZGVmaW5lZCAnc3RkZXJyJyB2YXJpYWJsZSAoc2hvdWxkIGJlICdjb21w bGV0ZWRfcHJvYy5zdGRlcnInKS4KClRoaXMgY29tcGxldGVzIHRoZSBmaXggc3RhcnRlZCBpbiBj b21taXQgMTM4ZGQ3ODgzZWUsIGFsbG93aW5nIHVzZXJzIHRvCnVzZSAtLWJyYW5jaCB0byBzd2l0 Y2ggYWxyZWFkeS1jb25maWd1cmVkIGxheWVycyB0byBkaWZmZXJlbnQgYnJhbmNoZXMuCgpTaWdu ZWQtb2ZmLWJ5OiBPc2FtYSBBYmRlbGthZGVyIDxvc2FtYS5hYmRlbGthZGVyQGdtYWlsLmNvbT4K LS0tCiBiaXRiYWtlL2xpYi9iYmxheWVycy9sYXllcmluZGV4LnB5IHwgNTEgKysrKysrKysrKysr KysrKysrKysrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgNiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9iaXRiYWtlL2xpYi9iYmxheWVycy9sYXllcmluZGV4 LnB5IGIvYml0YmFrZS9saWIvYmJsYXllcnMvbGF5ZXJpbmRleC5weQppbmRleCBiYTkxZmFjNjY5 Li43MmQyZWI4ZmI3IDEwMDY0NAotLS0gYS9iaXRiYWtlL2xpYi9iYmxheWVycy9sYXllcmluZGV4 LnB5CisrKyBiL2JpdGJha2UvbGliL2JibGF5ZXJzL2xheWVyaW5kZXgucHkKQEAgLTU1LDEzICs1 NSwxNSBAQCBjbGFzcyBMYXllckluZGV4UGx1Z2luKEFjdGlvblBsdWdpbik6CiAgICAgICAgICAg ICBzd2l0Y2hpbmcgYnJhbmNoZXMgaWYgbmVjZXNzYXJ5IGFuZCBwb3NzaWJsZS4KICAgICAgICAg ICAgICIiIgogICAgICAgICAgICAgYmFzZV9jbWQgPSBbJ2dpdCcsICctLWdpdC1kaXI9JXMvLmdp dCcgJSByZXBvZGlyLCAnLS13b3JrLXRyZWU9JXMnICUgcmVwb2Rpcl0KLSAgICAgICAgICAgIGNt ZCA9IGJhc2VfY21kICsgWydicmFuY2gnXQorICAgICAgICAgICAgIyBHZXQgY3VycmVudCBicmFu Y2ggbmFtZQorICAgICAgICAgICAgY21kID0gYmFzZV9jbWQgKyBbJ3Jldi1wYXJzZScsICctLWFi YnJldi1yZWYnLCAnSEVBRCddCiAgICAgICAgICAgICBjb21wbGV0ZWRfcHJvYyA9IHN1YnByb2Nl c3MucnVuKGNtZCwgdGV4dD1UcnVlLCBjYXB0dXJlX291dHB1dD1UcnVlKQogICAgICAgICAgICAg aWYgY29tcGxldGVkX3Byb2MucmV0dXJuY29kZToKLSAgICAgICAgICAgICAgICBsb2dnZXIuZXJy b3IoIlVuYWJsZSB0byB2YWxpZGF0ZSByZXBvICVzICglcykiICUgKHJlcG9kaXIsIHN0ZGVycikp CisgICAgICAgICAgICAgICAgbG9nZ2VyLmVycm9yKCJVbmFibGUgdG8gdmFsaWRhdGUgcmVwbyAl cyAoJXMpIiAlIChyZXBvZGlyLCBjb21wbGV0ZWRfcHJvYy5zdGRlcnIpKQogICAgICAgICAgICAg ICAgIHJldHVybiBOb25lLCBOb25lLCBOb25lCiAgICAgICAgICAgICBlbHNlOgotICAgICAgICAg ICAgICAgIGlmIGJyYW5jaCAhPSBjb21wbGV0ZWRfcHJvYy5zdGRvdXRbMjotMV06CisgICAgICAg ICAgICAgICAgY3VycmVudF9icmFuY2ggPSBjb21wbGV0ZWRfcHJvYy5zdGRvdXQuc3RyaXAoKQor ICAgICAgICAgICAgICAgIGlmIGJyYW5jaCAhPSBjdXJyZW50X2JyYW5jaDoKICAgICAgICAgICAg ICAgICAgICAgY21kID0gYmFzZV9jbWQgKyBbJ3N0YXR1cycsICctLXNob3J0J10KICAgICAgICAg ICAgICAgICAgICAgY29tcGxldGVkX3Byb2MgPSBzdWJwcm9jZXNzLnJ1bihjbWQsIHRleHQ9VHJ1 ZSwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSkKICAgICAgICAgICAgICAgICAgICAgaWYgY29tcGxldGVk X3Byb2Muc3Rkb3V0LmNvdW50KCdcbicpICE9IDA6CkBAIC0xMTgsNyArMTIwLDggQEAgY2xhc3Mg TGF5ZXJJbmRleFBsdWdpbihBY3Rpb25QbHVnaW4pOgogCiAgICAgICAgICMgRmFzdCBwYXRoLCBj aGVjayBpZiB3ZSBhbHJlYWR5IGhhdmUgd2hhdCBoYXMgYmVlbiByZXF1ZXN0ZWQhCiAgICAgICAg IChkZXBlbmRlbmNpZXMsIGludmFsaWRuYW1lcykgPSBjb29rZXJJbmRleC5maW5kX2RlcGVuZGVu Y2llcyhuYW1lcz1hcmdzLmxheWVybmFtZSwgaWdub3Jlcz1pZ25vcmVfbGF5ZXJzKQotICAgICAg ICBpZiBub3QgYXJncy5zaG93X29ubHkgYW5kIG5vdCBpbnZhbGlkbmFtZXM6CisgICAgICAgIGlm IG5vdCBhcmdzLnNob3dfb25seSBhbmQgbm90IGludmFsaWRuYW1lcyBhbmQgbm90IGFyZ3MuYnJh bmNoOgorICAgICAgICAgICAgIyBPbmx5IHNraXAgaWYgbm8gc3BlY2lmaWMgYnJhbmNoIHdhcyBy ZXF1ZXN0ZWQKICAgICAgICAgICAgIGxvZ2dlci5wbGFpbigiWW91IGFscmVhZHkgaGF2ZSB0aGUg cmVxdWVzdGVkIGxheWVyKHMpOiAlcyIgJSBhcmdzLmxheWVybmFtZSkKICAgICAgICAgICAgIHJl dHVybiAwCiAKQEAgLTIwMiw4ICsyMDUsNDQgQEAgY2xhc3MgTGF5ZXJJbmRleFBsdWdpbihBY3Rp b25QbHVnaW4pOgogICAgICAgICAgICAgZm9yIGRlcGxheWVyYnJhbmNoIGluIGRlcGVuZGVuY2ll czoKICAgICAgICAgICAgICAgICBsYXllckJyYW5jaCA9IGRlcGVuZGVuY2llc1tkZXBsYXllcmJy YW5jaF1bMF0KIAotICAgICAgICAgICAgICAgIGlmIGxheWVyQnJhbmNoLmluZGV4LmNvbmZpZ1sn VFlQRSddID09ICdjb29rZXInOgotICAgICAgICAgICAgICAgICAgICAjIEFueXRoaW5nIGxvYWRl ZCB2aWEgY29va2VyIGlzIGFscmVhZHkgbG9jYWwsIHNraXAgaXQKKyAgICAgICAgICAgICAgICBp c19jb29rZXJfbGF5ZXIgPSBsYXllckJyYW5jaC5pbmRleC5jb25maWdbJ1RZUEUnXSA9PSAnY29v a2VyJworCisgICAgICAgICAgICAgICAgaWYgaXNfY29va2VyX2xheWVyOgorICAgICAgICAgICAg ICAgICAgICAjIEFueXRoaW5nIGxvYWRlZCB2aWEgY29va2VyIGlzIGFscmVhZHkgbG9jYWwKKyAg ICAgICAgICAgICAgICAgICAgIyBJZiBhIGJyYW5jaCB3YXMgc3BlY2lmaWVkLCB3ZSBzdGlsbCBu ZWVkIHRvIGNoZWNrL3N3aXRjaCBicmFuY2hlcworICAgICAgICAgICAgICAgICAgICBpZiBhcmdz LmJyYW5jaDoKKyAgICAgICAgICAgICAgICAgICAgICAgICMgTWFwIGNvbGxlY3Rpb24gbmFtZXMg dG8gbGF5ZXIgcGF0aHMgKHNhbWUgYXMgY29va2VyIHBsdWdpbiBkb2VzKQorICAgICAgICAgICAg ICAgICAgICAgICAgbGF5ZXJjb25mcyA9IHNlbGYudGluZm9pbC5jb25maWdfZGF0YS52YXJoaXN0 b3J5LmdldF92YXJpYWJsZV9pdGVtc19maWxlcygnQkJGSUxFX0NPTExFQ1RJT05TJykKKyAgICAg ICAgICAgICAgICAgICAgICAgIGJiZmlsZV9jb2xsZWN0aW9ucyA9IHtsYXllcjogb3MucGF0aC5k aXJuYW1lKG9zLnBhdGguZGlybmFtZShwYXRoKSkgZm9yIGxheWVyLCBwYXRoIGluIGxheWVyY29u ZnMuaXRlbXMoKX0KKworICAgICAgICAgICAgICAgICAgICAgICAgIyBHZXQgdGhlIGxheWVyIHBh dGggZm9yIHRoaXMgY29va2VyIGxheWVyJ3MgY29sbGVjdGlvbgorICAgICAgICAgICAgICAgICAg ICAgICAgY29sbGVjdGlvbl9uYW1lID0gbGF5ZXJCcmFuY2guY29sbGVjdGlvbgorICAgICAgICAg ICAgICAgICAgICAgICAgaWYgY29sbGVjdGlvbl9uYW1lIGluIGJiZmlsZV9jb2xsZWN0aW9uczoK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYmxheWVyID0gYmJmaWxlX2NvbGxlY3Rpb25z W2NvbGxlY3Rpb25fbmFtZV0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiBvcy5wYXRo LmV4aXN0cyhiYmxheWVyKToKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ5Ogor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBGaW5kIHRoZSBnaXQgcmVwb3Np dG9yeSByb290CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnaXRkaXJfY21k ID0gWydnaXQnLCAnLUMnLCBiYmxheWVyLCAncmV2LXBhcnNlJywgJy0tc2hvdy10b3BsZXZlbCdd CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNz LnJ1bihnaXRkaXJfY21kLCBjYXB0dXJlX291dHB1dD1UcnVlLCB0ZXh0PVRydWUpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiByZXN1bHQucmV0dXJuY29kZSA9PSAwOgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlcG9fcm9vdCA9IHJlc3Vs dC5zdGRvdXQuc3RyaXAoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICMgR2V0IHRoZSBzdWJkaXIgcmVsYXRpdmUgdG8gcmVwbyByb290CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmVsX3N1YmRpciA9IG9zLnBhdGgucmVscGF0aChiYmxh eWVyLCByZXBvX3Jvb3QpIGlmIGJibGF5ZXIgIT0gcmVwb19yb290IGVsc2UgJycKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIEdldCBwYXJlbnQgZGlyIG9mIHJlcG8g YXMgZmV0Y2hkaXIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJl bnRfZmV0Y2hkaXIgPSBvcy5wYXRoLmRpcm5hbWUocmVwb19yb290KQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICMgTm93IGNhbGwgZ2V0X2ZldGNoX2xheWVyIHRvIGNo ZWNrL3N3aXRjaCBicmFuY2gKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAjIFVzZSBhcmdzLmJyYW5jaCAodGhlIHJlcXVlc3RlZCBicmFuY2gpIG5vdCBsYXllckJyYW5j aC5hY3R1YWxfYnJhbmNoIChjdXJyZW50IGJyYW5jaCkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBfLCBuYW1lLCBfID0gc2VsZi5nZXRfZmV0Y2hfbGF5ZXIocGFyZW50 X2ZldGNoZGlyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXllckJyYW5jaC5sYXllci52Y3NfdXJsLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZWxfc3ViZGlyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub3QgYXJncy5z aG93X29ubHksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFyZ3MuYnJhbmNoLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBhcmdzLnNoYWxsb3cpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aWYgbm90IG5hbWU6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICMgRXJyb3IgZHVyaW5nIGJyYW5jaCBjaGVjay9zd2l0Y2gKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDEKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZXhjZXB0IHN1YnByb2Nlc3MuU3VicHJvY2Vzc0Vycm9yOgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcGFzcyAgIyBOb3QgYSBnaXQgcmVwbywgc2tpcAogICAg ICAgICAgICAgICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAgICAgICAgc3ViZGlyLCBuYW1l LCBsYXllcmRpciA9IHNlbGYuZ2V0X2ZldGNoX2xheWVyKGZldGNoZGlyLAotLSAKMi40My4wCgo=