From 67cc18c9ed357d4ba290d62e2f2836601a19ca2b Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 25 Jun 2019 15:34:44 +0200
Subject: Add ArduinoCore-avr as a submodule.

Unfortunately, as of 2019-06-25 the version found in Debian sid is too
old (cf. #780706, #925578, #927329), so for now we add ArduinoCore-avr
as a submodule.  This avoids manually downloading the entire IDE from
https://www.arduino.cc .
---
 .gitmodules              | 3 +++
 Makefile                 | 4 ++--
 README                   | 6 +++---
 lib/hardware/arduino/avr | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 160000 lib/hardware/arduino/avr

diff --git a/.gitmodules b/.gitmodules
index 2c630eb..6fdaaf1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/hardware/keyboardio"]
 	path = lib/hardware/keyboardio
 	url = https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio.git
+[submodule "lib/hardware/arduino/avr"]
+	path = lib/hardware/arduino/avr
+	url = https://github.com/arduino/ArduinoCore-avr
diff --git a/Makefile b/Makefile
index 86ad49e..dfdfca9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 AVR_TOOLS_DIR = /usr
-ARDUINO_DIR   = /usr/local/arduino
+ARDUINO_DIR   = ./lib
 ARDMK_DIR     = /usr/share/arduino
 ARDMK_VENDOR  = arduino
 
@@ -8,7 +8,7 @@ BOARD_TAG = model01
 ALTERNATE_CORE = keyboardio
 
 ARDUINO_SKETCHBOOK = ./lib
-ARDUINO_VERSION = $(shell tr "." "0" <$(ARDUINO_DIR)/lib/version.txt)
+ARDUINO_VERSION = $(shell git --no-pager -C $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE) tag --points-at HEAD | tr "." "0")
 
 SOURCEDIR = ./src
 OBJDIR    = ./build
diff --git a/README b/README
index 25e0ee7..e8fda53 100644
--- a/README
+++ b/README
@@ -19,13 +19,13 @@ On Debian systems, the following packages are required:
 Running `apt install arduino-mk` should pull in all required
 dependencies.  Moreover Arduino 1.6.7 or newer is required.
 Unfortunately, as of 2019-06-25 the version found in Debian sid is too
-Unfortunately, as of 2019-06-25 the version found in Debian sid is too
-old (cf. #780706, #925578, #927329).  Dowload a recent version at
-https://www.arduino.cc and it unpack to /usr/local/arduino.
+old (cf. #780706, #925578, #927329), so for now we add ArduinoCore-avr
+as a submodule.
 
 Initialize (or update) submodules:
 
     ~$ git submodule update --init \
+            lib/hardware/arduino/avr \
             lib/hardware/keyboardio
 
     ~$ git -C lib/hardware/keyboardio submodule update --init --recursive \
diff --git a/lib/hardware/arduino/avr b/lib/hardware/arduino/avr
new file mode 160000
index 0000000..2663be1
--- /dev/null
+++ b/lib/hardware/arduino/avr
@@ -0,0 +1 @@
+Subproject commit 2663be17272e19f00c55f3f2d8f1ebfac47158d6
-- 
cgit v1.2.3