On Sat, Aug 31, 2019 at 05:29:35PM +0200, Daniel Vetter wrote:
> On Fri, Aug 30, 2019 at 5:44 PM Ayan Halder <[email protected]> wrote:
> >
> > On Fri, Aug 30, 2019 at 04:52:41PM +0200, Daniel Vetter wrote:
> > > On Fri, Aug 30, 2019 at 12:04 PM Ayan Halder <[email protected]> wrote:
> > > >
> > > > Currently, dim_update_branches fails because
> > > > $DIM_PREFIX/maintainer-tools is
> > > > not present. It should be created and cloned from
> > > > ${maintainer_tools_https}
> > > >
> > > > Signed-off-by: Ayan Kumar Halder <[email protected]>
> > >
> > > How did you get there without running dim setup first? That should be
> > > done there, and it's not the only thing missing. I thought we even
> > > catch this at startup to make sure people dont get surprises ...
> > > -Daniel
> > >
> >
> > When I run 'dim setup' (without this patch), I do get the following error.
> >
> > ayahal01@e113505-lin:/data/mainline_kernel/upstream$ ls
> > drm-rerere drm-tip src
> > ayahal01@e113505-lin:/data/mainline_kernel/upstream$
> > /data/mainline_kernel/dim/drm-tip/dim setup
> > fatal: cannot change to 'maintainer-tools': No such file or directory
> > dim: No maintainer-tools git checkout found in 'maintainer-tools'.
> > dim: dim update will not work. Please fix.
> > Setting up drm-rerere ...
> > Setting up drm-tip ...
> > Fetching sound-upstream (local remote sound)... Done.
> > Fetching drm-intel... Done.
> > Fetching drm... Done.
> > Fetching drm-tip... Done.
> > Fetching drm-misc... Done.
> > Fetching linux-upstream (local remote origin)... Done.
> > Fetching drm-amd... Done.
> > /data/mainline_kernel/dim/drm-tip/dim: line 2159: cd:
> > /data/mainline_kernel/upstream/maintainer-tools: No such file or
> > directory
> >
> > I assume 'git clone' for $maintainer_tools_https is missing in the
> > setup, though I might be mistaken.
>
> Hm I thought we switched over to "just clone the gitlab repo to get
> started" with
>
> commit 2e9ddb93dac994c7367d2e44d7939c63f780f240
> Author: Jani Nikula <[email protected]>
> Date: Fri Jan 11 14:36:48 2019 +0200
>
> dim: don't setup maintainer-tools as aux checkout
>
> but that doesn't seem to be reflected in documentation. I thought
> we've fixed that ... Jani, any ideas?
> -Daniel
>
The dim script is broken and neither the documentation nor the commit
log explains how to do a proper setup.
Can we revert the above mentioned commit if that could fix the things
?
>
> >
> > > > ---
> > > > dim | 5 +++++
> > > > 1 file changed, 5 insertions(+)
> > > >
> > > > diff --git a/dim b/dim
> > > > index 70262b60d513..870ab9d8e371 100755
> > > > --- a/dim
> > > > +++ b/dim
> > > > @@ -2156,6 +2156,11 @@ function dim_update_branches
> > > > fi
> > > > done
> > > >
> > > > + if [ ! -d $DIM_PREFIX/maintainer-tools ]; then
> > > > + mkdir -p $DIM_PREFIX/maintainer-tools
> > > > + git clone $maintainer_tools_https
> > > > $DIM_PREFIX/maintainer-tools
> > > > + fi
> > > > +
> > > > cd $DIM_PREFIX/maintainer-tools
> > > > if git_is_current_branch master || git_is_current_branch
> > > > maintainer-tools; then
> > > > echo "Updating maintainer-tools..."
> > > > --
> > > > 2.21.0
> > > >
> > > > IMPORTANT NOTICE: The contents of this email and any attachments are
> > > > confidential and may also be privileged. If you are not the intended
> > > > recipient, please notify the sender immediately and do not disclose the
> > > > contents to any other person, use it for any purpose, or store or copy
> > > > the information in any medium. Thank you.
> > > > _______________________________________________
> > > > dim-tools mailing list
> > > > [email protected]
> > > > https://lists.freedesktop.org/mailman/listinfo/dim-tools
> > >
> > >
> > >
> > > --
> > > Daniel Vetter
> > > Software Engineer, Intel Corporation
> > > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> dim-tools mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dim-tools
_______________________________________________
dim-tools mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dim-tools
