[PATCH] backports: catch make in backport template directory

[PATCH] backports: catch make in backport template directory

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

Catch running make in the backport template directory by
checking for the .local-symbols file. If it isn't there
then we're in the input/template directory rather than in
an output tree, give the user a hint about it instead of
keeling over.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 backport/Makefile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/backport/Makefile b/backport/Makefile
index 287b27d..f0c7586 100644
--- a/backport/Makefile
+++ b/backport/Makefile
@@ -37,6 +37,18 @@ mrproper:
 	@rm -f backport-include/backport/autoconf.h
 
 .DEFAULT:
+	@set -e ; test -f .local-symbols || (						\
+	echo "/--------------"								;\
+	echo "| You shouldn't run make in the backports tree, but only in"		;\
+	echo "| the generated output. This here is only the skeleton code"		;\
+	echo "| copied into the output directory. To use the backport system"		;\
+	echo "| from scratch, go into the top-level directoroy and run"			;\
+	echo "|	./gentree.py /path/to/linux-next/ /tmp/output"				;\
+	echo "| and then make menuconfig/... in the output directory. See"		;\
+	echo "|	./gentree.py --help"							;\
+	echo "| for more options."							;\
+	echo "\\--"									;\
+	false)
 	@set -e ; test -f $(KERNEL_CONFIG) || (						\
 	echo "/--------------"								;\
 	echo "| Your kernel headers are incomplete/not installed."			;\
-- 
1.8.0

Re: [PATCH] backports: catch make in backport template directory

[Larry Finger]

On 05/28/2013 03:33 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Catch running make in the backport template directory by
> checking for the .local-symbols file. If it isn't there
> then we're in the input/template directory rather than in
> an output tree, give the user a hint about it instead of
> keeling over.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
>   backport/Makefile | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
>
> diff --git a/backport/Makefile b/backport/Makefile
> index 287b27d..f0c7586 100644
> --- a/backport/Makefile
> +++ b/backport/Makefile
> @@ -37,6 +37,18 @@ mrproper:
>   	@rm -f backport-include/backport/autoconf.h
>
>   .DEFAULT:
> +	@set -e ; test -f .local-symbols || (						\
> +	echo "/--------------"								;\
> +	echo "| You shouldn't run make in the backports tree, but only in"		;\
> +	echo "| the generated output. This here is only the skeleton code"		;\
> +	echo "| copied into the output directory. To use the backport system"		;\
> +	echo "| from scratch, go into the top-level directoroy and run"			;\

=======================================================^ Typo here.

Larry

Re: [PATCH] backports: catch make in backport template directory

[Johannes Berg]

On Tue, 2013-05-28 at 16:13 -0500, Larry Finger wrote:
> On 05/28/2013 03:33 PM, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > Catch running make in the backport template directory by
> > checking for the .local-symbols file. If it isn't there
> > then we're in the input/template directory rather than in
> > an output tree, give the user a hint about it instead of
> > keeling over.
> >
> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> > ---
> >   backport/Makefile | 12 ++++++++++++
> >   1 file changed, 12 insertions(+)
> >
> > diff --git a/backport/Makefile b/backport/Makefile
> > index 287b27d..f0c7586 100644
> > --- a/backport/Makefile
> > +++ b/backport/Makefile
> > @@ -37,6 +37,18 @@ mrproper:
> >   	@rm -f backport-include/backport/autoconf.h
> >
> >   .DEFAULT:
> > +	@set -e ; test -f .local-symbols || (						\
> > +	echo "/--------------"								;\
> > +	echo "| You shouldn't run make in the backports tree, but only in"		;\
> > +	echo "| the generated output. This here is only the skeleton code"		;\
> > +	echo "| copied into the output directory. To use the backport system"		;\
> > +	echo "| from scratch, go into the top-level directoroy and run"			;\
> 
> =======================================================^ Typo here.

Good catch, thanks. Luis, can you just fix that when you apply or do you
want a resend?

johannes

Re: [PATCH] backports: catch make in backport template directory

[Luis R. Rodriguez]

On Tue, May 28, 2013 at 2:34 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Tue, 2013-05-28 at 16:13 -0500, Larry Finger wrote:
>> On 05/28/2013 03:33 PM, Johannes Berg wrote:
>> > From: Johannes Berg <johannes.berg@intel.com>
>> >
>> > Catch running make in the backport template directory by
>> > checking for the .local-symbols file. If it isn't there
>> > then we're in the input/template directory rather than in
>> > an output tree, give the user a hint about it instead of
>> > keeling over.
>> >
>> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> > ---
>> >   backport/Makefile | 12 ++++++++++++
>> >   1 file changed, 12 insertions(+)
>> >
>> > diff --git a/backport/Makefile b/backport/Makefile
>> > index 287b27d..f0c7586 100644
>> > --- a/backport/Makefile
>> > +++ b/backport/Makefile
>> > @@ -37,6 +37,18 @@ mrproper:
>> >     @rm -f backport-include/backport/autoconf.h
>> >
>> >   .DEFAULT:
>> > +   @set -e ; test -f .local-symbols || (                                           \
>> > +   echo "/--------------"                                                          ;\
>> > +   echo "| You shouldn't run make in the backports tree, but only in"              ;\
>> > +   echo "| the generated output. This here is only the skeleton code"              ;\
>> > +   echo "| copied into the output directory. To use the backport system"           ;\
>> > +   echo "| from scratch, go into the top-level directoroy and run"                 ;\
>>
>> =======================================================^ Typo here.
>
> Good catch, thanks. Luis, can you just fix that when you apply or do you
> want a resend?

I've fixed it prior to applying. Thanks, applied and pushed!

  Luis