Re: [Intel-gfx] drm-intel split-up and new dim script
Ok, transition is over, old drm-intel-nightly and rerere-cache is removed. I hope that's enough of a hint to everyone else who missed the memo ;-) -Daniel On Thu, Nov 24, 2016 at 11:48:47AM +0100, Daniel Vetter wrote: > Hi all, > > So it's finally done, drm-misc is split out into a separate repo: > > https://cgit.freedesktop.org/drm-misc > > The integration tree and rerere-cache was also split out, so that both > groups can update it: > > https://cgit.freedesktop.org/drm-tip > > To get there you need to update dim and re-run the setup steps: > > 1. Grab latest dim (if you have already, just update the maintainer-tools > checkout) and store it somewhere temporarily. 2. Delete the old auxiliary > directories: > > $ cd $DIM_PREFIX $ rm drm-intel-rerere drm-intel-nightly maintainer-tools > -Rf > > 3. Make sure you have a recent enough git with worktree support. It's not > required, but if you have one it's automatically used, and it save a pile > of disk space. > > 4. Re-run > > $ dim setup > > Note that for those who start fresh with dim, there's manpages and > quickstart guides in dim itself, just run > > $ dim help > > from a checkout of the maintainer-tools branch from > > https://cgit.freedesktop.org/drm-intel > > Or take a look at > https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-intel.html > > For drm-misc the new branch is drm-misc-next, topic/drm-misc is dead > effective immediate (and I'll ping people on irc who still push patches). > The other tree that changes is drm-intel-nightly, new drm-tip, and I plan > to keep both places roughly in sync for at least a week. > > Cheers, Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] drm-intel split-up and new dim script
On Thu, Nov 24, 2016 at 11:48 AM, Daniel Vetterwrote: > $ cd $DIM_PREFIX $ rm drm-intel-rerere drm-intel-nightly maintainer-tools > -Rf If you are using git worktree already (manually set up, dim only does this since today) then there's a bit more cleanup required: $ cd $DIM_PREFIX/DIM_DRM_INTEL $ git worktree prune $ git branch -D drm-intel-nightly $ git branch -D rerere-cache The last one is important since otherwise your rerere-cache points at the wrong remote - that also switched to drm-tip.git. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] drm-intel split-up and new dim script
On Thu, 24 Nov 2016, Daniel Vetterwrote: > To get there you need to update dim and re-run the setup steps: Perhaps needless to say, but please report any hickups you see immediately on IRC and/or in reply to this mail! Thanks, Jani. -- Jani Nikula, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] drm-intel split-up and new dim script
Hi all, So it's finally done, drm-misc is split out into a separate repo: https://cgit.freedesktop.org/drm-misc The integration tree and rerere-cache was also split out, so that both groups can update it: https://cgit.freedesktop.org/drm-tip To get there you need to update dim and re-run the setup steps: 1. Grab latest dim (if you have already, just update the maintainer-tools checkout) and store it somewhere temporarily. 2. Delete the old auxiliary directories: $ cd $DIM_PREFIX $ rm drm-intel-rerere drm-intel-nightly maintainer-tools -Rf 3. Make sure you have a recent enough git with worktree support. It's not required, but if you have one it's automatically used, and it save a pile of disk space. 4. Re-run $ dim setup Note that for those who start fresh with dim, there's manpages and quickstart guides in dim itself, just run $ dim help from a checkout of the maintainer-tools branch from https://cgit.freedesktop.org/drm-intel Or take a look at https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-intel.html For drm-misc the new branch is drm-misc-next, topic/drm-misc is dead effective immediate (and I'll ping people on irc who still push patches). The other tree that changes is drm-intel-nightly, new drm-tip, and I plan to keep both places roughly in sync for at least a week. Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx