> -----Original Message----- > From: Alexander Kanavin <[email protected]> > Sent: den 17 februari 2026 14:14 > To: Peter Kjellerstedt <[email protected]> > Cc: [email protected]; Ross Burton > <[email protected]>; Richard Purdie <[email protected]> > Subject: Re: [OE-core] [PATCHv2 5/5] lib/oe/patch: Use git notes to store the > filenames for the patches > > On Mon, 19 Feb 2024 at 02:28, Peter Kjellerstedt > <[email protected]> wrote: > > + target_branch = revs[os.path.relpath(path, srctree)] > > + > > + # There is a bug (or feature?) in git rebase where if a commit > > with > > + # a note is fully rebased away by being part of an old commit, > > the > > + # note is still attached to the old commit. Avoid this by > > making > > + # sure all old devtool related commits have a note attached to > > them > > + # (this assumes git config notes.rewriteMode is set to ignore). > > + (stdout, _) = __run('git rev-list devtool-base..%s' % > > target_branch) > > + for rev in stdout.splitlines(): > > + if not oe.patch.GitApplyTree.getNotes(path, rev): > > + oe.patch.GitApplyTree.addNote(path, rev, "dummy") > > + > > I've been wondering why devtool version upgrades in recipes that fetch > from git are taking significantly longer than they used to, and this > loop is basically the reason. It attaches a note to every commit > between the old and the new version tag in the upstream tree, and if > there's many such commits, it can take minutes, or hours. Things came > to a head in the most recent AUH run, which had tried to update > binutils, and was stopped on timeout after some 5 hours or so: > > INFO: > binutils-testsuite,binutils-cross-x86_64,binutils-crosssdk-x86_64-pokysdk-linux,binutils-cross-canadian-x86-64,binutils: > Running 'devtool upgrade' ... > command timed out: 16200 seconds without output running > [b'/srv/pokybuild/yocto-worker/auh/yocto-autobuilder-helper/scripts/run-config', > b'auh', b'/srv/pokybuild/yocto-worker/auh/build/build', b'master', > b'ssh://[email protected]/poky', b'--sstateprefix', b'', > b'--buildappsrcrev', b'', b'--publish-dir', b'', b'--build-type', > b'quick', b'--workername', b'alma8-vk-2', b'--build-url', > b'https://autobuilder.yoctoproject.org/valkyrie/#/builders/38/builds/54', > b'--results-dir', > b'/srv/autobuilder/valkyrie.yocto.io/pub/non-release/20260215-30/testresults', > b'--quietlogging', b'--stepname', b'cmds', b'--phase', b'2'], > attempting to kill > process killed by signal 9 > > I'm not exactly sure what issue is being avoided here, but we can't do > it like that. I'm going to try and drop this code and see what breaks > in 'oe-selftest -r devtool', but if you can help out and come up with > the right fix, that would be very welcome. > > Reproducer in oe-core master: > devtool upgrade systemd-systemctl-native -V 259.1 -S > 6a36f1c7420dcb8e5176796676047f058466fe7a > > Alex
This was two years ago, so unfortunately I do not remember the exact circumstances. I have tried to recreate the problem based on the comment in the code above, but I have not been able to do it. This may be due to the version of Git that I am using now, compared to what I had two years ago. However, I also tried it on my old computer that I used when I made the change above, and which I believe still has the same version of Git as it did back then. Unfortunately, I still was not able to reproduce the problem. :( So either I suck at writing comments describing problems, or I suck at understanding them later... I also tried to figure out what (bad) consequences there would be if a note is attached to an old commit during the rebase, but I really can't come up with anything. At worst it would be a little annoying when doing git log. However, I can't see that it would affect the functionality of devtool in any way. So based on the above, it is probably ok to remove the code that sets and removes the dummy notes. //Peter
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#231281): https://lists.openembedded.org/g/openembedded-core/message/231281 Mute This Topic: https://lists.openembedded.org/mt/104439182/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
