On 12/21/22 16:08, Edward Sanford Sutton, III wrote:
On 12/21/22 05:56, Per olof Ljungmark wrote:
I am facing the same issue as in
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268492
or possibly
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267421
with a T490 laptop.
Can someone please help with the git command to fetch an earlier
version, for example the one for the amd64 December 9th. snapshot?
If you already have a checkout of stable/13, you made no local
changes, you don't share that repo with anyone, and wanted to roll it
back to a76fa7bb6cb721bcccc257ddbc4398d25dc8def8 which came 2022-12-08
01:18:32 +0000 just before a linuxkpi patch:
git reset --hard a76fa7bb6cb721bcccc257ddbc4398d25dc8def8
When you want to return to the previous state you can run:
git merge
I thought --soft should work or excluding that parameter entirely to
change your tree to that commit and that --hard destroys records of
future commits from your git tree but that doesn't seem to be the case.
You could also create another branch and revert just select commits
from it so you can otherwise include useful changes (presuming they do
not also depend on the reverted changes).
Depending on the issue, there may be other commits involved so
rolling back even further may be relevant. I thought I followed things
from the new commits descriptions and emails here and what they were
trying to undo to lead to undoing a patch from October 12th that altered
ABI compatibility from 13.0.
There have been several changes related to accidentally breaking ABI
then trying to restore it. If you want to use recompiled packages then
you need the ABI restored. If you build your own then you can get code
after the breakage though code that later restores it will break
relevant kernel modules which will need to be recompiled again after it
is properly restored to 13.0 compatibility.
You could browse commits by executing `git log` which has many
parameters that help filter its output and that is also viewable at
https://cgit.freebsd.org/src/log/?h=stable/13 where commit messages are
clickable links; the end of the address of each of those links is
&id=... where ... is the commit hash you can use to restore to that
commit; make sure you grab something older than the commit that brought
on your issues.
If you want to locate commits that impacted 1 file, you can use
something like:
git log sys/compat/linuxkpi/common/include/linux/rbtree.h
Instead of
git clone -b stable/13 --depth 1 https://git.freebsd.org/src.git /usr/src
(this of course if the issue is not already fixed with current 13-STABLE)
Thanks,
Per
Thank you for your most helpful answer.
https://cgit.freebsd.org/src/commit/?h=stable/13&id=9d4303dbe2c4a901418657ed09c9f7096756e8b3
seems to have fixed the issue, just rebuilt the system with fresh source
and kldloaded i915kms and it works.
People ask me why I use FreeBSD for everything from servers to laptops.
Well, because It Just Works(tm). And if it does not and you do not
understand exactly why, you get kind help to fix it.
It simply makes you sleep better at night.
Merry Christmas,
Per
