Hi Jani,

On Tue, Feb 27, 2024 at 10:29:01AM +0200, Jani Nikula wrote:
> On Tue, 27 Feb 2024, Maxime Ripard <mrip...@redhat.com> wrote:
> > Hi,
> >
> > Sima, after becoming aware of the drm-misc transition to Gitlab in the
> > next couple of weeks, to do the same for DRM today.
> >
> > This is now done and all the various bits (nightly.conf, MAINTAINERS,
> > doc, etc.) should be there.
> >
> > If all goes well, the only thing you'll notice is that dim will complain
> > about the drm remote not having the right URLs.
> >
> > Any dim user should update the URL with either one of the two following
> > commands:
> >
> > git remote set-url drm ssh://g...@gitlab.freedesktop.org/drm/kernel.git
> > git remote set-url drm https://gitlab.freedesktop.org/drm/kernel.git
> >
> > And the rest should be transparent.
> 
> Except it isn't. If you do that before updating to new nightly.conf,
> it'll complain that the URL it sees in the old config isn't available,
> and prompts.
> 
> If you first do 'dim ub', and then do 'dim ub' again, before changing
> the URL, it'll also prompt, but it's unable to override the existing drm
> remote.

Urgh, you're right... It's also partly due to drm-tip being the last
repo to be updated. I've overlooked that aspect since I had the local
changes to nightly.conf.

> I think dim should be updated to handle all of this without user
> manually doing anything other than answering a yes/no prompt.

I've started to work on that, but it's probably going to take a bit of
time to figure it out, bash isn't really my strong suit.

If anyone is stuck with this, you can get unstuck manually by doing:

cd $DIM_PREFIX/drm-rerere
git checkout rerere-cache
git pull

cd $DIM_PREFIX/kernel
git remote set-url drm ...

There's been reports in private that some didn't get their branch
updated for some time and will have to add the drm/xe repo too:

git remote add drm-xe ssh://g...@gitlab.freedesktop.org/drm/xe/kernel.git

Maxime

Attachment: signature.asc
Description: PGP signature

Reply via email to