From 6c7b39c1c3f8a55d6c69cc501e7b2bd499c3244f Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Thu, 26 Mar 2020 09:51:04 +0100 Subject: [PATCH] MycroftOS: Buildroot: Fixes for the [wip] fully upgrade of the system --- buildroot-external/configs/rpi4_defconfig | 3 +- ...0001-Patch-setup.py-to-be-compatible.patch | 46 ------------ ...-to-use-MANIFEST.in-for-package-data.patch | 73 +++++++++++++++++++ .../python-lingua-franca.hash | 2 +- .../python-lingua-franca.mk | 5 +- .../0013-Downgrade-pyalsaaudio-to-0.8.2.patch | 46 ++++++++++++ ...-python-ipaddress-python2-dependency.patch | 23 ++++++ ...mp-RPI-BT-Firmware-version-to-latest.patch | 35 +++++++++ ...-RPI-Wifi-Firmware-version-to-latest.patch | 35 +++++++++ 9 files changed, 217 insertions(+), 51 deletions(-) delete mode 100644 buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-be-compatible.patch create mode 100644 buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-use-MANIFEST.in-for-package-data.patch create mode 100644 buildroot-patches/0013-Downgrade-pyalsaaudio-to-0.8.2.patch create mode 100644 buildroot-patches/0014-Remove-python-ipaddress-python2-dependency.patch create mode 100644 buildroot-patches/0107-Bump-RPI-BT-Firmware-version-to-latest.patch create mode 100644 buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version-to-latest.patch diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index d471ebae..60f51481 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -228,6 +228,7 @@ BR2_PACKAGE_PYTHON_FLASK_LOGIN=y BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY=y BR2_PACKAGE_PYTHON_HUMANIZE=y BR2_PACKAGE_PYTHON_INFLECTION=y +BR2_PACKAGE_PYTHON_IPADDRESS=y BR2_PACKAGE_PYTHON_LXML=y BR2_PACKAGE_PYTHON_NETADDR=y BR2_PACKAGE_PYTHON_NETIFACES=y @@ -351,8 +352,8 @@ BR2_PACKAGE_SYSKLOGD=y BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y BR2_PACKAGE_SYSTEMD_HIBERNATE=y BR2_PACKAGE_SYSTEMD_LOCALED=y -BR2_PACKAGE_SYSTEMD_LOGIND=y BR2_PACKAGE_SYSTEMD_RFKILL=y +# BR2_PACKAGE_SYSTEMD_VCONSOLE is not set BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_HWCLOCK=y BR2_PACKAGE_UTIL_LINUX_KILL=y diff --git a/buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-be-compatible.patch b/buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-be-compatible.patch deleted file mode 100644 index 80b7c20b..00000000 --- a/buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-be-compatible.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 78295577729b988c7414669897ae781462c92962 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Thu, 19 Mar 2020 19:56:31 +0100 -Subject: [PATCH 1/1] Patch setup.py to be compatible - ---- - setup.py | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/setup.py b/setup.py -index ce0be2f..1c5b14f 100644 ---- a/setup.py -+++ b/setup.py -@@ -22,9 +22,6 @@ def required(requirements_file): - - extra_files = package_files('lingua_franca') - --with open("readme.md", "r") as fh: -- long_description = fh.read() -- - setup( - name='lingua_franca', - version='0.2.0', -@@ -33,12 +30,9 @@ setup( - license='Apache2.0', - package_data={'': extra_files}, - include_package_data=True, -- install_requires=required('requirements.txt'), - author='Mycroft AI', - author_email='dev@mycroft.ai', - description='Mycroft\'s multilingual text parsing and formatting library', -- long_description=long_description, -- long_description_content_type="text/markdown", - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', -@@ -49,5 +43,6 @@ setup( - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', -+ 'Programming Language :: Python :: 3.8', - ], - ) --- -2.25.0 - diff --git a/buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-use-MANIFEST.in-for-package-data.patch b/buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-use-MANIFEST.in-for-package-data.patch new file mode 100644 index 00000000..46746460 --- /dev/null +++ b/buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-use-MANIFEST.in-for-package-data.patch @@ -0,0 +1,73 @@ +From 4913ea0149f03cfccd62f1e41326164a457fdb38 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Thu, 26 Mar 2020 08:41:14 +0100 +Subject: [PATCH 1/1] Patch setup.py to use MANIFEST.in for package data + +--- + MANIFEST.in | 1 + + setup.py | 17 +---------------- + 2 files changed, 2 insertions(+), 16 deletions(-) + create mode 100644 MANIFEST.in + +diff --git a/MANIFEST.in b/MANIFEST.in +new file mode 100644 +index 0000000..97513c5 +--- /dev/null ++++ b/MANIFEST.in +@@ -0,0 +1 @@ ++graft lingua_franca +diff --git a/setup.py b/setup.py +index ce0be2f..e25f0a2 100644 +--- a/setup.py ++++ b/setup.py +@@ -3,14 +3,6 @@ import os + from setuptools import setup + + +-def package_files(directory): +- paths = [] +- for (path, directories, filenames) in os.walk(directory): +- for filename in filenames: +- paths.append(os.path.join('..', path, filename)) +- return paths +- +- + def required(requirements_file): + """ Read requirements file and remove comments and empty lines. """ + with open(os.path.join(os.path.dirname(__file__), requirements_file), +@@ -20,25 +12,17 @@ def required(requirements_file): + if pkg.strip() and not pkg.startswith("#")] + + +-extra_files = package_files('lingua_franca') +- +-with open("readme.md", "r") as fh: +- long_description = fh.read() +- + setup( + name='lingua_franca', + version='0.2.0', + packages=['test', 'lingua_franca', 'lingua_franca.lang'], + url='https://github.com/MycroftAI/lingua-franca', + license='Apache2.0', +- package_data={'': extra_files}, + include_package_data=True, + install_requires=required('requirements.txt'), + author='Mycroft AI', + author_email='dev@mycroft.ai', + description='Mycroft\'s multilingual text parsing and formatting library', +- long_description=long_description, +- long_description_content_type="text/markdown", + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', +@@ -49,5 +33,6 @@ setup( + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', ++ 'Programming Language :: Python :: 3.8', + ], + ) +-- +2.25.0 + diff --git a/buildroot-external/package/python-lingua-franca/python-lingua-franca.hash b/buildroot-external/package/python-lingua-franca/python-lingua-franca.hash index a9dde590..77f20246 100644 --- a/buildroot-external/package/python-lingua-franca/python-lingua-franca.hash +++ b/buildroot-external/package/python-lingua-franca/python-lingua-franca.hash @@ -1 +1 @@ -sha256 9acadc14c7198030cd353a7e0fd0b1a915fb298a601b8c1592e103b48c92a440 lingua_franca-0.2.0.tar.gz +sha256 bc34c218a47f66e434a4d9de69d82f1a196b944306dddfddb6426cd270fd00cd python-lingua-franca-a45b9d12a2a8adace210055a38f432dd51e7456d.tar.gz diff --git a/buildroot-external/package/python-lingua-franca/python-lingua-franca.mk b/buildroot-external/package/python-lingua-franca/python-lingua-franca.mk index 176a2629..e4565ace 100644 --- a/buildroot-external/package/python-lingua-franca/python-lingua-franca.mk +++ b/buildroot-external/package/python-lingua-franca/python-lingua-franca.mk @@ -4,9 +4,8 @@ # ################################################################################ -PYTHON_LINGUA_FRANCA_VERSION = 0.2.0 -PYTHON_LINGUA_FRANCA_SOURCE = lingua_franca-$(PYTHON_LINGUA_FRANCA_VERSION).tar.gz -PYTHON_LINGUA_FRANCA_SITE = https://files.pythonhosted.org/packages/9f/04/54b9cfd14011f61e3d91592354e2460a5d85506c8996f802c1b4c1f9c9ff +PYTHON_LINGUA_FRANCA_VERSION = a45b9d12a2a8adace210055a38f432dd51e7456d +PYTHON_LINGUA_FRANCA_SITE = $(call github,MycroftAI,lingua-franca,$(PYTHON_LINGUA_FRANCA_VERSION)) PYTHON_LINGUA_FRANCA_SETUP_TYPE = setuptools PYTHON_LINGUA_FRANCA_LICENSE = Apache-2.0 PYTHON_LINGUA_FRANCA_LICENSE_FILES = LICENSE diff --git a/buildroot-patches/0013-Downgrade-pyalsaaudio-to-0.8.2.patch b/buildroot-patches/0013-Downgrade-pyalsaaudio-to-0.8.2.patch new file mode 100644 index 00000000..c6f81037 --- /dev/null +++ b/buildroot-patches/0013-Downgrade-pyalsaaudio-to-0.8.2.patch @@ -0,0 +1,46 @@ +From 4253b377a283a743a7eefe9eb2be4faa0009de6f Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sat, 21 Mar 2020 14:03:20 +0100 +Subject: [PATCH 1/1] Downgrade python-alsaaudio to 0.8.2 + +This reverts commit 1dd077a0b1cabd64583b917a5e51ba43ed451691. +--- + package/python-alsaaudio/python-alsaaudio.hash | 9 ++++----- + package/python-alsaaudio/python-alsaaudio.mk | 6 +++--- + 2 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/package/python-alsaaudio/python-alsaaudio.hash b/package/python-alsaaudio/python-alsaaudio.hash +index 476bc8f1a1..92277ec393 100644 +--- a/package/python-alsaaudio/python-alsaaudio.hash ++++ b/package/python-alsaaudio/python-alsaaudio.hash +@@ -1,5 +1,4 @@ +-# md5, sha256 from https://pypi.org/pypi/pyalsaaudio/json +-md5 b46f69561bc85fc52e698b2440ca251e pyalsaaudio-0.8.4.tar.gz +-sha256 84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085 pyalsaaudio-0.8.4.tar.gz +-# Locally computed sha256 checksums +-sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE ++# From https://pypi.python.org/pypi?:action=show_md5&digest=1f22415a3d8da4b303182ad81c2d062e ++md5 1f22415a3d8da4b303182ad81c2d062e pyalsaaudio-0.8.2.tar.gz ++# Locally calculated ++sha256 b6df486f1c4035041a5f3800496b86c64e48e4a7d47f94dcbca11b0187aa3a15 pyalsaaudio-0.8.2.tar.gz +diff --git a/package/python-alsaaudio/python-alsaaudio.mk b/package/python-alsaaudio/python-alsaaudio.mk +index 3344583cf7..73a7e74b03 100644 +--- a/package/python-alsaaudio/python-alsaaudio.mk ++++ b/package/python-alsaaudio/python-alsaaudio.mk +@@ -4,10 +4,10 @@ + # + ################################################################################ + +-PYTHON_ALSAAUDIO_VERSION = 0.8.4 ++PYTHON_ALSAAUDIO_VERSION = 0.8.2 + PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz +-PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/52/b6/44871791929d9d7e11325af0b7be711388dfeeab17147988f044a41a6d83 +-PYTHON_ALSAAUDIO_SETUP_TYPE = setuptools ++PYTHON_ALSAAUDIO_SITE = https://pypi.python.org/packages/source/p/pyalsaaudio ++PYTHON_ALSAAUDIO_SETUP_TYPE = distutils + PYTHON_ALSAAUDIO_LICENSE = Python-2.0 + PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE + PYTHON_ALSAAUDIO_DEPENDENCIES = alsa-lib +-- +2.25.0 + diff --git a/buildroot-patches/0014-Remove-python-ipaddress-python2-dependency.patch b/buildroot-patches/0014-Remove-python-ipaddress-python2-dependency.patch new file mode 100644 index 00000000..5dbb4dcd --- /dev/null +++ b/buildroot-patches/0014-Remove-python-ipaddress-python2-dependency.patch @@ -0,0 +1,23 @@ +From d9887a607e129081ed759c122c2d4d9c47b78482 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 29 Oct 2018 14:09:20 +0100 +Subject: [PATCH 1/1] Remove python-ipaddress python2 dependency + +--- + package/python-ipaddress/Config.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in +index b2b9f0b1c3..badd8eeaed 100644 +--- a/package/python-ipaddress/Config.in ++++ b/package/python-ipaddress/Config.in +@@ -1,6 +1,5 @@ + config BR2_PACKAGE_PYTHON_IPADDRESS + bool "python-ipaddress" +- depends on BR2_PACKAGE_PYTHON + help + Python 3.3's ipaddress for older Python versions. + +-- +2.11.0 + diff --git a/buildroot-patches/0107-Bump-RPI-BT-Firmware-version-to-latest.patch b/buildroot-patches/0107-Bump-RPI-BT-Firmware-version-to-latest.patch new file mode 100644 index 00000000..0d947019 --- /dev/null +++ b/buildroot-patches/0107-Bump-RPI-BT-Firmware-version-to-latest.patch @@ -0,0 +1,35 @@ +From b7c3b4b1cbc21c15affbf2d7199e1fe8ca4c6162 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 28 Oct 2019 15:48:48 +0100 +Subject: [PATCH 1/1] Bump RPI BT Firmware version to latest + +--- + package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- + package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash +index a3c7281d75..a9703150df 100644 +--- a/package/rpi-bt-firmware/rpi-bt-firmware.hash ++++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash +@@ -1,3 +1,3 @@ + # Locally computed +-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz ++sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz + sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk +index 23923453c4..785f007cc3 100644 +--- a/package/rpi-bt-firmware/rpi-bt-firmware.mk ++++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 ++RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 + RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) + RPI_BT_FIRMWARE_LICENSE = PROPRIETARY + RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +-- +2.11.0 + diff --git a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version-to-latest.patch b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version-to-latest.patch new file mode 100644 index 00000000..4b67770e --- /dev/null +++ b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version-to-latest.patch @@ -0,0 +1,35 @@ +From d4e129660fede6331859dd3c955dbcdff851d8c9 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 28 Oct 2019 15:53:01 +0100 +Subject: [PATCH 1/1] Bump RPI Wifi Firmware version to latest + +--- + package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- + package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +index 5de9e0f13f..c1f9494577 100644 +--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash ++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +@@ -1,3 +1,3 @@ + # Locally calculated +-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz ++sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz + sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +index 9dd1854b9a..6be02509fe 100644 +--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk ++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 ++RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 + RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) + RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY + RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +-- +2.11.0 +