[U-Boot-Users] [Patch] Creation of version_autogenerated.h only triggered for new and different contents...
Hi,
below a simple patch for the make rule, which creates the version_autogenerated.h file. Instead of just updating this file any time make is started, now the file is checked for different contents. If it differs, the version header is updated, otherwise not.
This saves unnessesary rebuilds of several files in the tree.
Regards Carsten
---------
diff --git a/Makefile b/Makefile index c52b21b..7999870 100755 --- a/Makefile +++ b/Makefile @@ -290,11 +290,13 @@ $(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
version: - @echo -n "#define U_BOOT_VERSION "U-Boot " > $(VERSION_FILE); \ - echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE); \ + @echo -n "#define U_BOOT_VERSION "U-Boot " > $(VERSION_FILE).tmp; \ + echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE).tmp; \ echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \ - $(TOPDIR)) >> $(VERSION_FILE); \ - echo """ >> $(VERSION_FILE) + $(TOPDIR)) >> $(VERSION_FILE).tmp; \ + echo """ >> $(VERSION_FILE).tmp + @diff --brief $(VERSION_FILE) $(VERSION_FILE).tmp || cp $(VERSION_FILE).tmp $(VERSION_FILE) + @rm $(VERSION_FILE).tmp
gdbtools: $(MAKE) -C tools/gdb all || exit 1
On Friday 29 June 2007, Carsten Schlote wrote:
below a simple patch for the make rule, which creates the version_autogenerated.h file. Instead of just updating this file any time make is started, now the file is checked for different contents. If it differs, the version header is updated, otherwise not.
This saves unnessesary rebuilds of several files in the tree.
your e-mail client munged the patch ... but ignoring that, ive posted a patch for this issue before, but no one seems to respond http://article.gmane.org/gmane.comp.boot-loaders.u-boot/29424 -mike
Hi
for this issue before, but no one seems to respond
That's my problem as well :-( And this is just one of many trivial changes that could be done to improve things...
Maybe we should wait for u2boot and check if this development handles things correctly.
Regards Carsten
On 6/29/07, Carsten Schlote schlote@vahanus.net wrote:
Hi,
below a simple patch for the make rule, which creates the version_autogenerated.h file. Instead of just updating this file any time make is started, now the file is checked for different contents. If it differs, the version header is updated, otherwise not.
This saves unnessesary rebuilds of several files in the tree.
Regards Carsten
Looks good to me. I'll apply it to my tree, but I need a signed-off-by line from you first.
Cheers, g.
diff --git a/Makefile b/Makefile index c52b21b..7999870 100755 --- a/Makefile +++ b/Makefile @@ -290,11 +290,13 @@ $(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
version:
@echo -n "#define U_BOOT_VERSION \"U-Boot " >$(VERSION_FILE); \
echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE); \
@echo -n "#define U_BOOT_VERSION \"U-Boot " >$(VERSION_FILE).tmp; \
echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE).tmp; \ echo -n $(shell $(CONFIG_SHELL)$(TOPDIR)/tools/setlocalversion \
$(TOPDIR)) >> $(VERSION_FILE); \echo "\"" >> $(VERSION_FILE)
$(TOPDIR)) >> $(VERSION_FILE).tmp; \echo "\"" >> $(VERSION_FILE).tmp@diff --brief $(VERSION_FILE) $(VERSION_FILE).tmp || cp$(VERSION_FILE).tmp $(VERSION_FILE)
@rm $(VERSION_FILE).tmpgdbtools: $(MAKE) -C tools/gdb all || exit 1
This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Hi,
as Evolution now starts to f**k up ASCII Mails I attached the fixed patch as attachment this time. Might not not work due to list limitations, but worth a try. Otherwise I might start to use mutt again ;-&
Regards Carsten
participants (3)
-
Carsten Schlote -
Grant Likely -
Mike Frysinger