From e4c85c40fe5901312d774acc2f7c72a43e550cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Fri, 24 Jul 2020 11:17:01 +0200
Subject: [PATCH 01/21] added aroio-webinterface package and removes aroio-ui
 package

---
 aroio/Config.in                               |  2 +-
 aroio/configs/aroio_defconfig                 |  2 +-
 aroio/package/aroio-webinterface/Config.in    |  4 +++
 .../aroio-webinterface/aroio-webinterface.mk  | 26 +++++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 aroio/package/aroio-webinterface/Config.in
 create mode 100644 aroio/package/aroio-webinterface/aroio-webinterface.mk

diff --git a/aroio/Config.in b/aroio/Config.in
index 671dac82..1829c1e2 100644
--- a/aroio/Config.in
+++ b/aroio/Config.in
@@ -96,4 +96,4 @@ source "$BR2_EXTERNAL_aroio_PATH/package/brutefir/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack-connect-persistent/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack_minimix/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/rtl8812au/Config.in" 
-source "$BR2_EXTERNAL_aroio_PATH/package/aroio-ui/Config.in" 
+source "$BR2_EXTERNAL_aroio_PATH/package/aroio-webinterface/Config.in"
diff --git a/aroio/configs/aroio_defconfig b/aroio/configs/aroio_defconfig
index f18bc477..88d5ef55 100644
--- a/aroio/configs/aroio_defconfig
+++ b/aroio/configs/aroio_defconfig
@@ -144,4 +144,4 @@ BR2_PACKAGE_ALSA_PLUGINS=y
 BR2_PACKAGE_BRUTEFIR=y
 BR2_PACKAGE_JACK_CONNECT_PERSISTENT=y
 BR2_PACKAGE_JACK_MINIMIX=y
-BR2_PACKAGE_AROIO_UI=y
+BR2_PACKAGE_AROIO_WEBINTERFACE=y
diff --git a/aroio/package/aroio-webinterface/Config.in b/aroio/package/aroio-webinterface/Config.in
new file mode 100644
index 00000000..c040835d
--- /dev/null
+++ b/aroio/package/aroio-webinterface/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_AROIO_WEBINTERFACE
+    bool "aroio-webinterface"
+    help
+        Aroio Webinterace - Python based API and Angular based Interface
diff --git a/aroio/package/aroio-webinterface/aroio-webinterface.mk b/aroio/package/aroio-webinterface/aroio-webinterface.mk
new file mode 100644
index 00000000..3e8c06a8
--- /dev/null
+++ b/aroio/package/aroio-webinterface/aroio-webinterface.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# aroio-webinterface
+#
+################################################################################
+
+AROIO_WEBINTERFACE_VERSION = b62ae0d5439e8dd72bffe34817cab298c1e8bcb4
+AROIO_WEBINTERFACE_GIT_SUBMODULES = YES
+AROIO_WEBINTERFACE_SITE_METHOD = git
+AROIO_WEBINTERFACE_SITE = git://github.com/aroio/webinterface
+AROIO_WEBINTERFACE_LICENSE = MIT
+AROIO_UI_DEPENDENCIES = python3 python-uvicorn python-fastapi python-pyjwt
+
+define AROIO_WEBINTERFACE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		-C $(@D) all
+endef
+
+define AROIO_WEBINTERFACE_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/opt/webinterface
+	cp -r $(@D)/frontend/dist/aroio-wi/* $(TARGET_DIR)/opt/webinterface
+	cp $(@D)/aroio-webinterface.service $(TARGET_DIR)/lib/systemd/system/
+	ln -sf $(TARGET_DIR)/lib/systemd/system/aroio-webinteraface.service $(TARGET_DIR)/lib/systemd/system/multi-user.target.wants/aroio-webinterface.service
+endef
+
+$(eval $(generic-package))

From eaa89541486d5377e1439ea337224e1a218fba6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Fri, 24 Jul 2020 11:26:18 +0200
Subject: [PATCH 02/21] added gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..723ef36f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
\ No newline at end of file

From 4c92594aecfa603f91920586149d82917cf1e2b8 Mon Sep 17 00:00:00 2001
From: Melf11 <melf.stoecken@googlemail.com>
Date: Fri, 24 Jul 2020 12:02:35 +0200
Subject: [PATCH 03/21] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bb3d82b2..ace02255 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ To initialize this buildroot:
 Note: replace "/output/" with a path of your choice.
 
 ```
-git clone --recurse-submodules git@github.com:unicap/aroio-ng.git
+git clone --recurse-submodules git@github.com:aroio/aroio-ng.git
 cd aroio-ng/buildroot
 mkdir /output/
 make BR2_EXTERNAL=../aroio O=/output/aroio aroio_defconfig

From 58448200d4c0c6391d773b542b693327e9fffc56 Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Fri, 24 Jul 2020 15:06:44 +0200
Subject: [PATCH 04/21] updated gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 723ef36f..dd037274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.idea
\ No newline at end of file
+.idea
+output/
\ No newline at end of file

From 56cf625f4e666a58f04d5fd6a49f003578ac070c Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Fri, 24 Jul 2020 15:07:25 +0200
Subject: [PATCH 05/21] renamed package from aroio-webinterface to webinterface

---
 aroio/Config.in                               |  2 +-
 .../aroio-webinterface/aroio-webinterface.mk  | 26 -------------------
 .../Config.in                                 |  4 +--
 aroio/package/webinterface/webinterface.mk    | 26 +++++++++++++++++++
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 aroio/package/aroio-webinterface/aroio-webinterface.mk
 rename aroio/package/{aroio-webinterface => webinterface}/Config.in (54%)
 create mode 100644 aroio/package/webinterface/webinterface.mk

diff --git a/aroio/Config.in b/aroio/Config.in
index 1829c1e2..272a359c 100644
--- a/aroio/Config.in
+++ b/aroio/Config.in
@@ -96,4 +96,4 @@ source "$BR2_EXTERNAL_aroio_PATH/package/brutefir/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack-connect-persistent/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack_minimix/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/rtl8812au/Config.in" 
-source "$BR2_EXTERNAL_aroio_PATH/package/aroio-webinterface/Config.in"
+source "$BR2_EXTERNAL_aroio_PATH/package/webinterface/Config.in"
diff --git a/aroio/package/aroio-webinterface/aroio-webinterface.mk b/aroio/package/aroio-webinterface/aroio-webinterface.mk
deleted file mode 100644
index 3e8c06a8..00000000
--- a/aroio/package/aroio-webinterface/aroio-webinterface.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-################################################################################
-#
-# aroio-webinterface
-#
-################################################################################
-
-AROIO_WEBINTERFACE_VERSION = b62ae0d5439e8dd72bffe34817cab298c1e8bcb4
-AROIO_WEBINTERFACE_GIT_SUBMODULES = YES
-AROIO_WEBINTERFACE_SITE_METHOD = git
-AROIO_WEBINTERFACE_SITE = git://github.com/aroio/webinterface
-AROIO_WEBINTERFACE_LICENSE = MIT
-AROIO_UI_DEPENDENCIES = python3 python-uvicorn python-fastapi python-pyjwt
-
-define AROIO_WEBINTERFACE_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		-C $(@D) all
-endef
-
-define AROIO_WEBINTERFACE_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/opt/webinterface
-	cp -r $(@D)/frontend/dist/aroio-wi/* $(TARGET_DIR)/opt/webinterface
-	cp $(@D)/aroio-webinterface.service $(TARGET_DIR)/lib/systemd/system/
-	ln -sf $(TARGET_DIR)/lib/systemd/system/aroio-webinteraface.service $(TARGET_DIR)/lib/systemd/system/multi-user.target.wants/aroio-webinterface.service
-endef
-
-$(eval $(generic-package))
diff --git a/aroio/package/aroio-webinterface/Config.in b/aroio/package/webinterface/Config.in
similarity index 54%
rename from aroio/package/aroio-webinterface/Config.in
rename to aroio/package/webinterface/Config.in
index c040835d..190b79e5 100644
--- a/aroio/package/aroio-webinterface/Config.in
+++ b/aroio/package/webinterface/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_AROIO_WEBINTERFACE
-    bool "aroio-webinterface"
+config BR2_PACKAGE_WEBINTERFACE
+    bool "webinterface"
     help
         Aroio Webinterace - Python based API and Angular based Interface
diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
new file mode 100644
index 00000000..0ec0b240
--- /dev/null
+++ b/aroio/package/webinterface/webinterface.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# webinterface
+#
+################################################################################
+
+WEBINTERFACE_VERSION = b62ae0d5439e8dd72bffe34817cab298c1e8bcb4
+WEBINTERFACE_GIT_SUBMODULES = YES
+WEBINTERFACE_SITE_METHOD = git
+WEBINTERFACE_SITE = git://github.com/aroio/webinterface
+WEBINTERFACE_LICENSE = MIT
+WEBINTERFACE_DEPENDENCIES = python3 python-uvicorn python-fastapi python-pyjwt
+
+define AROIO_WEBINTERFACE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		-C $(@D) all
+endef
+
+define AROIO_WEBINTERFACE_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/opt/webinterface
+	cp -r $(@D)/frontend/dist/aroio-wi/* $(TARGET_DIR)/opt/webinterface
+	cp $(@D)/webinterface.service $(TARGET_DIR)/lib/systemd/system/
+	ln -sf $(TARGET_DIR)/lib/systemd/system/webinteraface.service $(TARGET_DIR)/lib/systemd/system/multi-user.target.wants/webinterface.service
+endef
+
+$(eval $(generic-package))

From 4a07e6d16226a9b87329943369c7703985e4bcac Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Fri, 24 Jul 2020 16:09:45 +0200
Subject: [PATCH 06/21] updated httpd config

---
 aroio/overlay/etc/httpd.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/aroio/overlay/etc/httpd.conf b/aroio/overlay/etc/httpd.conf
index 0ca81e77..2f380d17 100644
--- a/aroio/overlay/etc/httpd.conf
+++ b/aroio/overlay/etc/httpd.conf
@@ -1,3 +1 @@
-I:index.html
-*.php:/usr/bin/php-cgi
-/:aroio:abacus
+I:index.html
\ No newline at end of file

From 128bb6b999c565813bcbbdb36ca0c51a693227a6 Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Thu, 6 Aug 2020 15:41:49 +0200
Subject: [PATCH 07/21] reverted httpd.conf

---
 aroio/overlay/etc/httpd.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aroio/overlay/etc/httpd.conf b/aroio/overlay/etc/httpd.conf
index 2f380d17..0ca81e77 100644
--- a/aroio/overlay/etc/httpd.conf
+++ b/aroio/overlay/etc/httpd.conf
@@ -1 +1,3 @@
-I:index.html
\ No newline at end of file
+I:index.html
+*.php:/usr/bin/php-cgi
+/:aroio:abacus

From 31557883542616dd3a6c203e66825e854a1ceb83 Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Thu, 6 Aug 2020 15:50:04 +0200
Subject: [PATCH 08/21] renamed webinterface package name in aroio_defconfig

---
 aroio/configs/aroio_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aroio/configs/aroio_defconfig b/aroio/configs/aroio_defconfig
index 88d5ef55..e7e4b02e 100644
--- a/aroio/configs/aroio_defconfig
+++ b/aroio/configs/aroio_defconfig
@@ -144,4 +144,4 @@ BR2_PACKAGE_ALSA_PLUGINS=y
 BR2_PACKAGE_BRUTEFIR=y
 BR2_PACKAGE_JACK_CONNECT_PERSISTENT=y
 BR2_PACKAGE_JACK_MINIMIX=y
-BR2_PACKAGE_AROIO_WEBINTERFACE=y
+BR2_PACKAGE_WEBINTERFACE=y

From fb2cb564101bbbd9ee0101e192db1ffdf367c310 Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Thu, 6 Aug 2020 15:55:07 +0200
Subject: [PATCH 09/21] updated httpd.conf to correct webinterface path

---
 aroio/overlay/etc/httpd.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aroio/overlay/etc/httpd.conf b/aroio/overlay/etc/httpd.conf
index 0ca81e77..3073a343 100644
--- a/aroio/overlay/etc/httpd.conf
+++ b/aroio/overlay/etc/httpd.conf
@@ -1,3 +1,2 @@
-I:index.html
+I:/opt/webinterface/frontend/index.html
 *.php:/usr/bin/php-cgi
-/:aroio:abacus

From d1a1f3e665e7149fecd65bc487722928dced8cce Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Thu, 6 Aug 2020 16:20:07 +0200
Subject: [PATCH 10/21] fixed webinterface package

---
 aroio/package/webinterface/webinterface.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
index 0ec0b240..abba4ea8 100644
--- a/aroio/package/webinterface/webinterface.mk
+++ b/aroio/package/webinterface/webinterface.mk
@@ -11,12 +11,12 @@ WEBINTERFACE_SITE = git://github.com/aroio/webinterface
 WEBINTERFACE_LICENSE = MIT
 WEBINTERFACE_DEPENDENCIES = python3 python-uvicorn python-fastapi python-pyjwt
 
-define AROIO_WEBINTERFACE_BUILD_CMDS
+define WEBINTERFACE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		-C $(@D) all
 endef
 
-define AROIO_WEBINTERFACE_INSTALL_TARGET_CMDS
+define WEBINTERFACE_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/opt/webinterface
 	cp -r $(@D)/frontend/dist/aroio-wi/* $(TARGET_DIR)/opt/webinterface
 	cp $(@D)/webinterface.service $(TARGET_DIR)/lib/systemd/system/

From 549c17867d822898dab20cac97e1a2c6fd51de3b Mon Sep 17 00:00:00 2001
From: melf11 <melf.stoecken@googlemail.com>
Date: Fri, 7 Aug 2020 09:52:11 +0200
Subject: [PATCH 11/21] remove old webinterface during webinterface integration

---
 aroio/package/webinterface/webinterface.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
index abba4ea8..b848b532 100644
--- a/aroio/package/webinterface/webinterface.mk
+++ b/aroio/package/webinterface/webinterface.mk
@@ -17,6 +17,7 @@ define WEBINTERFACE_BUILD_CMDS
 endef
 
 define WEBINTERFACE_INSTALL_TARGET_CMDS
+	rm -rf $(TARGET_DIR)/opt/www
 	mkdir -p $(TARGET_DIR)/opt/webinterface
 	cp -r $(@D)/frontend/dist/aroio-wi/* $(TARGET_DIR)/opt/webinterface
 	cp $(@D)/webinterface.service $(TARGET_DIR)/lib/systemd/system/

From 1b985772a12e3ea307c62a4c5ca6eaed1d33de56 Mon Sep 17 00:00:00 2001
From: Melf11 <melf.stoecken@googlemail.com>
Date: Fri, 7 Aug 2020 09:57:18 +0200
Subject: [PATCH 12/21] Update README.md

---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ace02255..1f2c25f1 100644
--- a/README.md
+++ b/README.md
@@ -7,21 +7,22 @@ Note: replace "/output/" with a path of your choice.
 
 ```
 git clone --recurse-submodules git@github.com:aroio/aroio-ng.git
-cd aroio-ng/buildroot
-mkdir /output/
-make BR2_EXTERNAL=../aroio O=/output/aroio aroio_defconfig
+cd aroio-ng
+mkdir output
+cd buildroot
+make BR2_EXTERNAL=../aroio O=../output/aroio aroio_defconfig
 ```
 
 Build image:
 
 ```
-cd /output/aroio
-make
+cd ../output/aroio
+make -j // -j is to use all available cou cores
 ```
 
 Save a new defconfig:
 
 ```
-cd /output/aroio
+cd output/aroio
 make savedefconfig
 ```

From f9b0afb8700de96836d12ea35707373dc075d7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20St=C3=B6cken?= <melf.stoecken@googlemail.com>
Date: Fri, 7 Aug 2020 08:03:53 +0000
Subject: [PATCH 13/21] removed python-pyjwt from webinterface dependencies -
 is already included in buildroot

---
 aroio/package/webinterface/webinterface.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
index b848b532..d1557455 100644
--- a/aroio/package/webinterface/webinterface.mk
+++ b/aroio/package/webinterface/webinterface.mk
@@ -9,7 +9,7 @@ WEBINTERFACE_GIT_SUBMODULES = YES
 WEBINTERFACE_SITE_METHOD = git
 WEBINTERFACE_SITE = git://github.com/aroio/webinterface
 WEBINTERFACE_LICENSE = MIT
-WEBINTERFACE_DEPENDENCIES = python3 python-uvicorn python-fastapi python-pyjwt
+WEBINTERFACE_DEPENDENCIES = python3 python-uvicorn python-fastapi
 
 define WEBINTERFACE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

From 0ee5b50f2443d47dab7826fba29c4a9766549005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Tue, 11 Aug 2020 11:23:39 +0200
Subject: [PATCH 14/21] added missing packages

---
 aroio/package/python-dataclasses/Config.in         |  6 ++++++
 .../python-dataclasses/python-dataclasses.hash     |  5 +++++
 .../python-dataclasses/python-dataclasses.mk       | 14 ++++++++++++++
 aroio/package/python-fastapi/Config.in             |  9 +++++++++
 aroio/package/python-fastapi/python-fastapi.hash   |  5 +++++
 aroio/package/python-fastapi/python-fastapi.mk     | 14 ++++++++++++++
 aroio/package/python-h11/Config.in                 |  7 +++++++
 aroio/package/python-h11/python-h11.hash           |  5 +++++
 aroio/package/python-h11/python-h11.mk             | 14 ++++++++++++++
 aroio/package/python-httptools/Config.in           |  6 ++++++
 .../package/python-httptools/python-httptools.hash |  5 +++++
 aroio/package/python-httptools/python-httptools.mk | 14 ++++++++++++++
 aroio/package/python-starlette/Config.in           |  6 ++++++
 .../package/python-starlette/python-starlette.hash |  3 +++
 aroio/package/python-starlette/python-starlette.mk | 12 ++++++++++++
 aroio/package/python-uvicorn/Config.in             | 11 +++++++++++
 aroio/package/python-uvicorn/python-uvicorn.hash   |  3 +++
 aroio/package/python-uvicorn/python-uvicorn.mk     | 12 ++++++++++++
 18 files changed, 151 insertions(+)
 create mode 100644 aroio/package/python-dataclasses/Config.in
 create mode 100644 aroio/package/python-dataclasses/python-dataclasses.hash
 create mode 100644 aroio/package/python-dataclasses/python-dataclasses.mk
 create mode 100644 aroio/package/python-fastapi/Config.in
 create mode 100644 aroio/package/python-fastapi/python-fastapi.hash
 create mode 100644 aroio/package/python-fastapi/python-fastapi.mk
 create mode 100644 aroio/package/python-h11/Config.in
 create mode 100644 aroio/package/python-h11/python-h11.hash
 create mode 100644 aroio/package/python-h11/python-h11.mk
 create mode 100644 aroio/package/python-httptools/Config.in
 create mode 100644 aroio/package/python-httptools/python-httptools.hash
 create mode 100644 aroio/package/python-httptools/python-httptools.mk
 create mode 100644 aroio/package/python-starlette/Config.in
 create mode 100644 aroio/package/python-starlette/python-starlette.hash
 create mode 100644 aroio/package/python-starlette/python-starlette.mk
 create mode 100644 aroio/package/python-uvicorn/Config.in
 create mode 100644 aroio/package/python-uvicorn/python-uvicorn.hash
 create mode 100644 aroio/package/python-uvicorn/python-uvicorn.mk

diff --git a/aroio/package/python-dataclasses/Config.in b/aroio/package/python-dataclasses/Config.in
new file mode 100644
index 00000000..dae4343d
--- /dev/null
+++ b/aroio/package/python-dataclasses/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_DATACLASSES
+	bool "python-dataclasses"
+	help
+	  A backport of the dataclasses module for Python 3.6.
+
+	  https://github.com/ericvsmith/dataclasses
diff --git a/aroio/package/python-dataclasses/python-dataclasses.hash b/aroio/package/python-dataclasses/python-dataclasses.hash
new file mode 100644
index 00000000..2dc60d81
--- /dev/null
+++ b/aroio/package/python-dataclasses/python-dataclasses.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/dataclasses/json
+md5	969e12cac2b69ddc280758f76b481372  dataclasses-0.7.tar.gz
+sha256	494a6dcae3b8bcf80848eea2ef64c0cc5cd307ffc263e17cdf42f3e5420808e6  dataclasses-0.7.tar.gz
+# Locally computed sha256 checksums
+sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/aroio/package/python-dataclasses/python-dataclasses.mk b/aroio/package/python-dataclasses/python-dataclasses.mk
new file mode 100644
index 00000000..d8369379
--- /dev/null
+++ b/aroio/package/python-dataclasses/python-dataclasses.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-dataclasses
+#
+################################################################################
+
+PYTHON_DATACLASSES_VERSION = 0.7
+PYTHON_DATACLASSES_SOURCE = dataclasses-$(PYTHON_DATACLASSES_VERSION).tar.gz
+PYTHON_DATACLASSES_SITE = https://files.pythonhosted.org/packages/7a/71/fdbab71f1f714e03ead2d264bf444f88379bc09b2937d54ec83894057f80
+PYTHON_DATACLASSES_SETUP_TYPE = setuptools
+PYTHON_DATACLASSES_LICENSE = Apache-2.0
+PYTHON_DATACLASSES_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))
diff --git a/aroio/package/python-fastapi/Config.in b/aroio/package/python-fastapi/Config.in
new file mode 100644
index 00000000..7f2fb22f
--- /dev/null
+++ b/aroio/package/python-fastapi/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_FASTAPI
+	bool "python-fastapi"
+	select BR2_PACKAGE_PYTHON_PYDANTIC # runtime
+	select BR2_PACKAGE_PYTHON_STARLETTE # runtime
+	help
+	  FastAPI framework, high performance, easy to learn, fast to
+	  code, ready for production.
+
+	  https://github.com/tiangolo/fastapi
diff --git a/aroio/package/python-fastapi/python-fastapi.hash b/aroio/package/python-fastapi/python-fastapi.hash
new file mode 100644
index 00000000..44661d26
--- /dev/null
+++ b/aroio/package/python-fastapi/python-fastapi.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/fastapi/json
+md5	2aadc93da3f177388b17a541cafb748a  fastapi-0.55.1.tar.gz
+sha256	912bc1a1b187146fd74dd45e17ea10aede3d962c921142c412458e911c50dc4c  fastapi-0.55.1.tar.gz
+# Locally computed sha256 checksums
+sha256	4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e  LICENSE
diff --git a/aroio/package/python-fastapi/python-fastapi.mk b/aroio/package/python-fastapi/python-fastapi.mk
new file mode 100644
index 00000000..9b1dc567
--- /dev/null
+++ b/aroio/package/python-fastapi/python-fastapi.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-fastapi
+#
+################################################################################
+
+PYTHON_FASTAPI_VERSION = 0.55.1
+PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz
+PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/0a/13/785d0e5967128628f1d6c05ba16d4c9bf9506d7fd35bbe5b2e269d2804ab
+PYTHON_FASTAPI_SETUP_TYPE = distutils
+PYTHON_FASTAPI_LICENSE = MIT
+PYTHON_FASTAPI_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/aroio/package/python-h11/Config.in b/aroio/package/python-h11/Config.in
new file mode 100644
index 00000000..736620d7
--- /dev/null
+++ b/aroio/package/python-h11/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_H11
+	bool "python-h11"
+	help
+	  A pure-Python, bring-your-own-I/O implementation of
+	  HTTP/1.1.
+
+	  https://github.com/python-hyper/h11
diff --git a/aroio/package/python-h11/python-h11.hash b/aroio/package/python-h11/python-h11.hash
new file mode 100644
index 00000000..2c31af14
--- /dev/null
+++ b/aroio/package/python-h11/python-h11.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/h11/json
+md5	53affae306153388512040e038519fa3  h11-0.9.0.tar.gz
+sha256	33d4bca7be0fa039f4e84d50ab00531047e53d6ee8ffbc83501ea602c169cae1  h11-0.9.0.tar.gz
+# Locally computed sha256 checksums
+sha256	37db5bb85926db28a427a25867f10b1232003aea1be69ccb851138adb8e6f361  LICENSE.txt
diff --git a/aroio/package/python-h11/python-h11.mk b/aroio/package/python-h11/python-h11.mk
new file mode 100644
index 00000000..2008e8cf
--- /dev/null
+++ b/aroio/package/python-h11/python-h11.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-h11
+#
+################################################################################
+
+PYTHON_H11_VERSION = 0.9.0
+PYTHON_H11_SOURCE = h11-$(PYTHON_H11_VERSION).tar.gz
+PYTHON_H11_SITE = https://files.pythonhosted.org/packages/34/5a/abaa557d20b210117d8c3e6b0b817ce9b329b2e81f87612e60102a924323
+PYTHON_H11_SETUP_TYPE = setuptools
+PYTHON_H11_LICENSE = MIT
+PYTHON_H11_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))
diff --git a/aroio/package/python-httptools/Config.in b/aroio/package/python-httptools/Config.in
new file mode 100644
index 00000000..ff8f371e
--- /dev/null
+++ b/aroio/package/python-httptools/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_HTTPTOOLS
+	bool "python-httptools"
+	help
+	  A collection of framework independent HTTP protocol utils.
+
+	  https://github.com/MagicStack/httptools
diff --git a/aroio/package/python-httptools/python-httptools.hash b/aroio/package/python-httptools/python-httptools.hash
new file mode 100644
index 00000000..0a6b532b
--- /dev/null
+++ b/aroio/package/python-httptools/python-httptools.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/httptools/json
+md5	063a9b6f8c79cf5f11592e7a49715275  httptools-0.1.1.tar.gz
+sha256	41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce  httptools-0.1.1.tar.gz
+# Locally computed sha256 checksums
+sha256	f4573e7cb7676745fb5b8d36fa548aa93e391cfb6872ddacd65130c45ea6a92d  LICENSE
diff --git a/aroio/package/python-httptools/python-httptools.mk b/aroio/package/python-httptools/python-httptools.mk
new file mode 100644
index 00000000..c59aad29
--- /dev/null
+++ b/aroio/package/python-httptools/python-httptools.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-httptools
+#
+################################################################################
+
+PYTHON_HTTPTOOLS_VERSION = 0.1.1
+PYTHON_HTTPTOOLS_SOURCE = httptools-$(PYTHON_HTTPTOOLS_VERSION).tar.gz
+PYTHON_HTTPTOOLS_SITE = https://files.pythonhosted.org/packages/d9/6f/aad92c3f090e2f74dd728d58d3bba4c832d35199814af99673ee7300b582
+PYTHON_HTTPTOOLS_SETUP_TYPE = setuptools
+PYTHON_HTTPTOOLS_LICENSE = MIT
+PYTHON_HTTPTOOLS_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/aroio/package/python-starlette/Config.in b/aroio/package/python-starlette/Config.in
new file mode 100644
index 00000000..294805cd
--- /dev/null
+++ b/aroio/package/python-starlette/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_STARLETTE
+	bool "python-starlette"
+	help
+	  The little ASGI library that shines.
+
+	  https://github.com/encode/starlette
diff --git a/aroio/package/python-starlette/python-starlette.hash b/aroio/package/python-starlette/python-starlette.hash
new file mode 100644
index 00000000..df649d21
--- /dev/null
+++ b/aroio/package/python-starlette/python-starlette.hash
@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/starlette/json
+md5	888aa6af0a42e5d1f2aeea4941e8102d  starlette-0.13.4.tar.gz
+sha256	04fe51d86fd9a594d9b71356ed322ccde5c9b448fc716ac74155e5821a922f8d  starlette-0.13.4.tar.gz
diff --git a/aroio/package/python-starlette/python-starlette.mk b/aroio/package/python-starlette/python-starlette.mk
new file mode 100644
index 00000000..b3dd0aaa
--- /dev/null
+++ b/aroio/package/python-starlette/python-starlette.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-starlette
+#
+################################################################################
+
+PYTHON_STARLETTE_VERSION = 0.13.4
+PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz
+PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/a1/4f/1f9a90f596c4cdfaa7a9ea68dc3e68bc86073f9581acda507a24617780d0
+PYTHON_STARLETTE_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/aroio/package/python-uvicorn/Config.in b/aroio/package/python-uvicorn/Config.in
new file mode 100644
index 00000000..ad453693
--- /dev/null
+++ b/aroio/package/python-uvicorn/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_UVICORN
+	bool "python-uvicorn"
+	select BR2_PACKAGE_PYTHON_CLICK # runtime
+	select BR2_PACKAGE_PYTHON_H11 # runtime
+	select BR2_PACKAGE_PYTHON_HTTPTOOLS # runtime
+	select BR2_PACKAGE_PYTHON_UVLOOP # runtime
+	select BR2_PACKAGE_PYTHON_WEBSOCKETS # runtime
+	help
+	  The lightning-fast ASGI server.
+
+	  https://github.com/encode/uvicorn
diff --git a/aroio/package/python-uvicorn/python-uvicorn.hash b/aroio/package/python-uvicorn/python-uvicorn.hash
new file mode 100644
index 00000000..b29d17d1
--- /dev/null
+++ b/aroio/package/python-uvicorn/python-uvicorn.hash
@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/uvicorn/json
+md5	9f82b3674ced119596afe3b7b977f82c  uvicorn-0.11.5.tar.gz
+sha256	596eaa8645b6dbc24d6610e335f8ddf5f925b4c4b86fdc7146abb0bf0da65d17  uvicorn-0.11.5.tar.gz
diff --git a/aroio/package/python-uvicorn/python-uvicorn.mk b/aroio/package/python-uvicorn/python-uvicorn.mk
new file mode 100644
index 00000000..192497a9
--- /dev/null
+++ b/aroio/package/python-uvicorn/python-uvicorn.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-uvicorn
+#
+################################################################################
+
+PYTHON_UVICORN_VERSION = 0.11.5
+PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz
+PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/9a/dd/8be4cdd599dafb69c1a2a2427eec14b218d9fc047cb0fd41060afc2852a8
+PYTHON_UVICORN_SETUP_TYPE = setuptools
+
+$(eval $(python-package))

From d29aa785929108a8ecb02d614caca7aa5fd38c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Tue, 11 Aug 2020 11:29:16 +0200
Subject: [PATCH 15/21] added missing packages

---
 aroio/configs/aroio_defconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/aroio/configs/aroio_defconfig b/aroio/configs/aroio_defconfig
index e7e4b02e..0a8b53d5 100644
--- a/aroio/configs/aroio_defconfig
+++ b/aroio/configs/aroio_defconfig
@@ -145,3 +145,15 @@ BR2_PACKAGE_BRUTEFIR=y
 BR2_PACKAGE_JACK_CONNECT_PERSISTENT=y
 BR2_PACKAGE_JACK_MINIMIX=y
 BR2_PACKAGE_WEBINTERFACE=y
+BR2_PACKAGE_PYTHON_CLICK=y
+BR2_PACKAGE_PYTHON_DATACLASSES=y
+BR2_PACKAGE_PYTHON_FASTAPI=y
+BR2_PACKAGE_PYTHON_H11=y
+BR2_PACKAGE_PYTHON_HTTPTOOLS=y
+BR2_PACKAGE_PYTHON_PYDANTIC=y
+BR2_PACKAGE_PYTHON_STARLETTE=y
+BR2_PACKAGE_PYTHON_UVICORN=y
+BR2_PACKAGE_PYTHON_UVLOOP=y
+BR2_PACKAGE_PYTHON_WEBSOCKETS=y
+BR2_PACKAGE_PYTHON_SETUPTOOLS=y
+BR2_PACKAGE_PYTHON_PYJWT=y

From 7cf505ea9c9d118d989ed1849367946a6511540e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Tue, 11 Aug 2020 11:30:09 +0200
Subject: [PATCH 16/21] added missing packages

---
 aroio/Config.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/aroio/Config.in b/aroio/Config.in
index 272a359c..f055278e 100644
--- a/aroio/Config.in
+++ b/aroio/Config.in
@@ -97,3 +97,11 @@ source "$BR2_EXTERNAL_aroio_PATH/package/jack-connect-persistent/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack_minimix/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/rtl8812au/Config.in" 
 source "$BR2_EXTERNAL_aroio_PATH/package/webinterface/Config.in"
+
+source "$BR2_EXTERNAL_aroio_PATH/package/python-dataclasses/Config.in"
+source "$BR2_EXTERNAL_aroio_PATH/package/python-fastapi/Config.in"
+source "$BR2_EXTERNAL_aroio_PATH/package/python-h11/Config.in"
+source "$BR2_EXTERNAL_aroio_PATH/package/python-httptools/Config.in"
+source "$BR2_EXTERNAL_aroio_PATH/package/python-starlette/Config.in"
+source "$BR2_EXTERNAL_aroio_PATH/package/python-uvicorn/Config.in"
+

From 7458aca54077e326a273bf8b701c0e509d61c50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Tue, 11 Aug 2020 11:32:47 +0200
Subject: [PATCH 17/21] added missing packages

---
 aroio/Config.in               | 2 +-
 aroio/configs/aroio_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aroio/Config.in b/aroio/Config.in
index f055278e..9ffd40bd 100644
--- a/aroio/Config.in
+++ b/aroio/Config.in
@@ -96,7 +96,6 @@ source "$BR2_EXTERNAL_aroio_PATH/package/brutefir/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack-connect-persistent/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack_minimix/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/rtl8812au/Config.in" 
-source "$BR2_EXTERNAL_aroio_PATH/package/webinterface/Config.in"
 
 source "$BR2_EXTERNAL_aroio_PATH/package/python-dataclasses/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/python-fastapi/Config.in"
@@ -105,3 +104,4 @@ source "$BR2_EXTERNAL_aroio_PATH/package/python-httptools/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/python-starlette/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/python-uvicorn/Config.in"
 
+source "$BR2_EXTERNAL_aroio_PATH/package/webinterface/Config.in"
diff --git a/aroio/configs/aroio_defconfig b/aroio/configs/aroio_defconfig
index 0a8b53d5..65225150 100644
--- a/aroio/configs/aroio_defconfig
+++ b/aroio/configs/aroio_defconfig
@@ -144,7 +144,6 @@ BR2_PACKAGE_ALSA_PLUGINS=y
 BR2_PACKAGE_BRUTEFIR=y
 BR2_PACKAGE_JACK_CONNECT_PERSISTENT=y
 BR2_PACKAGE_JACK_MINIMIX=y
-BR2_PACKAGE_WEBINTERFACE=y
 BR2_PACKAGE_PYTHON_CLICK=y
 BR2_PACKAGE_PYTHON_DATACLASSES=y
 BR2_PACKAGE_PYTHON_FASTAPI=y
@@ -157,3 +156,4 @@ BR2_PACKAGE_PYTHON_UVLOOP=y
 BR2_PACKAGE_PYTHON_WEBSOCKETS=y
 BR2_PACKAGE_PYTHON_SETUPTOOLS=y
 BR2_PACKAGE_PYTHON_PYJWT=y
+BR2_PACKAGE_WEBINTERFACE=y

From 0d0bed9cb65e7ec264972ed64c1888abb982fbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Tue, 11 Aug 2020 12:35:43 +0200
Subject: [PATCH 18/21] removed hash from webintarface package

---
 aroio/package/webinterface/webinterface.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
index d1557455..0c5750d3 100644
--- a/aroio/package/webinterface/webinterface.mk
+++ b/aroio/package/webinterface/webinterface.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-WEBINTERFACE_VERSION = b62ae0d5439e8dd72bffe34817cab298c1e8bcb4
 WEBINTERFACE_GIT_SUBMODULES = YES
 WEBINTERFACE_SITE_METHOD = git
 WEBINTERFACE_SITE = git://github.com/aroio/webinterface

From 7bc84c6d75f64512d1a1c7f6cd991eaf871d529f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20Sto=CC=88cken?= <melf.stoecken@googlemail.com>
Date: Tue, 11 Aug 2020 14:29:31 +0200
Subject: [PATCH 19/21] adde version to webinterface

---
 aroio/package/webinterface/webinterface.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
index 0c5750d3..d1557455 100644
--- a/aroio/package/webinterface/webinterface.mk
+++ b/aroio/package/webinterface/webinterface.mk
@@ -4,6 +4,7 @@
 #
 ################################################################################
 
+WEBINTERFACE_VERSION = b62ae0d5439e8dd72bffe34817cab298c1e8bcb4
 WEBINTERFACE_GIT_SUBMODULES = YES
 WEBINTERFACE_SITE_METHOD = git
 WEBINTERFACE_SITE = git://github.com/aroio/webinterface

From 8d0074d015c7eb190442485e65b955ad3f67a1e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20St=C3=B6cken?= <melf.stoecken@googlemail.com>
Date: Wed, 12 Aug 2020 13:56:24 +0000
Subject: [PATCH 20/21] updarted webinterface version

---
 aroio/package/webinterface/webinterface.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
index d1557455..57ea6df7 100644
--- a/aroio/package/webinterface/webinterface.mk
+++ b/aroio/package/webinterface/webinterface.mk
@@ -4,17 +4,17 @@
 #
 ################################################################################
 
-WEBINTERFACE_VERSION = b62ae0d5439e8dd72bffe34817cab298c1e8bcb4
+WEBINTERFACE_VERSION = 2.0.7
 WEBINTERFACE_GIT_SUBMODULES = YES
 WEBINTERFACE_SITE_METHOD = git
 WEBINTERFACE_SITE = git://github.com/aroio/webinterface
 WEBINTERFACE_LICENSE = MIT
 WEBINTERFACE_DEPENDENCIES = python3 python-uvicorn python-fastapi
 
-define WEBINTERFACE_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		-C $(@D) all
-endef
+#define WEBINTERFACE_BUILD_CMDS
+#	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+#		-C $(@D) all
+#endef
 
 define WEBINTERFACE_INSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/opt/www

From 86bf89f2b2ecfd67432b82b73ee85b724ae06119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melf=20St=C3=B6cken?= <melf11>
Date: Tue, 10 Nov 2020 03:56:16 -0800
Subject: [PATCH 21/21] merged upstream

---
 aroio/Config.in                            |  8 +-------
 aroio/configs/aroio_defconfig              |  4 +---
 aroio/package/webinterface/webinterface.mk | 11 -----------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/aroio/Config.in b/aroio/Config.in
index f1bf893a..c26f5e93 100644
--- a/aroio/Config.in
+++ b/aroio/Config.in
@@ -96,8 +96,7 @@ source "$BR2_EXTERNAL_aroio_PATH/package/fftw3f/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/brutefir/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack-connect-persistent/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/jack_minimix/Config.in"
-<<<<<<< HEAD
-source "$BR2_EXTERNAL_aroio_PATH/package/rtl8812au/Config.in" 
+source "$BR2_EXTERNAL_aroio_PATH/package/rtl8812au/Config.in"
 
 source "$BR2_EXTERNAL_aroio_PATH/package/python-dataclasses/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/python-fastapi/Config.in"
@@ -105,9 +104,4 @@ source "$BR2_EXTERNAL_aroio_PATH/package/python-h11/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/python-httptools/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/python-starlette/Config.in"
 source "$BR2_EXTERNAL_aroio_PATH/package/python-uvicorn/Config.in"
-
-=======
-source "$BR2_EXTERNAL_aroio_PATH/package/rtl8812au/Config.in"
-source "$BR2_EXTERNAL_aroio_PATH/package/aroio-ui/Config.in"
->>>>>>> upstream/aroio-ng-2020.02
 source "$BR2_EXTERNAL_aroio_PATH/package/webinterface/Config.in"
diff --git a/aroio/configs/aroio_defconfig b/aroio/configs/aroio_defconfig
index 7bff775c..6e005a27 100644
--- a/aroio/configs/aroio_defconfig
+++ b/aroio/configs/aroio_defconfig
@@ -168,7 +168,7 @@ BR2_PACKAGE_ALSA_PLUGINS=y
 BR2_PACKAGE_BRUTEFIR=y
 BR2_PACKAGE_JACK_CONNECT_PERSISTENT=y
 BR2_PACKAGE_JACK_MINIMIX=y
-<<<<<<< HEAD
+
 BR2_PACKAGE_PYTHON_CLICK=y
 BR2_PACKAGE_PYTHON_DATACLASSES=y
 BR2_PACKAGE_PYTHON_FASTAPI=y
@@ -182,5 +182,3 @@ BR2_PACKAGE_PYTHON_WEBSOCKETS=y
 BR2_PACKAGE_PYTHON_SETUPTOOLS=y
 BR2_PACKAGE_PYTHON_PYJWT=y
 BR2_PACKAGE_WEBINTERFACE=y
-=======
->>>>>>> upstream/aroio-ng-2020.02
diff --git a/aroio/package/webinterface/webinterface.mk b/aroio/package/webinterface/webinterface.mk
index ecbcfae7..57ea6df7 100644
--- a/aroio/package/webinterface/webinterface.mk
+++ b/aroio/package/webinterface/webinterface.mk
@@ -4,28 +4,17 @@
 #
 ################################################################################
 
-<<<<<<< HEAD
 WEBINTERFACE_VERSION = 2.0.7
-=======
-WEBINTERFACE_VERSION = b62ae0d5439e8dd72bffe34817cab298c1e8bcb4
->>>>>>> upstream/aroio-ng-2020.02
 WEBINTERFACE_GIT_SUBMODULES = YES
 WEBINTERFACE_SITE_METHOD = git
 WEBINTERFACE_SITE = git://github.com/aroio/webinterface
 WEBINTERFACE_LICENSE = MIT
 WEBINTERFACE_DEPENDENCIES = python3 python-uvicorn python-fastapi
 
-<<<<<<< HEAD
 #define WEBINTERFACE_BUILD_CMDS
 #	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 #		-C $(@D) all
 #endef
-=======
-define WEBINTERFACE_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		-C $(@D) all
-endef
->>>>>>> upstream/aroio-ng-2020.02
 
 define WEBINTERFACE_INSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/opt/www