[PATCHv4,5/8] Config.in: reintroduce BR2_SSH

From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

The BR2_SSH command was removed in commit
db9473bf6cd7bd12aa1f9faad0a917c973c33827 ("core/download: drop the SSH
command") but will be needed again to support 'source-check' for the scp
download backend.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 Config.in               | 4 ++++
 package/pkg-download.mk | 1 +
 2 files changed, 5 insertions(+)

v4: no changes
v3: no changes

Thomas, All,

On 2019-02-15 22:08 +0100, Thomas De Schampheleire spake thusly:
> From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> 
> The BR2_SSH command was removed in commit
> db9473bf6cd7bd12aa1f9faad0a917c973c33827 ("core/download: drop the SSH
> command") but will be needed again to support 'source-check' for the scp
> download backend.

Rather than do a new commit, why did you not use "git revert"?

> Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> ---
>  Config.in               | 4 ++++
>  package/pkg-download.mk | 1 +
>  2 files changed, 5 insertions(+)
> 
> v4: no changes
> v3: no changes
> 
> diff --git a/Config.in b/Config.in
> index d58d8dc04a..91d56907fe 100644
> --- a/Config.in
> +++ b/Config.in
> @@ -136,6 +136,10 @@ config BR2_SCP
>  	string "Secure copy (scp) command"
>  	default "scp"
>  
> +config BR2_SSH
> +	string "Secure shell (ssh) command"
> +	default "ssh"
> +
>  config BR2_HG
>  	string "Mercurial (hg) command"
>  	default "hg"
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index 5384fc2af4..17d1ca99ee 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -15,6 +15,7 @@ export BZR := $(call qstrip,$(BR2_BZR))
>  export GIT := $(call qstrip,$(BR2_GIT))
>  export HG := $(call qstrip,$(BR2_HG))
>  export SCP := $(call qstrip,$(BR2_SCP))
> +export SSH := $(call qstrip,$(BR2_SSH))

To be noted: the commit you are (manually) reverting did not export SSH,
but now you do need to do so, because it will now be used from one of a
download backends, when the original use of SSH was done in Makefile
code.

Regards,
Yann E. MORIN.

>  export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
>  
>  DL_WRAPPER = support/download/dl-wrapper
> -- 
> 2.19.2
>

El sáb., 16 feb. 2019 a las 13:34, Yann E. MORIN
(<yann.morin.1998@free.fr>) escribió:
>
> Thomas, All,
>
> On 2019-02-15 22:08 +0100, Thomas De Schampheleire spake thusly:
> > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> >
> > The BR2_SSH command was removed in commit
> > db9473bf6cd7bd12aa1f9faad0a917c973c33827 ("core/download: drop the SSH
> > command") but will be needed again to support 'source-check' for the scp
> > download backend.
>
> Rather than do a new commit, why did you not use "git revert"?

How does this make a difference when sending patches via email?

The background is that originally this change was put together with
the scp source-check implementation, which was based on the
implementation I had in my work repository, where BR2_SSH was not yet
removed. Only later I split this patch apart and didn't think of using
'git revert'.

>
> > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> > ---
> >  Config.in               | 4 ++++
> >  package/pkg-download.mk | 1 +
> >  2 files changed, 5 insertions(+)
> >
> > v4: no changes
> > v3: no changes
> >
> > diff --git a/Config.in b/Config.in
> > index d58d8dc04a..91d56907fe 100644
> > --- a/Config.in
> > +++ b/Config.in
> > @@ -136,6 +136,10 @@ config BR2_SCP
> >       string "Secure copy (scp) command"
> >       default "scp"
> >
> > +config BR2_SSH
> > +     string "Secure shell (ssh) command"
> > +     default "ssh"
> > +
> >  config BR2_HG
> >       string "Mercurial (hg) command"
> >       default "hg"
> > diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> > index 5384fc2af4..17d1ca99ee 100644
> > --- a/package/pkg-download.mk
> > +++ b/package/pkg-download.mk
> > @@ -15,6 +15,7 @@ export BZR := $(call qstrip,$(BR2_BZR))
> >  export GIT := $(call qstrip,$(BR2_GIT))
> >  export HG := $(call qstrip,$(BR2_HG))
> >  export SCP := $(call qstrip,$(BR2_SCP))
> > +export SSH := $(call qstrip,$(BR2_SSH))
>
> To be noted: the commit you are (manually) reverting did not export SSH,
> but now you do need to do so, because it will now be used from one of a
> download backends, when the original use of SSH was done in Makefile
> code.

Yes indeed, that is true.

Best regards,
Thomas

Thomas, All,

On 2019-02-16 22:23 +0100, Thomas De Schampheleire spake thusly:
> El sáb., 16 feb. 2019 a las 13:34, Yann E. MORIN
> (<yann.morin.1998@free.fr>) escribió:
> > On 2019-02-15 22:08 +0100, Thomas De Schampheleire spake thusly:
> > > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> > >
> > > The BR2_SSH command was removed in commit
> > > db9473bf6cd7bd12aa1f9faad0a917c973c33827 ("core/download: drop the SSH
> > > command") but will be needed again to support 'source-check' for the scp
> > > download backend.
> >
> > Rather than do a new commit, why did you not use "git revert"?
> 
> How does this make a difference when sending patches via email?

git-revert prepares the git commit with appropriate information about
the revert:

    Revert "core/download: drop the SSH command"

    This reverts commit db9473bf6cd7bd12aa1f9faad0a917c973c33827.

And then you can amend the commit log to explain why it is reverted.

> The background is that originally this change was put together with
> the scp source-check implementation, which was based on the
> implementation I had in my work repository, where BR2_SSH was not yet
> removed. Only later I split this patch apart and didn't think of using
> 'git revert'.

OK, that explains it.

> > > +export SSH := $(call qstrip,$(BR2_SSH))
> > To be noted: the commit you are (manually) reverting did not export SSH,
> > but now you do need to do so, because it will now be used from one of a
> > download backends, when the original use of SSH was done in Makefile
> > code.
> Yes indeed, that is true.

And hence, as you are not reinstating the code exactly as it was prior
to the "reverted" commit, that should have been part of the commit log.

Anyway:

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.