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

diff --git a/recovery/Makefile b/recovery/Makefile
index 12b8d397420289efaa9c5bd6204b1ce4cab2f091..bb8e3a763fbf2ac77ccc161229358215d9589b9a 100644 (file)
--- a/recovery/Makefile
+++ b/recovery/Makefile
@@ -3,9 +3,6 @@ include ../common/Makefile.common
 BINS = bootrom.bin fullimage.bin proxmark3_recovery.bin
 
 all: $(BINS)
 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 $^ $@
 
 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 > $@
 
 proxmark3_recovery.bin: bootrom.bin fullimage.bin
        cat bootrom.bin fullimage.bin > $@

-       chmod 755 $@

 
 clean: 
        rm -f $(BINS)
 
 clean: 
        rm -f $(BINS)

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 3cd469d19c61c03421e0c44ebe5a596afba869ae..6f2eff69bdc6031d599b2b9af74dc8370075fa05 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -11,7 +11,6 @@ $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 my $svnversion = 0;
 $ENV{'LANG'} = "C";
 
 my $svnversion = 0;

-my $present = 0;

 my $clean = 2;
 my @compiletime = gmtime();
 
 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: (.*)/) {
 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
                }
                        $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]*)/) {
                while(<ENTRIES>) {
                        last if($i == 3 and !/^dir/);
                        if($i == 11 and /^([0-9]*)/) {

-                               $present = 1;

                                $svnversion = $1;
                        }
                        $i++;
                                $svnversion = $1;
                        }
                        $i++;


@@ -65,7 +62,7 @@ print <<EOF
 const struct version_information __attribute__((section(".version_information"))) version_information = {
        VERSION_INFORMATION_MAGIC,
        1,
 const struct version_information __attribute__((section(".version_information"))) version_information = {
        VERSION_INFORMATION_MAGIC,
        1,

-       $present,
+       1,

        $clean,
        "svn $svnversion",
        "$ctime",
        $clean,
        "svn $svnversion",
        "$ctime",