[PATCH] Do not rm the path from pbl-y target

[PATCH] Do not rm the path from pbl-y target

[zzs213]

From: 张忠山 <zzs213@126.com>

Whan add some obj in a subdir to lwl-y or pbl-y, like this:

    lwl-y += subdir/test.o other.o

the make process failed:

    make[2]: *** No rule to make target 'arch/arm/boards/boardname/test.o', \
        needed by 'arch/arm/boards/boardname/built-in-pbl.o'.  Stop.

Note, there are not the part "subdir" in the path of the test.o.

this patch fix this

Signed-off-by: 张忠山 <zzs213@126.com>
---
 scripts/Makefile.lib | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 27365d8..73b9c57 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -39,10 +39,9 @@ endif
 obj-y		+= $(obj-pbl-y)
 pbl-y		+= $(obj-pbl-y)
 
-# for non dirs add pbl- prefix to the target
-# so we recompile the source with custom flags and custom quiet
-__pbl-y		:= $(notdir $(pbl-y))
-pbl-y		:= $(patsubst %.o,pbl-%.o,$(__pbl-y))
+# add pbl- prefix to the target
+pbl-y		:= $(shell echo $(pbl-y) | sed -e 's%\(\([^ \t]\+/\)*\)\([^ \t]*.o\)%\2pbl-\3%g')
+
 # add subdir from $(obj-y) too so we do not need to have the dir define in
 # both $(obj-y) and $(pbl-y)
 __pbl-y		:= $(filter-out $(pbl-y), $(filter %/, $(obj-y)))
-- 
1.9.1



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] Do not rm the path from pbl-y target

[Sascha Hauer]

On Sat, Jun 25, 2016 at 11:35:59AM +0800, zzs213@126.com wrote:
> From: 张忠山 <zzs213@126.com>
> 
> Whan add some obj in a subdir to lwl-y or pbl-y, like this:
> 
>     lwl-y += subdir/test.o other.o
> 
> the make process failed:
> 
>     make[2]: *** No rule to make target 'arch/arm/boards/boardname/test.o', \
>         needed by 'arch/arm/boards/boardname/built-in-pbl.o'.  Stop.
> 
> Note, there are not the part "subdir" in the path of the test.o.
> 
> this patch fix this
> 
> Signed-off-by: 张忠山 <zzs213@126.com>
> ---
>  scripts/Makefile.lib | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 27365d8..73b9c57 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -39,10 +39,9 @@ endif
>  obj-y		+= $(obj-pbl-y)
>  pbl-y		+= $(obj-pbl-y)
>  
> -# for non dirs add pbl- prefix to the target
> -# so we recompile the source with custom flags and custom quiet
> -__pbl-y		:= $(notdir $(pbl-y))
> -pbl-y		:= $(patsubst %.o,pbl-%.o,$(__pbl-y))
> +# add pbl- prefix to the target
> +pbl-y		:= $(shell echo $(pbl-y) | sed -e 's%\(\([^ \t]\+/\)*\)\([^ \t]*.o\)%\2pbl-\3%g')
> +
>  # add subdir from $(obj-y) too so we do not need to have the dir define in
>  # both $(obj-y) and $(pbl-y)
>  __pbl-y		:= $(filter-out $(pbl-y), $(filter %/, $(obj-y)))
> -- 
> 1.9.1
> 
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] Do not rm the path from pbl-y target

[Sascha Hauer]

On Sat, Jun 25, 2016 at 11:35:59AM +0800, zzs213@126.com wrote:
> From: 张忠山 <zzs213@126.com>
> 
> Whan add some obj in a subdir to lwl-y or pbl-y, like this:
> 
>     lwl-y += subdir/test.o other.o
> 
> the make process failed:
> 
>     make[2]: *** No rule to make target 'arch/arm/boards/boardname/test.o', \
>         needed by 'arch/arm/boards/boardname/built-in-pbl.o'.  Stop.
> 
> Note, there are not the part "subdir" in the path of the test.o.
> 
> this patch fix this
> 
> Signed-off-by: 张忠山 <zzs213@126.com>
> ---
>  scripts/Makefile.lib | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 27365d8..73b9c57 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -39,10 +39,9 @@ endif
>  obj-y		+= $(obj-pbl-y)
>  pbl-y		+= $(obj-pbl-y)
>  
> -# for non dirs add pbl- prefix to the target
> -# so we recompile the source with custom flags and custom quiet
> -__pbl-y		:= $(notdir $(pbl-y))
> -pbl-y		:= $(patsubst %.o,pbl-%.o,$(__pbl-y))
> +# add pbl- prefix to the target
> +pbl-y		:= $(shell echo $(pbl-y) | sed -e 's%\(\([^ \t]\+/\)*\)\([^ \t]*.o\)%\2pbl-\3%g')
> +

I had to revert this one. The regular expression seems to be wrong. It
breaks omap3530_beagle_defconfig with:

make[2]: *** No rule to make target 'arch/arm/mach-omap/opbl-map3_clock.o', needed by 'arch/arm/mach-omap/built-in-pbl.o'.  Stop.
make[2]: *** Waiting for unfinished jobs....

Instead of pbl-omap3_clock.o it tries to generate opbl-map3_clock.o.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] Do not rm the path from pbl-y target

[张忠山]

>
> I had to revert this one. The regular expression seems to be wrong. It
> breaks omap3530_beagle_defconfig with:
>
> make[2]: *** No rule to make target 'arch/arm/mach-omap/opbl-map3_clock.o', needed by 'arch/arm/mach-omap/built-in-pbl.o'.  Stop.
> make[2]: *** Waiting for unfinished jobs....
>
> Instead of pbl-omap3_clock.o it tries to generate opbl-map3_clock.o.
>
> Sascha
>

Yes, the regular expression wrong, The flowwing patch should work.


-----------------------------------8<-----------------------------
 From 3b1fd574b0e847ce3333b9e0961ec454f975e1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BF=A0=E5=B1=B1?= <zzs213@126.com>
Date: Fri, 24 Jun 2016 19:33:56 +0800
Subject: [PATCH] Do not rm the path from pbl-y target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Whan add some obj in a subdir to lwl-y or pbl-y, like this:

     lwl-y += subdir/test.o other.o

the make process failed:

     make[2]: *** No rule to make target 
'arch/arm/boards/boardname/test.o', \
         needed by 'arch/arm/boards/boardname/built-in-pbl.o'.  Stop.

Note, there are not the part "subdir" in the path of the test.o.

this patch fix this

Signed-off-by: 张忠山 <zzs213@126.com>
---
  scripts/Makefile.lib | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 27365d8..e55bc27 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -39,10 +39,9 @@ endif
  obj-y		+= $(obj-pbl-y)
  pbl-y		+= $(obj-pbl-y)

-# for non dirs add pbl- prefix to the target
-# so we recompile the source with custom flags and custom quiet
-__pbl-y		:= $(notdir $(pbl-y))
-pbl-y		:= $(patsubst %.o,pbl-%.o,$(__pbl-y))
+# add pbl- prefix to the target
+pbl-y		:= $(shell echo $(pbl-y) | sed -e 's%\(\([^ \t]\+/\)*\)\([^ 
\t]*\.o\)%\2pbl-\3%g')
+
  # add subdir from $(obj-y) too so we do not need to have the dir define in
  # both $(obj-y) and $(pbl-y)
  __pbl-y		:= $(filter-out $(pbl-y), $(filter %/, $(obj-y)))
-- 
1.9.1



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] Do not rm the path from pbl-y target

[Sascha Hauer]

On Tue, Jun 28, 2016 at 04:27:56PM +0800, 张忠山 wrote:
> >
> >I had to revert this one. The regular expression seems to be wrong. It
> >breaks omap3530_beagle_defconfig with:
> >
> >make[2]: *** No rule to make target 'arch/arm/mach-omap/opbl-map3_clock.o', needed by 'arch/arm/mach-omap/built-in-pbl.o'.  Stop.
> >make[2]: *** Waiting for unfinished jobs....
> >
> >Instead of pbl-omap3_clock.o it tries to generate opbl-map3_clock.o.
> >
> >Sascha
> >
> 
> Yes, the regular expression wrong, The flowwing patch should work.

Ok, thanks. Let's go with this one then.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox