The buld fails with the following error :
ERROR: Fetcher failure: Unable to find revision c8b20a46b9ea107d348901379bcc0f13b65f3bc9 in branch socfpga-3.10-ltsi even from upstream
My guess is that the revision has changed. How can I resolve this issue?
It looks as though someone has rebased the branch in the altera-opensource repository, without realising that this would invalidate every other copy of the branch and every reference to commits in it. That is why rebasing a public branch is a bad idea.
~/git/altera-opensource/linux-socfpga]$ git checkout socfpga-3.10-ltsi
Checking out files: 100% (41754/41754), done.
Switched to branch 'socfpga-3.10-ltsiā
Your branch and āorigin/socfpga-3.10-ltsiā have diverged,
and have 2993 and 5659 different commits each, respectively.
(use āgit pullā to merge the remote branch into yours)
ā¦
CONFLICT (content): Merge conflict in drivers/usb/host/xhci.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hub.c
CONFLICT (content): Merge conflict in drivers/usb/core/hub.c
ā¦ etc ā¦
CONFLICT (content): Merge conflict in Makefile
PRobably Altera need to fix this and push the old branch back to their public repo. However in the meantime, the new hash for the that commit seems to be 7cfdf39f38347bfc1859b430498799e79c365d56
(note, I found that by grepping the log, I havenāt checked for any other changes in the tree that might cause problems).
Is there any way this can be fixed on user side? I was not able to find the original hash in any config file, so I donāt know where to change this to the new hash.
Iām getting frustrated, this is the fourth release Iām trying to build and all of them have some problems somewhere.
Hopefully you still have the ORIG_HEAD tag mentioned in the article, and havenāt done any further merges or rebases since. Otherwise look at the processes involving reflogs. Iād make sure to take a backup and try it first, of course.
Where exactly you need to do this will probably depend on whether the problem arose by working direct on the public repository, or on an in-house repo that got pushed to the public one.
Tobias, as I look at those instructions I think you should be able to use git to find the recipe involved. Do āgit grep c8b20a46b9ea107d348901379bcc0f13b65f3bc9ā in each of the poky directory, the meta-altera and meta-linaro directories. I expect it will be in meta-altera but worth checking them all. Iām using another vendor repo based on another branch, so donāt have the same view as you do.