From 90ea5a0c7f44a05b3387ac88b4287f56c0dbf806 Mon Sep 17 00:00:00 2001
From: Alissa Huskey <alissa.huskey@gmail.com>
Date: Wed, 13 Nov 2019 00:00:25 -0700
Subject: [PATCH 1/2] Add PLATFORM_PATH
Add PLATFORM_PATH variable to the root hardware directory for a given
architecture to avoid duplication between boards.txt, cores, platform
libraries, etc.
---
Arduino.mk | 19 ++++++++++++-------
arduino-mk-vars.md | 19 +++++++++++++++++++
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/Arduino.mk b/Arduino.mk
index b9611a0..db6f8b0 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -63,7 +63,7 @@
#
# On Windows declare this environmental variables using the windows
# configuration options or Cygwin .bashrc. Control Panel > System > Advanced system settings
-# The paths must use Unix style forward slash and not have any spaces
+# The paths must use Unix style forward slash and not have any spaces
# or escape charactors. One must use a symbolic link if the path does
# contain spaces.
#
@@ -420,15 +420,20 @@ ifdef ALTERNATE_CORE_PATH
else
+ ifndef PLATFORM_PATH
+ PLATFORM_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)
+ $(call show_config_variable,PLATFORM_PATH,[COMPUTED],(from ARDUINO_DIR))
+ endif
+
ifndef ARDUINO_VAR_PATH
- ARDUINO_VAR_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/variants
+ ARDUINO_VAR_PATH = $(PLATFORM_PATH)/variants
$(call show_config_variable,ARDUINO_VAR_PATH,[COMPUTED],(from ARDUINO_DIR))
else
$(call show_config_variable,ARDUINO_VAR_PATH,[USER])
endif
ifndef BOARDS_TXT
- BOARDS_TXT = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/boards.txt
+ BOARDS_TXT = $(PLATFORM_PATH)/boards.txt
$(call show_config_variable,BOARDS_TXT,[COMPUTED],(from ARDUINO_DIR))
else
$(call show_config_variable,BOARDS_TXT,[USER])
@@ -602,7 +607,7 @@ endif
ifndef ARDUINO_PLATFORM_LIB_PATH
ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1)
# only for 1.5
- ARDUINO_PLATFORM_LIB_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/libraries
+ ARDUINO_PLATFORM_LIB_PATH = $(PLATFORM_PATH)/libraries
$(call show_config_variable,ARDUINO_PLATFORM_LIB_PATH,[COMPUTED],(from ARDUINO_DIR))
endif
else
@@ -834,12 +839,12 @@ endif
# we can set ARDUINO_CORE_PATH.
ifndef ARDUINO_CORE_PATH
ifeq ($(strip $(CORE)),)
- ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/cores/arduino
+ ARDUINO_CORE_PATH = $(PLATFORM_PATH)/cores/arduino
$(call show_config_variable,ARDUINO_CORE_PATH,[DEFAULT])
else
ARDUINO_CORE_PATH = $(ALTERNATE_CORE_PATH)/cores/$(CORE)
ifeq ($(wildcard $(ARDUINO_CORE_PATH)),)
- ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/cores/$(CORE)
+ ARDUINO_CORE_PATH = $(PLATFORM_PATH)/cores/$(CORE)
$(call show_config_variable,ARDUINO_CORE_PATH,[COMPUTED],(from ARDUINO_DIR, BOARD_TAG and boards.txt))
else
$(call show_config_variable,ARDUINO_CORE_PATH,[COMPUTED],(from ALTERNATE_CORE_PATH, BOARD_TAG and boards.txt))
@@ -1322,7 +1327,7 @@ endif
# either calculate parent dir from arduino dir, or user-defined path
ifndef BOOTLOADER_PARENT
- BOOTLOADER_PARENT = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/bootloaders
+ BOOTLOADER_PARENT = $(PLATFORM_PATH)/bootloaders
$(call show_config_variable,BOOTLOADER_PARENT,[COMPUTED],(from ARDUINO_DIR))
else
$(call show_config_variable,BOOTLOADER_PARENT,[USER])
diff --git a/arduino-mk-vars.md b/arduino-mk-vars.md
index f173ac2..6218a93 100644
--- a/arduino-mk-vars.md
+++ b/arduino-mk-vars.md
@@ -288,6 +288,25 @@ ARDUINO_CORE_PATH = /usr/share/arduino/hardware/arduino/cores/arduino
----
+### PLATFORM_PATH
+
+**Description:**
+
+Root directory of your ARCHITECTURE that contains configuration and build files for its hardware. (Hint: It will contain a platform.txt file at the first level.) Changing this will change the parent dir of ARDUINO_VAR_PATH, BOARDS_TXT, ARDUINO_PLATFORM_LIB_PATH, ARDUINO_CORE_PATH and BOOTLOADER_PARENT.
+
+Note: not used when setting ALTERNATE_CORE or ALTERNATE_CORE_PATH.
+
+Defaults to: ARDUINO_DIR/hardware/ARDMK_VENDOR/ARCHITECTURE
+
+**Example:**
+
+```Makefile
+PLATFORM_PATH = $(HOME)/sketchbook/hardware/arduino-tiny
+```
+
+**Requirement:** *Optional*
+----
+
## Sketch related variables
### ARDUINO_LIBS
From 614d2767436e518f212a2e5d6546f8d35be44b13 Mon Sep 17 00:00:00 2001
From: Alissa Huskey <alissa.huskey@gmail.com>
Date: Wed, 13 Nov 2019 00:45:41 -0700
Subject: [PATCH 2/2] Fix failing CI
Build is failing because pyserial 3.0.1 is already installed and can't
be uninstalled. Instead, add --ignore-installed flag to pip command so
that pyserial 2.7 will be installed without the need to uninstall 3.0.1.
---
tests/script/bootstrap/common.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/script/bootstrap/common.sh b/tests/script/bootstrap/common.sh
index c3cd90e..abfef88 100644
--- a/tests/script/bootstrap/common.sh
+++ b/tests/script/bootstrap/common.sh
@@ -184,7 +184,7 @@ if [ -z $COMMON_SOURCED ]; then
PIP_SUDO_CMD=$SUDO_CMD
fi
- $PIP_SUDO_CMD pip install --src dependencies --pre -Ur $BOOTSTRAP_DIR/pip-requirements.txt
+ $PIP_SUDO_CMD pip install --ignore-installed --src dependencies --pre -Ur $BOOTSTRAP_DIR/pip-requirements.txt
COMMON_SOURCED=1
fi