From 3962fd8d05a30c435b3d2d3af870c2938b5e1efc Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Mon, 9 Mar 2020 21:08:31 +0100
Subject: [PATCH 1/6] distro: move addon path to config/options

---
 config/options                  | 4 ++++
 distributions/LibreELEC/options | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/options b/config/options
index 4b461a321a..4f42fc6562 100644
--- a/config/options
+++ b/config/options
@@ -86,6 +86,10 @@ VERBOSE="${VERBOSE:-yes}"
 # directory.
 CCACHE_CACHE_SIZE="10G"
 
+# set addon paths
+ADDON_PATH="$ADDON_VERSION/$ADDON_PROJECT/$TARGET_ARCH"
+ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+
 # read local persistent options from $ROOT if available
 if [ -f "${ROOT}/.libreelec/options" ]; then
   . "${ROOT}/.libreelec/options"
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 9ab2342b5c..09da4785e7 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -195,9 +195,8 @@
 # Addon Server Url
   ADDON_SERVER_URL="https://addons.libreelec.tv"
 
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+# set the default addon project
+  ADDON_PROJECT="${DEVICE:-$PROJECT}"
 
 # Default size of system partition, in MB, eg. 512
   SYSTEM_SIZE=512

From d9cfc55adc4d8d7414338beeb46a94aba69b0dec Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Mon, 9 Mar 2020 21:08:31 +0100
Subject: [PATCH 2/6] Allwinner: use H3 addons

---
 projects/Allwinner/devices/A20/options | 4 ----
 projects/Allwinner/options             | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/projects/Allwinner/devices/A20/options b/projects/Allwinner/devices/A20/options
index e79fa52d3d..67ac4cc751 100644
--- a/projects/Allwinner/devices/A20/options
+++ b/projects/Allwinner/devices/A20/options
@@ -45,7 +45,3 @@
 
   # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
     KODIPLAYER_DRIVER="$OPENGLES"
-
-  # set the addon dirs
-    ADDON_PATH="$ADDON_VERSION/H3/$TARGET_ARCH"
-    ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
diff --git a/projects/Allwinner/options b/projects/Allwinner/options
index 0a3b7ca75f..dbf9b8bb7e 100644
--- a/projects/Allwinner/options
+++ b/projects/Allwinner/options
@@ -62,3 +62,5 @@
   # debug tty path
     DEBUG_TTY="/dev/console"
 
+  # set the addon project
+    ADDON_PROJECT="H3"

From e1716fca502127eedfcf4a0aaf36b0b394c79353 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Mon, 9 Mar 2020 21:08:31 +0100
Subject: [PATCH 3/6] Rockchip: use H3 addons

---
 projects/Rockchip/options | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/Rockchip/options b/projects/Rockchip/options
index 3dc4c12eba..17e76f66a6 100644
--- a/projects/Rockchip/options
+++ b/projects/Rockchip/options
@@ -85,3 +85,6 @@
 
   # debug tty path
     DEBUG_TTY="/dev/ttyS2"
+
+  # set the addon project
+    ADDON_PROJECT="H3"

From 208bcecea427601509d948c164ffaa53bd6a6d26 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Mon, 9 Mar 2020 21:08:32 +0100
Subject: [PATCH 4/6] Slice: use RPi addons

---
 projects/RPi/devices/Slice/options | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/RPi/devices/Slice/options b/projects/RPi/devices/Slice/options
index 7abb96dacc..c39d81d629 100644
--- a/projects/RPi/devices/Slice/options
+++ b/projects/RPi/devices/Slice/options
@@ -13,3 +13,6 @@
 
   # Additional drivers
     ADDITIONAL_DRIVERS="${ADDITIONAL_DRIVERS} slice-drivers"
+
+  # set the addon project
+    ADDON_PROJECT="RPi"

From 1c8aa52a4c377fff95e99ccb0ad205be956bedfc Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Mon, 9 Mar 2020 21:08:32 +0100
Subject: [PATCH 5/6] Slice3: use RPi2 addons

---
 projects/RPi/devices/Slice3/options | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/RPi/devices/Slice3/options b/projects/RPi/devices/Slice3/options
index a321f10fef..373c3dc67c 100644
--- a/projects/RPi/devices/Slice3/options
+++ b/projects/RPi/devices/Slice3/options
@@ -13,3 +13,6 @@
 
   # Additional drivers
     ADDITIONAL_DRIVERS="${ADDITIONAL_DRIVERS} slice-drivers"
+
+  # set the addon project
+    ADDON_PROJECT="RPi2"

From 8db559963513bb8c5adbde384adb87e1fcac5177 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Mon, 9 Mar 2020 21:08:32 +0100
Subject: [PATCH 6/6] Amlogic: use AMLG12 addons

---
 projects/Amlogic/devices/AMLGX/options | 4 ----
 projects/Amlogic/options               | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/projects/Amlogic/devices/AMLGX/options b/projects/Amlogic/devices/AMLGX/options
index f3eac9fba8..acc244b5b2 100644
--- a/projects/Amlogic/devices/AMLGX/options
+++ b/projects/Amlogic/devices/AMLGX/options
@@ -32,7 +32,3 @@
 
   # Mali GPU family
     MALI_FAMILY="450 t820"
-
-  # set the addon dirs
-    ADDON_PATH="$ADDON_VERSION/AMLG12/$TARGET_ARCH"
-    ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
diff --git a/projects/Amlogic/options b/projects/Amlogic/options
index d61cd46be2..b3077f7f5f 100644
--- a/projects/Amlogic/options
+++ b/projects/Amlogic/options
@@ -89,3 +89,6 @@
 
   # debug tty path
     DEBUG_TTY="/dev/ttyAML0"
+
+  # set the addon project
+    ADDON_PROJECT="AMLG12"