From: roel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Wed, 27 Mar 2013 10:27:14 +0000 (+0000)
Subject: changed version.c, compile time is now always present, even when svn is not working
X-Git-Tag: v1.0.0~114
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/69135e1c04f0a36a06486551c883f55479b178fc?ds=sidebyside

changed version.c, compile time is now always present, even when svn is not working
---

diff --git a/recovery/Makefile b/recovery/Makefile
index 12b8d397..bb8e3a76 100644
--- a/recovery/Makefile
+++ b/recovery/Makefile
@@ -3,9 +3,6 @@ include ../common/Makefile.common
 BINS = bootrom.bin fullimage.bin proxmark3_recovery.bin
 
 all: $(BINS)
-#%: ../bootrom/% ../armsrc/% $(BINS)
-#clean: %: ../bootrom/% ../armsrc/%
-#	rm *.bin
 
 bootrom.bin: ../bootrom/obj/bootrom.elf
 	$(OBJCOPY) --gap-fill=0xff --pad-to 0x00102000 -O binary $^ $@
@@ -15,7 +12,6 @@ fullimage.bin: ../armsrc/obj/fullimage.elf
 
 proxmark3_recovery.bin: bootrom.bin fullimage.bin
 	cat bootrom.bin fullimage.bin > $@
-	chmod 755 $@
 
 clean: 
 	rm -f $(BINS)
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 3cd469d1..6f2eff69 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -11,7 +11,6 @@ $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 my $svnversion = 0;
-my $present = 0;
 my $clean = 2;
 my @compiletime = gmtime();
 
@@ -19,7 +18,6 @@ my @compiletime = gmtime();
 if(open(SVNINFO, "svn info $main_dir|")) {
 	while(<SVNINFO>) {
 		if (/^Last Changed Rev: (.*)/) {
-			$present = 1;
 			$svnversion = $1;
 			## last; # Do not abort here, since SVN tends to complain about a Broken pipe
 		}
@@ -46,7 +44,6 @@ if(open(SVNINFO, "svn info $main_dir|")) {
 		while(<ENTRIES>) {
 			last if($i == 3 and !/^dir/);
 			if($i == 11 and /^([0-9]*)/) {
-				$present = 1;
 				$svnversion = $1;
 			}
 			$i++;
@@ -65,7 +62,7 @@ print <<EOF
 const struct version_information __attribute__((section(".version_information"))) version_information = {
 	VERSION_INFORMATION_MAGIC,
 	1,
-	$present,
+	1,
 	$clean,
 	"svn $svnversion",
 	"$ctime",