8732 2015-11-27 04:58:34 +0000 Branch Support for Buildhistory 2026-07-16 15:32:39 +0000 1 1 7 Build System, Metadata & Runtime OE-Core deployment unspecified x86 Multiple NEW Medium enhancement 6.99 1 rudolf.streif unassigned bluelightning randy.macleod sgw --- --- Yes (doc changes required) oldest_to_newest 56833 0 2874 rudolf.streif 2015-11-27 04:58:34 +0000 Created attachment 2874 Patch to add branch functionality to buildhistory.class It would be useful if buildhistory supported branches for the git repository. That way the same git repo could be used to track changes for multiple build environments. Buildhistory for different build environments is not related hence using the same repo is not feasible as they have a separate history. The attached patch suggests an improvement to the buildhistory class by introducing the variable BUILDHISTORY_BRANCH which defaults to master. If the variable is set to anything else but master then an orphaned branch is created (BUILDHISTORY_COMMIT must be set to 1 of course). All changes are then committed to that branch. Orphan branches are used because buildhistory of different build environments typically do not share a common history. If changes are pushed to a remote repository BUILDHISTORY_BRANCH is used as well. 60722 1 bluelightning 2016-04-04 04:25:41 +0000 The patch looks mostly OK except there's no reason given in the commit message as to why you've broken out committing metadata-revs to a separate commit, and that does not seem to be related to the branch support. The idea with the way it's currently implemented was that any given commit would always have the correct metadata-revs associated with it, but we wouldn't have any additional noise introduced in the commits. Note for the future - patches like this should really be sent to the mailing list for review rather than being attached to bug reports. 60723 2 bluelightning 2016-04-04 04:35:57 +0000 Also not mentioned are the tweaks to initialising the repo - these look OK but should really be done in a separate commit. 65588 3 bluelightning 2016-08-29 20:42:07 +0000 Rudi, I'm assigning this back to you - could you please make the requested changes and then send this patch to the OE-Core mailing list? Thanks. 68431 4 rudolf.streif 2016-11-18 03:17:06 +0000 Sorry, I have been mia due to many other commitments. I will make the suggested changes and adapt the patch to work with master. I saw that the code has somewhat changed since I first submitted the patch. 93457 5 randy.macleod 2022-06-09 15:24:17 +0000 Thsi looks very similar to code we have on the autobuilder helper and Joshua has also worked-around the issue. 96943 6 randy.macleod 2023-10-24 14:24:48 +0000 Bulk move from 4.99 or 0.00 to 5.99 106198 7 randy.macleod 2026-07-16 15:32:39 +0000 In yocto-autobuilder-helper.git on master ❯ fd buildhist scripts/buildhistory-init ❯ cat scripts/buildhistory-init #!/bin/sh # # Initialize Buildhistory for this branch .... similar idea but not in oe-core and IMO not quite what this ticket is asking. 2874 2015-11-27 04:58:34 +0000 2015-11-27 04:58:34 +0000 Patch to add branch functionality to buildhistory.class 0001-Added-branch-functionality-to-build-history.patch text/plain 4697 rudolf.streif RnJvbSA4ZTdkNmNiZDlhNGUzZWEwYTI3Y2VhZTVhMTA1OGM3OGYxNzE1MThkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSdWRvbGYgSiBTdHJlaWYgPHJ1ZG9sZi5zdHJlaWZAZ21haWwu Y29tPgpEYXRlOiBUaHUsIDI2IE5vdiAyMDE1IDIwOjM5OjU4IC0wODAwClN1YmplY3Q6IFtQQVRD SF0gQWRkZWQgYnJhbmNoIGZ1bmN0aW9uYWxpdHkgdG8gYnVpbGQgaGlzdG9yeQoKQmVpbmcgYWJs ZSB0byBzZXQgYSBicmFuY2ggZm9yIHRoZSBidWlsZCBoaXN0b3J5IGFsbG93cyB0aGUgc2FtZSBn aXQgcmVwbyAoYW5kCnJlbW90ZSkgdG8gYmUgdXNlZCBmb3IgbXVsdGlwbGUgYnVpbGQgZW52aXJv bm1lbnRzLiBDaGFuZ2VzIGNhbiBiZSB0cmFja2VkIGJ5CmJ1aWxkIGVudmlyb25tZW50LiBCcmFu Y2hlcyBhcmUgc2V0IHVwIGFzIG9ycGhhbiwgYXMgdGhleSB3b3VsZCB0eXBpY2FsbHkgbm90Cmhh dmUgYSBjb21tb24gaGlzdG9yeS4KCjEuIFJlbW92ZWQgJHtCVUlMREhJU1RPUllfRElSfSBmcm9t IHRoZSBlbXB0eSBjb21taXRvcHQgaW4gYnVpbGRfaGlzdG9yeV9zaW5nbGVfY29tbWl0KCkuCiAg IFRoZSBwYXRoIGRvZXMgbm90IG1ha2UgYW55IHNlbnNlIHRoZXJlIGFuZCBjYXVzZXMgYSBnaXQg ZXJyb3IgbWVzc2FnZSBhcyB0aGVyZSBpcwogICBubyBzdWNoIHJlZnNwZWMuCgoyLiBBZGRlZCBC VUlMREhJU1RPUllfQlJBTkNIIHZhcmlhYmxlIChkZWZhdWx0IG1hc3RlcikgYW5kIGxvZ2ljIHRv IG1hbmFnZSB0aGUgYnJhbmNoZXMuCgpTaWduZWQtb2ZmLWJ5OiBSdWRvbGYgSiBTdHJlaWYgPHJ1 ZG9sZi5zdHJlaWZAZ21haWwuY29tPgotLS0KIG1ldGEvY2xhc3Nlcy9idWlsZGhpc3RvcnkuYmJj bGFzcyB8IDQ3ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L21ldGEvY2xhc3Nlcy9idWlsZGhpc3RvcnkuYmJjbGFzcyBiL21ldGEvY2xhc3Nlcy9idWlsZGhp c3RvcnkuYmJjbGFzcwppbmRleCBhODY1M2Y5Li45MDlhMGJlIDEwMDY0NAotLS0gYS9tZXRhL2Ns YXNzZXMvYnVpbGRoaXN0b3J5LmJiY2xhc3MKKysrIGIvbWV0YS9jbGFzc2VzL2J1aWxkaGlzdG9y eS5iYmNsYXNzCkBAIC0xNiw2ICsxNiw3IEBAIEJVSUxESElTVE9SWV9JTUFHRV9GSUxFUyA/PSAi L2V0Yy9wYXNzd2QgL2V0Yy9ncm91cCIKIEJVSUxESElTVE9SWV9DT01NSVQgPz0gIjAiCiBCVUlM REhJU1RPUllfQ09NTUlUX0FVVEhPUiA/PSAiYnVpbGRoaXN0b3J5IDxidWlsZGhpc3RvcnlAJHtE SVNUUk99PiIKIEJVSUxESElTVE9SWV9QVVNIX1JFUE8gPz0gIiIKK0JVSUxESElTVE9SWV9CUkFO Q0ggPz0gIm1hc3RlciIKIAogU1NUQVRFUE9TVElOU1RGVU5DU19hcHBlbmQgPSAiIGJ1aWxkaGlz dG9yeV9lbWl0X3BrZ2hpc3RvcnkiCiAjIFdlIHdhbnQgdG8gYXZvaWQgaW5mbHVlbmNlIHRoZSBz aWduYXR1cmVzIG9mIHNzdGF0ZSB0YXNrcyAtIGZpcnN0IHRoZSBmdW5jdGlvbiBpdHNlbGY6CkBA IC01ODcsMTAgKzU4OCwxMCBAQCBkZWYgYnVpbGRoaXN0b3J5X2dldF9jbWRsaW5lKGQpOgogCiBi dWlsZGhpc3Rvcnlfc2luZ2xlX2NvbW1pdCgpIHsKIAlpZiBbICIkMyIgPSAiIiBdIDsgdGhlbgot CQljb21taXRvcHRzPSIke0JVSUxESElTVE9SWV9ESVJ9LyAtLWFsbG93LWVtcHR5IgorCQljb21t aXRvcHRzPSItLWFsbG93LWVtcHR5IgogCQlpdGVtPSJObyBjaGFuZ2VzIgogCWVsc2UKLQkJY29t bWl0b3B0cz0iJDMgbWV0YWRhdGEtcmV2cyIKKwkJY29tbWl0b3B0cz0iJDMiCiAJCWl0ZW09IiQz IgogCWZpCiAJaWYgWyAiJHtCVUlMREhJU1RPUllfQlVJTERfRkFJTFVSRVN9IiA9ICIwIiBdIDsg dGhlbgpAQCAtNjI3LDM3ICs2MjgsNDcgQEAgYnVpbGRoaXN0b3J5X2NvbW1pdCgpIHsKIAkJcmV0 dXJuCiAJZmkKIAotCSMgQ3JlYXRlIGEgbWFjaGluZS1yZWFkYWJsZSBsaXN0IG9mIG1ldGFkYXRh IHJldmlzaW9ucyBmb3IgZWFjaCBsYXllcgotCWNhdCA+ICR7QlVJTERISVNUT1JZX0RJUn0vbWV0 YWRhdGEtcmV2cyA8PEVORAotJHtAYnVpbGRoaXN0b3J5X2dldF9tZXRhZGF0YV9yZXZzKGQpfQot RU5ECi0KIAkoIGNkICR7QlVJTERISVNUT1JZX0RJUn0vCiAJCSMgSW5pdGlhbGlzZSB0aGUgcmVw byBpZiBuZWNlc3NhcnkKIAkJaWYgWyAhIC1kIC5naXQgXSA7IHRoZW4KIAkJCWdpdCBpbml0IC1x CisJCQkjIElmIHRoZSB1c2VyIGhhc24ndCBzZXQgdXAgdGhlaXIgbmFtZS9lbWFpbCwgc2V0IHNv bWUgZGVmYXVsdHMKKwkJCSMganVzdCBmb3IgdGhpcyByZXBvIChvdGhlcndpc2UgdGhlIGNvbW1p dCB3aWxsIGZhaWwgd2l0aCBvbGRlcgorCQkJIyB2ZXJzaW9ucyBvZiBnaXQpCisJCQlpZiAhIGdp dCBjb25maWcgdXNlci5lbWFpbCA+IC9kZXYvbnVsbCA7IHRoZW4KKwkJCQlnaXQgY29uZmlnIC0t bG9jYWwgdXNlci5lbWFpbCAiYnVpbGRoaXN0b3J5QCR7RElTVFJPfSIKKwkJCWZpCisJCQlpZiAh IGdpdCBjb25maWcgdXNlci5uYW1lID4gL2Rldi9udWxsIDsgdGhlbgorCQkJCWdpdCBjb25maWcg LS1sb2NhbCB1c2VyLm5hbWUgImJ1aWxkaGlzdG9yeSIKKwkJCWZpCisJCQkjIENyZWF0ZSBlbXB0 eSBpbnRpYWwgY29tbWl0IG9uIG1hc3RlcgorCQkJaWYgWyAiJHtCVUlMREhJU1RPUllfQlJBTkNI fSIgIT0gIm1hc3RlciIgXSA7IHRoZW4KKwkJCQlnaXQgY29tbWl0IC0tYWxsb3ctZW1wdHkgLW0g ImluaXRpYWwgY29tbWl0IiA+IC9kZXYvbnVsbAorCQkJZmkKKwkJZmkKKwkJIyBDcmVhdGUgdGhl IGJyYW5jaCBpZiBuZWNlc3NhcnkKKwkJaWYgISBnaXQgY2hlY2tvdXQgJHtCVUlMREhJU1RPUllf QlJBTkNIfSA+IC9kZXYvbnVsbCAyPiYxIDsgdGhlbgorCQkJZ2l0IGNoZWNrb3V0IC0tb3JwaGFu ICR7QlVJTERISVNUT1JZX0JSQU5DSH0gPiAvZGV2L251bGwKKwkJCXJtIC1yZiAqCiAJCWVsc2UK IAkJCWdpdCB0YWcgLWYgYnVpbGQtbWludXMtMyBidWlsZC1taW51cy0yID4gL2Rldi9udWxsIDI+ JjEgfHwgdHJ1ZQogCQkJZ2l0IHRhZyAtZiBidWlsZC1taW51cy0yIGJ1aWxkLW1pbnVzLTEgPiAv ZGV2L251bGwgMj4mMSB8fCB0cnVlCiAJCQlnaXQgdGFnIC1mIGJ1aWxkLW1pbnVzLTEgPiAvZGV2 L251bGwgMj4mMSB8fCB0cnVlCiAJCWZpCi0JCSMgSWYgdGhlIHVzZXIgaGFzbid0IHNldCB1cCB0 aGVpciBuYW1lL2VtYWlsLCBzZXQgc29tZSBkZWZhdWx0cwotCQkjIGp1c3QgZm9yIHRoaXMgcmVw byAob3RoZXJ3aXNlIHRoZSBjb21taXQgd2lsbCBmYWlsIHdpdGggb2xkZXIKLQkJIyB2ZXJzaW9u cyBvZiBnaXQpCi0JCWlmICEgZ2l0IGNvbmZpZyB1c2VyLmVtYWlsID4gL2Rldi9udWxsIDsgdGhl bgotCQkJZ2l0IGNvbmZpZyAtLWxvY2FsIHVzZXIuZW1haWwgImJ1aWxkaGlzdG9yeUAke0RJU1RS T30iCi0JCWZpCi0JCWlmICEgZ2l0IGNvbmZpZyB1c2VyLm5hbWUgPiAvZGV2L251bGwgOyB0aGVu Ci0JCQlnaXQgY29uZmlnIC0tbG9jYWwgdXNlci5uYW1lICJidWlsZGhpc3RvcnkiCi0JCWZpCisJ CSMgQ3JlYXRlIGEgbWFjaGluZS1yZWFkYWJsZSBsaXN0IG9mIG1ldGFkYXRhIHJldmlzaW9ucyBm b3IgZWFjaCBsYXllcgorCQljYXQgPiAke0JVSUxESElTVE9SWV9ESVJ9L21ldGFkYXRhLXJldnMg PDxFTkQKKyR7QGJ1aWxkaGlzdG9yeV9nZXRfbWV0YWRhdGFfcmV2cyhkKX0KK0VORAogCQkjIENo ZWNrIGlmIHRoZXJlIGFyZSBuZXcvY2hhbmdlZCBmaWxlcyB0byBjb21taXQgKG90aGVyIHRoYW4g bWV0YWRhdGEtcmV2cykKIAkJcmVwb3N0YXR1cz1gZ2l0IHN0YXR1cyAtLXBvcmNlbGFpbiB8IGdy ZXAgLXYgIiBtZXRhZGF0YS1yZXZzJCJgCiAJCUhPU1ROQU1FPWBob3N0bmFtZSAyPi9kZXYvbnVs bCB8fCBlY2hvIHVua25vd25gCiAJCUNNRExJTkU9IiR7QGJ1aWxkaGlzdG9yeV9nZXRfY21kbGlu ZShkKX0iCisJCSMgQ29tbWl0IGFsbCBvdGhlciBjaGFuZ2VzCiAJCWlmIFsgIiRyZXBvc3RhdHVz IiAhPSAiIiBdIDsgdGhlbgogCQkJZ2l0IGFkZCAtQSAuCisJCQkjIEVuc3VyZSB3ZSBjb21taXQg bWV0YWRhdGEtcmV2cyBmaXJzdAorCQkJYnVpbGRoaXN0b3J5X3NpbmdsZV9jb21taXQgIiRDTURM SU5FIiAiJEhPU1ROQU1FIiAibWV0YWRhdGEtcmV2cyIKIAkJCSMgcG9yY2VsYWluIG91dHB1dCBs b29rcyBsaWtlICI/PyBwYWNrYWdlcy9mb28vYmFyIgotCQkJIyBFbnN1cmUgd2UgY29tbWl0IG1l dGFkYXRhLXJldnMgd2l0aCB0aGUgZmlyc3QgY29tbWl0CiAJCQlmb3IgZW50cnkgaW4gYGVjaG8g IiRyZXBvc3RhdHVzIiB8IGF3ayAne3ByaW50ICQyfScgfCBhd2sgLUYvICd7cHJpbnQgJDF9JyB8 IHNvcnQgfCB1bmlxYCA7IGRvCiAJCQkJYnVpbGRoaXN0b3J5X3NpbmdsZV9jb21taXQgIiRDTURM SU5FIiAiJEhPU1ROQU1FIiAiJGVudHJ5IgogCQkJZG9uZQpAQCAtNjY2LDcgKzY3Nyw3IEBAIEVO RAogCQkJYnVpbGRoaXN0b3J5X3NpbmdsZV9jb21taXQgIiRDTURMSU5FIiAiJEhPU1ROQU1FIgog CQlmaQogCQlpZiBbICIke0JVSUxESElTVE9SWV9QVVNIX1JFUE99IiAhPSAiIiBdIDsgdGhlbgot CQkJZ2l0IHB1c2ggLXEgJHtCVUlMREhJU1RPUllfUFVTSF9SRVBPfQorCQkJZ2l0IHB1c2ggLXEg JHtCVUlMREhJU1RPUllfUFVTSF9SRVBPfSAke0JVSUxESElTVE9SWV9CUkFOQ0h9CiAJCWZpKSB8 fCB0cnVlCiB9CiAKLS0gCjIuNC4zCgo=