From 69135e1c04f0a36a06486551c883f55479b178fc Mon Sep 17 00:00:00 2001 From: "roel@libnfc.org" Date: Wed, 27 Mar 2013 10:27:14 +0000 Subject: [PATCH] changed version.c, compile time is now always present, even when svn is not working --- recovery/Makefile | 4 ---- tools/mkversion.pl | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) 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() { 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() { last if($i == 3 and !/^dir/); if($i == 11 and /^([0-9]*)/) { - $present = 1; $svnversion = $1; } $i++; @@ -65,7 +62,7 @@ print <