From 6d20dd6fec80afa7cc0924335cebf2e191c72de4 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@rightscale.com>
Date: Thu, 22 Sep 2016 23:05:44 -0700
Subject: [PATCH] disable syslog; add travis

---
 .travis.yml     | 29 +++++++++++++++++++++++++++++
 Makefile        |  8 ++++----
 syslog/syslog.h |  1 +
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..149176b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+# Travis-CI file for Esp-Link
+
+language: c
+
+before_install:
+ - curl -Ls http://s3.voneicken.com/xtensa-lx106-elf-20160330.tgx | tar Jxf -
+ - curl -Ls http://s3.voneicken.com/esp_iot_sdk_v2.0.0.p1.tgx | tar Jxf -
+
+after_script:
+  # upload to an S3 bucket, requires S3_BUCKET, AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to be set
+  # in environment using travis' repository settings
+  - "if [[ -n \"$S3_BUCKET\" && -n \"$AWS_ACCESS_KEY_ID\" ]]; then
+      echo Uploading *.tgz to $S3_BUCKET;
+      curl -Ls https://github.com/rlmcpherson/s3gof3r/releases/download/v0.5.0/gof3r_0.5.0_linux_amd64.tar.gz | tar zxf - gof3r_0.5.0_linux_amd64/gof3r;
+      mv gof3r*/gof3r .;
+      ls *.tgz | xargs -I {} ./gof3r put -b $S3_BUCKET -k espruino/{} --acl public-read -p {};
+      ls *.tgz | xargs -I {} echo \"URL: http://$S3_BUCKET/espruino/{}\";
+      fi"
+
+compiler: gcc
+
+env:
+  - XTENSA_TOOLS_ROOT=./esp-open-sdk/xtensa-lx106-elf/bin/
+  - SDK_BASE=./esp_iot_sdk_v2.0.0.p1
+
+script: make release
+
+notifications:
+  email: false
diff --git a/Makefile b/Makefile
index d4a215c..18968ca 100644
--- a/Makefile
+++ b/Makefile
@@ -101,8 +101,8 @@ LED_SERIAL_PIN      ?= 14
 
 # --------------- esp-link modules config options ---------------
 
-# Optional Modules mqtt
-MODULES ?= mqtt rest syslog web-server
+# Optional Modules mqtt rest syslog web-server
+MODULES ?= mqtt rest web-server
 
 # --------------- esphttpd config options ---------------
 
@@ -368,7 +368,7 @@ $(FW_BASE)/user1.bin: $(USER1_OUT) $(FW_BASE)
 	$(Q) $(OBJCP) --only-section .rodata -O binary $(USER1_OUT) eagle.app.v6.rodata.bin
 	$(Q) $(OBJCP) --only-section .irom0.text -O binary $(USER1_OUT) eagle.app.v6.irom0text.bin
 	ls -ls eagle*bin
-	$(Q) COMPILE=gcc PATH=$(XTENSA_TOOLS_ROOT):$(PATH) python $(APPGEN_TOOL) $(USER1_OUT) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_SPI_SIZE) 0
+	$(Q) COMPILE=gcc PATH=$(XTENSA_TOOLS_ROOT):$(PATH) python $(APPGEN_TOOL) $(USER1_OUT) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_SPI_SIZE) 0 >/dev/null
 	$(Q) rm -f eagle.app.v6.*.bin
 	$(Q) mv eagle.app.flash.bin $@
 	@echo "** user1.bin uses $$(stat -c '%s' $@) bytes of" $(ESP_FLASH_MAX) "available"
@@ -379,7 +379,7 @@ $(FW_BASE)/user2.bin: $(USER2_OUT) $(FW_BASE)
 	$(Q) $(OBJCP) --only-section .data -O binary $(USER2_OUT) eagle.app.v6.data.bin
 	$(Q) $(OBJCP) --only-section .rodata -O binary $(USER2_OUT) eagle.app.v6.rodata.bin
 	$(Q) $(OBJCP) --only-section .irom0.text -O binary $(USER2_OUT) eagle.app.v6.irom0text.bin
-	$(Q) COMPILE=gcc PATH=$(XTENSA_TOOLS_ROOT):$(PATH) python $(APPGEN_TOOL) $(USER2_OUT) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_SPI_SIZE) 1
+	$(Q) COMPILE=gcc PATH=$(XTENSA_TOOLS_ROOT):$(PATH) python $(APPGEN_TOOL) $(USER2_OUT) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_SPI_SIZE) 1 >/dev/null
 	$(Q) rm -f eagle.app.v6.*.bin
 	$(Q) mv eagle.app.flash.bin $@
 	$(Q) if [ $$(stat -c '%s' $@) -gt $$(( $(ESP_FLASH_MAX) )) ]; then echo "$@ too big!"; false; fi
diff --git a/syslog/syslog.h b/syslog/syslog.h
index ed453ab..d556ee9 100644
--- a/syslog/syslog.h
+++ b/syslog/syslog.h
@@ -70,6 +70,7 @@ enum syslog_facility {
 #define REG_READ(_r) (*(volatile uint32 *)(_r))
 #define WDEV_NOW()   REG_READ(0x3ff20c00)
 
+// This variable disappeared from lwip in SDK 2.0...
 extern uint32_t	realtime_stamp;     // 1sec NTP ticker
 
 typedef struct syslog_host_t syslog_host_t;