From 10b70710dc4d6aa751b4bd3c0d5be962b68a27da Mon Sep 17 00:00:00 2001
From: JDierkse <j.dierkse@madeo.nl>
Date: Fri, 17 Apr 2020 15:06:16 +0200
Subject: [PATCH] Add Architecture Aliases

---
 Makefile         |  9 +++------
 Makefile.aliases | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 Makefile.aliases

diff --git a/Makefile b/Makefile
index f32b5df..222527d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,10 @@ COMMANDLINE  := $(shell ps -o args= $$PPID)
 
 ARCHS        := $(shell ls $(ROOTPATH)/Makefiles/Makefile.conf.* | grep -v base | sed 's/.*Makefile\.conf\.//g')
 ARCHS        += any
-ARCH         := $(filter $(ARCHS),$(MAKECMDGOALS))
-MAKECMDGOALS := $(filter-out $(ARCH),$(MAKECMDGOALS))
-ARCHS        := $(filter-out any,$(ARCHS))
 
-ifeq ($(ARCH),)
-ARCH         := x86_64
-endif
+-include $(ROOTPATH)/Makefiles/Makefile.aliases
+
+ARCHS        := $(filter-out any,$(ARCHS))
 
 ifeq (,$(findstring -S,$(COMMANDLINE)))
 ifneq ($(ARCH),)
diff --git a/Makefile.aliases b/Makefile.aliases
new file mode 100644
index 0000000..63bcc98
--- /dev/null
+++ b/Makefile.aliases
@@ -0,0 +1,40 @@
+#
+# Makefile.conf.aliases
+#
+
+ARCHS        += armv6
+ARCHS        += armv8
+ARCHS        += alpine
+
+ARCH         := $(filter $(ARCHS),$(MAKECMDGOALS))
+MAKECMDGOALS := $(filter-out $(ARCH),$(MAKECMDGOALS))
+
+# ARMv6 Defaults to Raspbian jessie
+ifeq ($(ARCH),armv6)
+ARCH         := armv6-jessie
+
+.PHONY: armv6
+armv6: $(ARCH)
+endif
+
+# ARMv8 Defaults to Raspbian stretch
+ifeq ($(ARCH),armv8)
+ARCH         := armv8-stretch
+
+.PHONY: armv8
+armv8: $(ARCH)
+endif
+
+# Alpine defaults to x86_64 alpine
+ifeq ($(ARCH),alpine)
+ARCH         := x86_64-alpine
+
+.PHONY: alpine
+alpine: $(ARCH)
+endif
+
+# Default is x86_64
+ifeq ($(ARCH),)
+ARCH         := x86_64
+endif
+