Skip to content

Commit

Permalink
changed version.c, compile time is now always present, even when svn …
Browse files Browse the repository at this point in the history
…is not working
  • Loading branch information
[email protected] committed Mar 27, 2013
1 parent 6c6d1ac commit 69135e1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
4 changes: 0 additions & 4 deletions recovery/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $^ $@
Expand All @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions tools/mkversion.pl
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@
$ENV{'LANG'} = "C";

my $svnversion = 0;
my $present = 0;
my $clean = 2;
my @compiletime = gmtime();

# Strategy one: call svn info and extract last changed revision, call svn status and look for ^M
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
}
Expand All @@ -46,7 +44,6 @@
while(<ENTRIES>) {
last if($i == 3 and !/^dir/);
if($i == 11 and /^([0-9]*)/) {
$present = 1;
$svnversion = $1;
}
$i++;
Expand All @@ -65,7 +62,7 @@
const struct version_information __attribute__((section(".version_information"))) version_information = {
VERSION_INFORMATION_MAGIC,
1,
$present,
1,
$clean,
"svn $svnversion",
"$ctime",
Expand Down

0 comments on commit 69135e1

Please sign in to comment.