[PATCH 1/1] scripts/package/Makefile: compare objtree with srctree instead of test KBUILD_OUTPUT

[PATCH 1/1] scripts/package/Makefile: compare objtree with srctree instead of test KBUILD_OUTPUT

[Bin Wang]

KBUILD_OUTPUT is always empty here, so it is useless to test it. But
while use O=.., objtree and srctree will be different. I compare them
instead.

Signed-off-by: Bin Wang <wbin00@gmail.com>
---
 scripts/package/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 87bf080..d7b3285 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -36,7 +36,7 @@ $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
 	$(CONFIG_SHELL) $(MKSPEC) > $@
 
 rpm-pkg rpm: $(objtree)/kernel.spec FORCE
-	@if test -n "$(KBUILD_OUTPUT)"; then \
+	@if test "$(objtree)" != "$(srctree)"; then \
 		echo "Building source + binary RPM is not possible outside the"; \
 		echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \
 		echo "binrpm-pkg target instead."; \
-- 
1.8.1.4

Re: [PATCH 1/1] scripts/package/Makefile: compare objtree with srctree instead of test KBUILD_OUTPUT

[Bin Wang]

Hi, Michal

Is there any comments on this?

2013/2/25 Bin Wang <wbin00@gmail.com>:
> KBUILD_OUTPUT is always empty here, so it is useless to test it. But
> while use O=.., objtree and srctree will be different. I compare them
> instead.
>
> Signed-off-by: Bin Wang <wbin00@gmail.com>
> ---
>  scripts/package/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/package/Makefile b/scripts/package/Makefile
> index 87bf080..d7b3285 100644
> --- a/scripts/package/Makefile
> +++ b/scripts/package/Makefile
> @@ -36,7 +36,7 @@ $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
>         $(CONFIG_SHELL) $(MKSPEC) > $@
>
>  rpm-pkg rpm: $(objtree)/kernel.spec FORCE
> -       @if test -n "$(KBUILD_OUTPUT)"; then \
> +       @if test "$(objtree)" != "$(srctree)"; then \
>                 echo "Building source + binary RPM is not possible outside the"; \
>                 echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \
>                 echo "binrpm-pkg target instead."; \
> --
> 1.8.1.4
>

Re: [PATCH 1/1] scripts/package/Makefile: compare objtree with srctree instead of test KBUILD_OUTPUT

[Michal Marek]

On Thu, Mar 14, 2013 at 09:30:32AM +0800, Bin Wang wrote:
> Hi, Michal
> 
> Is there any comments on this?

Sorry, I missed this one. I applied it to kbuild.git#misc now.

Michal
> 
> 2013/2/25 Bin Wang <wbin00@gmail.com>:
> > KBUILD_OUTPUT is always empty here, so it is useless to test it. But
> > while use O=.., objtree and srctree will be different. I compare them
> > instead.
> >
> > Signed-off-by: Bin Wang <wbin00@gmail.com>
> > ---
> >  scripts/package/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/package/Makefile b/scripts/package/Makefile
> > index 87bf080..d7b3285 100644
> > --- a/scripts/package/Makefile
> > +++ b/scripts/package/Makefile
> > @@ -36,7 +36,7 @@ $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
> >         $(CONFIG_SHELL) $(MKSPEC) > $@
> >
> >  rpm-pkg rpm: $(objtree)/kernel.spec FORCE
> > -       @if test -n "$(KBUILD_OUTPUT)"; then \
> > +       @if test "$(objtree)" != "$(srctree)"; then \
> >                 echo "Building source + binary RPM is not possible outside the"; \
> >                 echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \
> >                 echo "binrpm-pkg target instead."; \
> > --
> > 1.8.1.4
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html