From 2998441e43a9a86b683ef4e08f608bf17ff88ba5 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Thu, 1 Nov 2018 15:42:02 +0100 Subject: [PATCH] Buildroot: Bump Mycroft to 18.08.4 - Removed config path patch - Removed /.mycroft symlink - Added /root/.mycroft folder in rootfs overlay --- .../0002-Force-USER-config-path-to-root.patch | 23 ------------------- .../python-mycroft/python-mycroft.hash | 1 + .../package/python-mycroft/python-mycroft.mk | 2 +- .../rootfs-overlay/root/.mycroft | 1 - .../rootfs-overlay/root/.mycroft/.empty | 0 5 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch delete mode 120000 buildroot-external/rootfs-overlay/root/.mycroft create mode 100644 buildroot-external/rootfs-overlay/root/.mycroft/.empty diff --git a/buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch b/buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch deleted file mode 100644 index bdead728..00000000 --- a/buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 93b3e606dddd93e8346da265a1751ecb546c882b Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Sat, 13 Oct 2018 10:50:06 +0200 -Subject: [PATCH 1/1] Force USER config path. - ---- - mycroft/configuration/locations.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mycroft/configuration/locations.py b/mycroft/configuration/locations.py -index 0759152f99..3666ac5dfa 100644 ---- a/mycroft/configuration/locations.py -+++ b/mycroft/configuration/locations.py -@@ -15,5 +15,5 @@ from os.path import join, dirname, expanduser - - DEFAULT_CONFIG = join(dirname(__file__), 'mycroft.conf') - SYSTEM_CONFIG = '/etc/mycroft/mycroft.conf' --USER_CONFIG = join(expanduser('~'), '.mycroft/mycroft.conf') -+USER_CONFIG = '/.mycroft/mycroft.conf' - REMOTE_CONFIG = "mycroft.ai" --- -2.11.0 - diff --git a/buildroot-external/package/python-mycroft/python-mycroft.hash b/buildroot-external/package/python-mycroft/python-mycroft.hash index 2115b79b..38794033 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.hash +++ b/buildroot-external/package/python-mycroft/python-mycroft.hash @@ -1,3 +1,4 @@ sha256 90255931a864a4abe30f28c470009cf798dc72221cab16ba41712d80b19e28e4 python-mycroft-v18.8.1.tar.gz sha256 af18bd9ee1c6e3bbc6b424af39b352179d05fc337d04573eadba37b01f7105f6 python-mycroft-v18.8.2.tar.gz sha256 25c583e40e888a99ea6fb0817960952bc26dcf8facf87f77f3363ac0c3c3b9d9 python-mycroft-v18.8.3.tar.gz +sha256 42950284980d415d5cf75c91ad1e59080770cf82a12dc294f106b97fdf8c65c0 python-mycroft-v18.8.4.tar.gz diff --git a/buildroot-external/package/python-mycroft/python-mycroft.mk b/buildroot-external/package/python-mycroft/python-mycroft.mk index e7d7323e..f950f7c5 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.mk +++ b/buildroot-external/package/python-mycroft/python-mycroft.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MYCROFT_VERSION = v18.8.3 +PYTHON_MYCROFT_VERSION = v18.8.4 PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,release/$(PYTHON_MYCROFT_VERSION)) PYTHON_MYCROFT_SETUP_TYPE = setuptools PYTHON_MYCROFT_LICENSE_FILES = diff --git a/buildroot-external/rootfs-overlay/root/.mycroft b/buildroot-external/rootfs-overlay/root/.mycroft deleted file mode 120000 index 1d8c98c4..00000000 --- a/buildroot-external/rootfs-overlay/root/.mycroft +++ /dev/null @@ -1 +0,0 @@ -../.mycroft \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/.empty b/buildroot-external/rootfs-overlay/root/.mycroft/.empty new file mode 100644 index 00000000..e69de29b