mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 08:00:26 +09:00
Add GIT version information (commid ID) to untagged U-Boot versions
As done in the linux kernel, the U-Boot version (U_BOOT_VERSION) of all unreleased (untagged) U-Boot images will be automatically extended upon compiletime with a part of the GIT commit ID and possibly with "dirty" if uncommited changes are detected. Here an example for the resulting version: "U-Boot 1.1.4-g3457ac18-dirty" The version is now maintained in the toplevel Makefile and the version headers are autogenerated. Patch by Stefan Roese, 9 Feb 2006
This commit is contained in:
parent
654c2d2836
commit
881a87ecba
15
CHANGELOG
15
CHANGELOG
@ -2,6 +2,21 @@
|
|||||||
Changes since U-Boot 1.1.4:
|
Changes since U-Boot 1.1.4:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
* Add GIT version information (commid ID) to untagged U-Boot versions
|
||||||
|
|
||||||
|
As done in the linux kernel, the U-Boot version (U_BOOT_VERSION)
|
||||||
|
of all unreleased (untagged) U-Boot images will be automatically
|
||||||
|
extended upon compiletime with a part of the GIT commit ID and
|
||||||
|
possibly with "dirty" if uncommited changes are detected.
|
||||||
|
|
||||||
|
Here an example for the resulting version:
|
||||||
|
"U-Boot 1.1.4-g3457ac18-dirty"
|
||||||
|
|
||||||
|
The version is now maintained in the toplevel Makefile and the
|
||||||
|
version headers are autogenerated.
|
||||||
|
|
||||||
|
Patch by Stefan Roese, 9 Feb 2006
|
||||||
|
|
||||||
* Update default environment for INKA4x00 board.
|
* Update default environment for INKA4x00 board.
|
||||||
|
|
||||||
* Convert CPCI750 to use common CFI flash driver
|
* Convert CPCI750 to use common CFI flash driver
|
||||||
|
22
Makefile
22
Makefile
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# (C) Copyright 2000-2005
|
# (C) Copyright 2000-2006
|
||||||
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
#
|
#
|
||||||
# See file CREDITS for list of people who contributed to this
|
# See file CREDITS for list of people who contributed to this
|
||||||
@ -21,6 +21,13 @@
|
|||||||
# MA 02111-1307 USA
|
# MA 02111-1307 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
|
VERSION = 1
|
||||||
|
PATCHLEVEL = 1
|
||||||
|
SUBLEVEL = 4
|
||||||
|
EXTRAVERSION =
|
||||||
|
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
||||||
|
VERSION_FILE = include/version_autogenerated.h
|
||||||
|
|
||||||
HOSTARCH := $(shell uname -m | \
|
HOSTARCH := $(shell uname -m | \
|
||||||
sed -e s/i.86/i386/ \
|
sed -e s/i.86/i386/ \
|
||||||
-e s/sun4u/sparc64/ \
|
-e s/sun4u/sparc64/ \
|
||||||
@ -154,14 +161,14 @@ u-boot.bin: u-boot
|
|||||||
u-boot.img: u-boot.bin
|
u-boot.img: u-boot.bin
|
||||||
./tools/mkimage -A $(ARCH) -T firmware -C none \
|
./tools/mkimage -A $(ARCH) -T firmware -C none \
|
||||||
-a $(TEXT_BASE) -e 0 \
|
-a $(TEXT_BASE) -e 0 \
|
||||||
-n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' include/version.h | \
|
-n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
|
||||||
sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \
|
sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \
|
||||||
-d $< $@
|
-d $< $@
|
||||||
|
|
||||||
u-boot.dis: u-boot
|
u-boot.dis: u-boot
|
||||||
$(OBJDUMP) -d $< > $@
|
$(OBJDUMP) -d $< > $@
|
||||||
|
|
||||||
u-boot: depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
|
u-boot: depend version $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
|
||||||
UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
|
UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
|
||||||
$(LD) $(LDFLAGS) $$UNDEF_SYM $(OBJS) \
|
$(LD) $(LDFLAGS) $$UNDEF_SYM $(OBJS) \
|
||||||
--start-group $(LIBS) --end-group $(PLATFORM_LIBS) \
|
--start-group $(LIBS) --end-group $(PLATFORM_LIBS) \
|
||||||
@ -173,6 +180,13 @@ $(LIBS):
|
|||||||
$(SUBDIRS):
|
$(SUBDIRS):
|
||||||
$(MAKE) -C $@ all
|
$(MAKE) -C $@ all
|
||||||
|
|
||||||
|
version:
|
||||||
|
@echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \
|
||||||
|
echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE); \
|
||||||
|
echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \
|
||||||
|
$(TOPDIR)) >> $(VERSION_FILE); \
|
||||||
|
echo "\"" >> $(VERSION_FILE)
|
||||||
|
|
||||||
gdbtools:
|
gdbtools:
|
||||||
$(MAKE) -C tools/gdb || exit 1
|
$(MAKE) -C tools/gdb || exit 1
|
||||||
|
|
||||||
@ -1838,7 +1852,7 @@ clobber: clean
|
|||||||
-o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
|
-o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
|
||||||
-print0 \
|
-print0 \
|
||||||
| xargs -0 rm -f
|
| xargs -0 rm -f
|
||||||
rm -f $(OBJS) *.bak tags TAGS
|
rm -f $(OBJS) *.bak tags TAGS include/version_autogenerated.h
|
||||||
rm -fr *.*~
|
rm -fr *.*~
|
||||||
rm -f u-boot u-boot.map u-boot.hex $(ALL)
|
rm -f u-boot u-boot.map u-boot.hex $(ALL)
|
||||||
rm -f tools/crc32.c tools/environment.c tools/env/crc32.c
|
rm -f tools/crc32.c tools/environment.c tools/env/crc32.c
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* (C) Copyright 2000-2003
|
* (C) Copyright 2000-2006
|
||||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
*
|
*
|
||||||
* See file CREDITS for list of people who contributed to this
|
* See file CREDITS for list of people who contributed to this
|
||||||
@ -24,6 +24,6 @@
|
|||||||
#ifndef __VERSION_H__
|
#ifndef __VERSION_H__
|
||||||
#define __VERSION_H__
|
#define __VERSION_H__
|
||||||
|
|
||||||
#define U_BOOT_VERSION "U-Boot 1.1.4"
|
#include "version_autogenerated.h"
|
||||||
|
|
||||||
#endif /* __VERSION_H__ */
|
#endif /* __VERSION_H__ */
|
||||||
|
22
tools/setlocalversion
Executable file
22
tools/setlocalversion
Executable file
@ -0,0 +1,22 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Print additional version information for non-release trees.
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
echo "Usage: $0 [srctree]" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
cd "${1:-.}" || usage
|
||||||
|
|
||||||
|
# Check for git and a git repo.
|
||||||
|
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
||||||
|
# Do we have an untagged version?
|
||||||
|
if [ "`git name-rev --tags HEAD`" = "HEAD undefined" ]; then
|
||||||
|
printf '%s%s' -g `echo "$head" | cut -c1-8`
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Are there uncommitted changes?
|
||||||
|
if git diff-files | read dummy; then
|
||||||
|
printf '%s' -dirty
|
||||||
|
fi
|
||||||
|
fi
|
Loading…
Reference in New Issue
Block a user