Skip to content

Commit 69135e1

Browse files
changed version.c, compile time is now always present, even when svn is not working
1 parent 6c6d1ac commit 69135e1

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

recovery/Makefile

-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ include ../common/Makefile.common
33
BINS = bootrom.bin fullimage.bin proxmark3_recovery.bin
44

55
all: $(BINS)
6-
#%: ../bootrom/% ../armsrc/% $(BINS)
7-
#clean: %: ../bootrom/% ../armsrc/%
8-
# rm *.bin
96

107
bootrom.bin: ../bootrom/obj/bootrom.elf
118
$(OBJCOPY) --gap-fill=0xff --pad-to 0x00102000 -O binary $^ $@
@@ -15,7 +12,6 @@ fullimage.bin: ../armsrc/obj/fullimage.elf
1512

1613
proxmark3_recovery.bin: bootrom.bin fullimage.bin
1714
cat bootrom.bin fullimage.bin > $@
18-
chmod 755 $@
1915

2016
clean:
2117
rm -f $(BINS)

tools/mkversion.pl

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
$ENV{'LANG'} = "C";
1212

1313
my $svnversion = 0;
14-
my $present = 0;
1514
my $clean = 2;
1615
my @compiletime = gmtime();
1716

1817
# Strategy one: call svn info and extract last changed revision, call svn status and look for ^M
1918
if(open(SVNINFO, "svn info $main_dir|")) {
2019
while(<SVNINFO>) {
2120
if (/^Last Changed Rev: (.*)/) {
22-
$present = 1;
2321
$svnversion = $1;
2422
## last; # Do not abort here, since SVN tends to complain about a Broken pipe
2523
}
@@ -46,7 +44,6 @@
4644
while(<ENTRIES>) {
4745
last if($i == 3 and !/^dir/);
4846
if($i == 11 and /^([0-9]*)/) {
49-
$present = 1;
5047
$svnversion = $1;
5148
}
5249
$i++;
@@ -65,7 +62,7 @@
6562
const struct version_information __attribute__((section(".version_information"))) version_information = {
6663
VERSION_INFORMATION_MAGIC,
6764
1,
68-
$present,
65+
1,
6966
$clean,
7067
"svn $svnversion",
7168
"$ctime",

0 commit comments

Comments
 (0)