Patchwork Remove all build/ prefixes in the build output

login
register
about
Submitter Uwe Hermann
Date 2009-10-28 16:19:13
Message ID <20091028161913.GB22827@greenwood>
Download mbox | patch
Permalink /patch/504/
State Accepted
Headers show

Comments

Uwe Hermann - 2009-10-28 16:19:13
See patch.


Uwe.
Myles Watson - 2009-10-28 16:28:48
On Wed, Oct 28, 2009 at 10:19 AM, Uwe Hermann <uwe@hermann-uwe.de> wrote:

> See patch.
>
Thanks for finding the build I missed.

I'd prefer having "(This may take a while)" on the next line so that it
doesn't wrap.

I prefer
-    print '    SCONFIG     Output File:', os.path.basename(
outputfilename)

over custom splits and joins.

+    print '    SCONFIG   ', join(outputfilename.split('/')[-5:], '/')

Can we go back to os.path.basename?  If so:
Acked-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Myles Watson - 2009-10-28 17:06:02
On Wed, Oct 28, 2009 at 10:28 AM, Myles Watson <mylesgw@gmail.com> wrote:

>
>
> On Wed, Oct 28, 2009 at 10:19 AM, Uwe Hermann <uwe@hermann-uwe.de> wrote:
>
>> See patch.
>>
> Thanks for finding the build I missed.
>
> I'd prefer having "(This may take a while)" on the next line so that it
> doesn't wrap.
>
> I prefer
> -    print '    SCONFIG     Output File:', os.path.basename(
> outputfilename)
>
> over custom splits and joins.
>
> +    print '    SCONFIG   ', join(outputfilename.split('/')[-5:], '/')
>
I can see the point to having part of the path there.  It can help us keep
things in the correct directories.  I keep finding places where we
accidentally put things in the top directory.

Acked-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles

>
Uwe Hermann - 2009-10-28 17:13:05
On Wed, Oct 28, 2009 at 10:28:48AM -0600, Myles Watson wrote:
> Thanks for finding the build I missed.

No problem.


> I'd prefer having "(This may take a while)" on the next line so that it
> doesn't wrap.

Hm? I don't understand what exactly wraps here? It should be one line
only, no wrapping.


> I prefer
> -    print '    SCONFIG     Output File:', os.path.basename(
> outputfilename)
> 
> over custom splits and joins.
> 
> +    print '    SCONFIG   ', join(outputfilename.split('/')[-5:], '/')
> 
> Can we go back to os.path.basename?  If so:

We could, but that's not consistent. This is the output with os.path.basename:

    SCONFIG    config.py
    SCONFIG    static.c
    SCONFIG    static.dot

and this with the splits and joins:

    SCONFIG    mainboard/asus/p2b-f/config.py
    SCONFIG    mainboard/asus/p2b-f/static.c
    SCONFIG    mainboard/asus/p2b-f/static.dot

As we do print the paths (relative to the build dir) for the other
files in the build output, I think we should do that here too.


> Acked-by: Myles Watson <mylesgw@gmail.com>

Thanks, r4880.


Uwe.
Myles Watson - 2009-10-28 17:17:17
> > I'd prefer having "(This may take a while)" on the next line so that it
> > doesn't wrap.
>
> Hm? I don't understand what exactly wraps here? It should be one line
> only, no wrapping.
>
HOSTCC     /home/myles/try/buildrom-devel/work/coreboot/svn/build/romcc
(this may take a while)

Thanks,
Myles
Uwe Hermann - 2009-10-28 18:35:29
On Wed, Oct 28, 2009 at 11:17:17AM -0600, Myles Watson wrote:
> > > I'd prefer having "(This may take a while)" on the next line so that it
> > > doesn't wrap.
> >
> > Hm? I don't understand what exactly wraps here? It should be one line
> > only, no wrapping.
> >
> HOSTCC     /home/myles/try/buildrom-devel/work/coreboot/svn/build/romcc
> (this may take a while)

Ah, that was fixed by the following hunk in my patch:

-       @printf "    HOSTCC     $(obj)/romcc (this may take a while)\n"
+       @printf "    HOSTCC     $(subst $(obj)/,,$(@)) (this may take a while)\n"


Uwe.

Patch

Remove all build/ prefixes in the build output.

Also, remove one missing hardcoded "build" dir in the distclean target,
and clean up files generated by sconfig in 'make clean'.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>

Index: src/arch/i386/Makefile.inc
===================================================================
--- src/arch/i386/Makefile.inc	(Revision 4877)
+++ src/arch/i386/Makefile.inc	(Arbeitskopie)
@@ -31,6 +31,7 @@ 
 	@printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
 	$(CBFSTOOL) $(obj)/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom
 endif
+	@printf "    CBFSPRINT  $(subst $(obj)/,,$(@))\n\n"
 	$(CBFSTOOL) $(obj)/coreboot.rom print
 
 
@@ -38,7 +39,7 @@ 
 # Build the bootblock
 
 $(obj)/coreboot.bootblock: $(obj)/coreboot
-	@printf "    OBJCOPY    $(subst $(shell pwd)/,,$(@))\n"
+	@printf "    OBJCOPY    $(subst $(obj)/,,$(@))\n"
 	$(OBJCOPY) -O binary $< $@
 
 $(obj)/ldscript.ld: $(ldscripts) $(obj)/ldoptions
@@ -55,7 +56,7 @@ 
 	$(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
 
 $(obj)/coreboot: $(initobjs) $(obj)/ldscript.ld
-	@printf "    LINK       $(subst $(shell pwd)/,,$(@))\n"
+	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
 	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs)
 	$(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map
 
@@ -63,27 +64,27 @@ 
 # i386 specific tools
 
 $(obj)/option_table.h $(obj)/option_table.c: $(obj)/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout
-	@printf "    OPTION     $(subst $(shell pwd)/,,$(@))\n"
+	@printf "    OPTION     $(subst $(obj)/,,$(@))\n"
 	$(obj)/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h --option $(obj)/option_table.c
 
 $(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h $(obj)/config.h
-	@printf "    HOSTCC     $(subst $(shell pwd)/,,$(@))\n"
+	@printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
 	$(HOSTCC) $(HOSTCFLAGS) -include $(obj)/config.h $< -o $@
 
 #######################################################################
 # Build the coreboot_ram (stage 2)
 
 $(obj)/coreboot_ram: $(obj)/coreboot_ram.o $(src)/config/coreboot_ram.ld #ldoptions
-	@printf "    CC         $(subst $(shell pwd)/,,$(@))\n"
+	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/config/coreboot_ram.ld $(obj)/coreboot_ram.o
 	$(NM) -n $(obj)/coreboot_ram | sort > $(obj)/coreboot_ram.map
 
 $(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME)
-	@printf "    CC         $(subst $(shell pwd)/,,$(@))\n"
+	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,-\( $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,-\)
 
 $(obj)/coreboot.a: $(objs)
-	@printf "    AR         $(subst $(shell pwd)/,,$(@))\n"
+	@printf "    AR         $(subst $(obj)/,,$(@))\n"
 	rm -f $(obj)/coreboot.a
 	$(AR) cr $(obj)/coreboot.a $(objs)
 
Index: util/sconfig/yapps2.py
===================================================================
--- util/sconfig/yapps2.py	(Revision 4877)
+++ util/sconfig/yapps2.py	(Arbeitskopie)
@@ -710,7 +710,7 @@ 
 	if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py'
 	else: raise "Invalid Filename", outputfilename
 
-    print '    SCONFIG   ', join(outputfilename.split('/')[-5:], '/')
+    print '    SCONFIG   ', join(outputfilename.split('/')[-4:], '/')
 
     DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers
     preparser, postparser = None, None # Code before and after the parser desc
Index: util/sconfig/config.g
===================================================================
--- util/sconfig/config.g	(Revision 4877)
+++ util/sconfig/config.g	(Arbeitskopie)
@@ -886,7 +886,7 @@ 
 
 def writecode(image):
 	filename = os.path.join(img_dir, "static.c")
-	print "    SCONFIG   ", join(filename.split('/')[-5:], '/')
+	print "    SCONFIG   ", join(filename.split('/')[-4:], '/')
 	file = safe_open(filename, 'w+')
 	file.write("#include <device/device.h>\n")
 	file.write("#include <device/pci.h>\n")
@@ -920,7 +920,7 @@ 
 
 def writegraph(image):
 	filename = os.path.join(img_dir, "static.dot")
-	print "    SCONFIG   ", join(filename.split('/')[-5:], '/')
+	print "    SCONFIG   ", join(filename.split('/')[-4:], '/')
 	file = safe_open(filename, 'w+')
 	file.write("digraph devicetree {\n")
 	file.write("	rankdir=LR\n")
Index: util/sconfig/parsedesc.g
===================================================================
--- util/sconfig/parsedesc.g	(Revision 4877)
+++ util/sconfig/parsedesc.g	(Arbeitskopie)
@@ -126,7 +126,7 @@ 
 	if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py'
 	else: raise "Invalid Filename", outputfilename
         
-    print '    SCONFIG   ', join(outputfilename.split('/')[-5:], '/')
+    print '    SCONFIG   ', join(outputfilename.split('/')[-4:], '/')
     
     DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers
     preparser, postparser = None, None # Code before and after the parser desc
Index: util/cbfstool/Makefile.inc
===================================================================
--- util/cbfstool/Makefile.inc	(Revision 4877)
+++ util/cbfstool/Makefile.inc	(Arbeitskopie)
@@ -22,35 +22,35 @@ 
 	mkdir -p $@
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/%.c
-	printf "    HOSTCC     $(subst $(shell pwd)/,,$(@))\n"
+	printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
 	$(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $<
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc
-	printf "    HOSTCXX    $(subst $(shell pwd)/,,$(@))\n"
+	printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
 	$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp
-	printf "    HOSTCXX    $(subst $(shell pwd)/,,$(@))\n"
+	printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
 	$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp
-	printf "    HOSTCXX    $(subst $(shell pwd)/,,$(@))\n"
+	printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
 	$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp
-	printf "    HOSTCXX    $(subst $(shell pwd)/,,$(@))\n"
+	printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
 	$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp
-	printf "    HOSTCXX    $(subst $(shell pwd)/,,$(@))\n"
+	printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
 	$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp
-	printf "    HOSTCXX    $(subst $(shell pwd)/,,$(@))\n"
+	printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
 	$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
 $(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
-	printf "    HOSTCXX    $(subst $(shell pwd)/,,$(@)) (link)\n"
+	printf "    HOSTCXX    $(subst $(obj)/,,$(@)) (link)\n"
 	$(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
 
 endif
Index: Makefile
===================================================================
--- Makefile	(Revision 4877)
+++ Makefile	(Arbeitskopie)
@@ -159,49 +159,49 @@ 
 
 define objs_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define objs_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define initobjs_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define initobjs_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define drivers_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define drivers_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define smmobjs_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define smmobjs_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
 	$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -265,7 +265,7 @@ 
 	test -n "$(alldirs)" && mkdir -p $(alldirs) || true
 
 prepare2:
-	@printf "    GEN        $(subst $(shell pwd)/,,$(obj)/build.h)\n"
+	@printf "    GEN        build.h\n"
 	printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.h
 	printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.h
 	printf "#define COREBOOT_V2 \"$(COREBOOT_V2)\"\n" >> $(obj)/build.h
@@ -294,9 +294,10 @@ 
 	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot
 	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm
 	rmdir -p $(alldirs) 2>/dev/null >/dev/null || true
+	$(MAKE) -C util/sconfig clean
 
 distclean: clean
-	rm -rf build
+	rm -rf $(obj)
 	rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
 
 update:
@@ -311,7 +312,7 @@ 
 	awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@
 
 $(obj)/romcc: $(top)/util/romcc/romcc.c
-	@printf "    HOSTCC     $(obj)/romcc (this may take a while)\n"
+	@printf "    HOSTCC     $(subst $(obj)/,,$(@)) (this may take a while)\n"
 	$(HOSTCC) -g -O2 -Wall -o $@ $<
 
 .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot