unicap · Melf11 · Jul 23, 2020 · Jul 24, 2020 · Jul 24, 2020 · Jul 24, 2020
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+output/
diff --git a/README.md b/README.md
@@ -6,22 +6,23 @@ To initialize this buildroot:
 Note: replace "/output/" with a path of your choice.
 
 ```
-git clone --recurse-submodules [email protected]:unicap/aroio-ng.git
-cd aroio-ng/buildroot
-mkdir /output/
-make BR2_EXTERNAL=../aroio O=/output/aroio aroio_defconfig
+git clone --recurse-submodules [email protected]:aroio/aroio-ng.git
+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
 ```
diff --git a/aroio/Config.in b/aroio/Config.in
@@ -99,5 +99,11 @@ 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/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"
 source "$BR2_EXTERNAL_aroio_PATH/package/webinterface/Config.in"
diff --git a/aroio/configs/aroio_defconfig b/aroio/configs/aroio_defconfig
@@ -170,3 +170,17 @@ BR2_PACKAGE_ALSA_PLUGINS=y
 BR2_PACKAGE_BRUTEFIR=y
 BR2_PACKAGE_JACK_CONNECT_PERSISTENT=y
 BR2_PACKAGE_JACK_MINIMIX=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
+BR2_PACKAGE_WEBINTERFACE=y
diff --git 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
diff --git a/aroio/package/python-dataclasses/Config.in 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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))
diff --git 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