replace old u-boot setlocalversion script with our git describe

version now includes our tag as well.
configs/jb02v2: remove 'v2' from initramfs file
2015-07-19 21:49:02 +02:00 · 2015-07-19 21:01:53 +02:00 · 2015-07-19 19:02:34 +02:00 · 2015-07-15 01:51:13 +02:00 · 2015-06-30 19:17:30 +02:00
6 changed files with 7 additions and 16 deletions
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@ -285,7 +285,7 @@ ap2_config: unconfig hornet_common_config

 jb02v2-cb2_config: unconfig hornet_common_config
 	@echo "#define CARABOOT_RELEASE \"$(CARABOOT_RELEASE)\"" >>include/config.h
-	@./mkconfig -a jb02v3-skw mips mips carambola2 ar7240 ar7240
+	@./mkconfig -a jb02v2-cb2 mips mips carambola2 ar7240 ar7240

 jb02v3-skw_config: unconfig hornet_common_config
 	@echo "#define CARABOOT_RELEASE \"$(CARABOOT_RELEASE)\"" >>include/config.h
--- a/u-boot/include/configs/ap1.h
+++ b/u-boot/include/configs/ap1.h
@ -45,7 +45,7 @@
 #define CONFIG_SERVERIP 192.168.2.254
 #define CFG_FAULT_ECHO_LINK_DOWN    1

-#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmo-sob-ap1-initramfs-uImage.bin"
+#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmocom-sob-ap1-initramfs-uImage.bin"

 #define CFG_PHY_ADDR 0 

--- a/u-boot/include/configs/ap2.h
+++ b/u-boot/include/configs/ap2.h
@ -44,7 +44,7 @@
 #define CONFIG_SERVERIP 192.168.2.254
 #define CFG_FAULT_ECHO_LINK_DOWN    1

-#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmo-sob-ap2-initramfs-uImage.bin"
+#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmocom-sob-ap2-initramfs-uImage.bin"

 #define CFG_PHY_ADDR 0 

--- a/u-boot/include/configs/jb02v2-cb2.h
+++ b/u-boot/include/configs/jb02v2-cb2.h
@ -45,7 +45,7 @@
 #define CONFIG_SERVERIP 192.168.2.254
 #define CFG_FAULT_ECHO_LINK_DOWN    1

-#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmo-sob-jb02v2-cb2-initramfs-uImage.bin"
+#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmocom-sob-jb02-initramfs-uImage.bin"

 #define CFG_PHY_ADDR 0 

--- a/u-boot/include/configs/jb02v3-skw.h
+++ b/u-boot/include/configs/jb02v3-skw.h
@ -44,7 +44,7 @@
 #define CONFIG_SERVERIP 192.168.2.254
 #define CFG_FAULT_ECHO_LINK_DOWN    1

-#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmo-sob-jb02v3-skw-initramfs-uImage.bin"
+#define RECOVERY_FILENAME_STRING "openwrt-ar71xx-generic-sysmocom-sob-jb02v3-initramfs-uImage.bin"

 #define CFG_PHY_ADDR 0

--- a/u-boot/tools/setlocalversion
+++ b/u-boot/tools/setlocalversion
@ -8,15 +8,6 @@ usage() {

 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
+if version=$(git describe --dirty --always --match="ar9331-v*" 2>/dev/null) ; then
+	echo "-$version"
 fi
Author	SHA1	Message	Date
Alexander Couzens	40032e1b0b	replace old u-boot setlocalversion script with our git describe version now includes our tag as well.	2015-07-19 21:49:02 +02:00
Alexander Couzens	451635eda3	configs/jb02v2: remove 'v2' from initramfs file the jb02v2 must match the openwrt board name which doesn't contain a v2 and isn't easy changable	2015-07-19 21:01:53 +02:00
Alexander Couzens	d97d1ee1f2	correct recovery filenames to be in sync with openwrt builds removed prefix -skw and -cb2 from jb names	2015-07-19 19:02:34 +02:00
Alexander Couzens	a40eea5aa4	fix type which broke jb02v2-cb2 image jb02v2-cb used the wrong config file.	2015-07-15 01:51:13 +02:00
Alexander Couzens	aa579e90e9	configs: rename recovery image filename to be consistant sed -i 's/-sysmo-/-sysmocom-/g'	2015-06-30 19:17:30 +02:00