Merge pull request #826 from alignan/fix_octal

Remove leading zeros from node id
This commit is contained in:
Nicolas Tsiftes 2015-02-11 22:35:02 +01:00
commit 277dc8e174

View file

@ -64,11 +64,11 @@ ifeq ($(HOST_OS),Darwin)
cut -f 2 -d ,) cut -f 2 -d ,)
CMOTES=$(MOTES) CMOTES=$(MOTES)
REFNUM = $(shell $(MOTELIST) -c 2>&- | \ REFNUM = $(shell $(MOTELIST) -c 2>&- | \
cut -f 1 -d , | tail -c5) cut -f 1 -d , | tail -c5 | sed 's/^0*//')
ifneq (,$(REFNUM)) ifneq (,$(REFNUM))
# No device fo-und # No device fo-und
ifeq (,$(findstring und, $(REFNUM))) ifeq (,$(findstring und, $(REFNUM)))
CFLAGS += -DSERIALNUM=$(REFNUM) CFLAGS += -DSERIALNUM=$(REFNUM:0%=%)
endif endif
endif endif
endif endif
@ -85,7 +85,7 @@ else
perl -ne 'print $$1 . " " if(m-(/dev/\w+)-);') perl -ne 'print $$1 . " " if(m-(/dev/\w+)-);')
CMOTES=$(MOTES) CMOTES=$(MOTES)
REFNUM = $(shell $(MOTELIST) -c 2>&- | \ REFNUM = $(shell $(MOTELIST) -c 2>&- | \
cut -f 1 -d , | tail -c5 ) cut -f 1 -d , | tail -c5 | sed 's/^0*//')
ifneq (,$(REFNUM)) ifneq (,$(REFNUM))
# No device fo-und # No device fo-und
ifeq (,$(findstring und, $(REFNUM))) ifeq (,$(findstring und, $(REFNUM)))