github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
roel@libnfc.org 2013-03-27 10:27:14 +00:00
commit 69135e1c04
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
recovery/Makefile
View file

@ -3,9 +3,6 @@ include ../common/Makefile.common
BINS = bootrom.bin fullimage.bin proxmark3_recovery.bin BINS = bootrom.bin fullimage.bin proxmark3_recovery.bin
all: $(BINS) all: $(BINS)
#%: ../bootrom/% ../armsrc/% $(BINS)
#clean: %: ../bootrom/% ../armsrc/%
# rm *.bin
bootrom.bin: ../bootrom/obj/bootrom.elf bootrom.bin: ../bootrom/obj/bootrom.elf
$(OBJCOPY) --gap-fill=0xff --pad-to 0x00102000 -O binary $^ $@ $(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 proxmark3_recovery.bin: bootrom.bin fullimage.bin
cat bootrom.bin fullimage.bin > $@ cat bootrom.bin fullimage.bin > $@
chmod 755 $@
clean: clean:
rm -f $(BINS) rm -f $(BINS)

5
tools/mkversion.pl
View file

@ -11,7 +11,6 @@ $ENV{'LC_ALL'} = "C";
$ENV{'LANG'} = "C"; $ENV{'LANG'} = "C";
my $svnversion = 0; my $svnversion = 0;
my $present = 0;
my $clean = 2; my $clean = 2;
my @compiletime = gmtime(); my @compiletime = gmtime();
@ -19,7 +18,6 @@ my @compiletime = gmtime();
if(open(SVNINFO, "svn info $main_dir|")) { if(open(SVNINFO, "svn info $main_dir|")) {
while(<SVNINFO>) { while(<SVNINFO>) {
if (/^Last Changed Rev: (.*)/) { if (/^Last Changed Rev: (.*)/) {
$present = 1;
$svnversion = $1; $svnversion = $1;
## last; # Do not abort here, since SVN tends to complain about a Broken pipe ## 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>) { while(<ENTRIES>) {
last if($i == 3 and !/^dir/); last if($i == 3 and !/^dir/);
if($i == 11 and /^([0-9]*)/) { if($i == 11 and /^([0-9]*)/) {
$present = 1;
$svnversion = $1; $svnversion = $1;
} }
$i++; $i++;
@ -65,7 +62,7 @@ print <<EOF
const struct version_information __attribute__((section(".version_information"))) version_information = { const struct version_information __attribute__((section(".version_information"))) version_information = {
VERSION_INFORMATION_MAGIC, VERSION_INFORMATION_MAGIC,
1, 1,
$present, 1,
$clean, $clean,
"svn $svnversion", "svn $svnversion",
"$ctime", "$ctime",