From 3be58ed50ae68c7155b18a08e0e0ce6e0ab3229a Mon Sep 17 00:00:00 2001 From: j1nx Date: Thu, 18 Mar 2021 09:11:54 +0100 Subject: [PATCH 01/10] Bump buildroot to latest 2021.02.x LTS version --- .gitmodules | 2 +- buildroot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 421d6f6d..a451abfd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot url = https://github.com/buildroot/buildroot.git - branch = 2020.11.x + branch = 2021.02.x diff --git a/buildroot b/buildroot index 6b8e73d6..1abb1d11 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 6b8e73d6a1958fcf441d91338c64c73aadcc43e4 +Subproject commit 1abb1d1187dd59bdd812308bdf8025993151acc5 From df21d07af238dadfb11c5b014648dbcf1b338c7d Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 29 Mar 2021 09:28:25 +0200 Subject: [PATCH 02/10] Get into shape for Buildroot 2021.02 --- buildroot | 2 +- .../configs/rpi4_64-gui_defconfig | 30 +- buildroot-external/package/fann/fann.hash | 2 +- buildroot-external/package/fann/fann.mk | 2 +- .../python-pymplayer/python-pymplayer.hash | 2 +- buildroot-external/package/qt5ct/qt5ct.hash | 2 +- ...002-Downgrade-python-pillow-to-7.1.2.patch | 26 +- .../0004-Downgrade-python-serial-to-3.0.patch | 30 +- ...0008-Downgrade-python-pyjwt-to-1.6.4.patch | 30 +- ...009-Downgrade-python-pyyaml-to-5.1.2.patch | 30 +- .../0103-Downgrade-Python-to-3.8.6.patch | 1556 ----------------- .../0106-Bump-RPI-Firmware-version.patch | 8 +- .../0108-Bump-RPI-Wifi-Firmware-version.patch | 8 +- ...5-Fix-qt5webengine-host-dependencies.patch | 35 + 14 files changed, 129 insertions(+), 1634 deletions(-) delete mode 100644 buildroot-patches/0103-Downgrade-Python-to-3.8.6.patch create mode 100644 buildroot-patches/0115-Fix-qt5webengine-host-dependencies.patch diff --git a/buildroot b/buildroot index 1abb1d11..6c04e6fb 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 1abb1d1187dd59bdd812308bdf8025993151acc5 +Subproject commit 6c04e6fb0447ddc5e3ffa0a5df268837ebdb0b91 diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 5fa166f4..284c9cec 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -10,8 +10,8 @@ BR2_GLOBAL_PATCH_DIR="../buildroot-patches" BR2_FORCE_HOST_BUILD=y BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_GLIBC_UTILS=y +BR2_BINUTILS_VERSION_2_34_X=y BR2_GCC_VERSION_10_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y @@ -34,7 +34,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4-64/post-image.s BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/617a1c1722aeaa4d69356e18b88d569366f1ac1b.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/13c43880f2ee6db7d26949cb6a3e8db1a4b76736.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -66,8 +66,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_ESPEAK=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_NONFREE=y -BR2_PACKAGE_FFMPEG_FFPLAY=y -BR2_PACKAGE_FFMPEG_FFPROBE=y +# BR2_PACKAGE_FFMPEG_FFMPEG is not set BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y BR2_PACKAGE_GSTREAMER1=y @@ -139,14 +138,30 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC=y BR2_PACKAGE_GST1_PLUGINS_UGLY=y +BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX=y +BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC=y +BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB=y +BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX=y +BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD=y +BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC=y +BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y BR2_PACKAGE_GST1_LIBAV=y BR2_PACKAGE_GST1_VAAPI=y BR2_PACKAGE_MIMIC=y @@ -154,6 +169,7 @@ BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO=y BR2_PACKAGE_MPV=y BR2_PACKAGE_PULSEAUDIO_DAEMON=y BR2_PACKAGE_SQUEEZELITE=y +BR2_PACKAGE_SQUEEZELITE_RESAMPLE=y BR2_PACKAGE_VLC=y BR2_PACKAGE_GZIP=y BR2_PACKAGE_LZIP=y @@ -192,7 +208,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y BR2_PACKAGE_MESA3D_OPENGL_ES=y -BR2_PACKAGE_SDL2_KMSDRM=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT53D=y BR2_PACKAGE_QT5BASE_CONCURRENT=y @@ -379,6 +394,8 @@ BR2_PACKAGE_LIBSVG_CAIRO=y BR2_PACKAGE_OPENJPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_WAFFLE=y +BR2_PACKAGE_DTC=y +BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBV4L=y @@ -387,11 +404,9 @@ BR2_PACKAGE_LIBFASTJSON=y BR2_PACKAGE_YAJL=y BR2_PACKAGE_LIBMATROSKA=y BR2_PACKAGE_LIBMMS=y -BR2_PACKAGE_LIBMPEG2=y BR2_PACKAGE_LIBMPEG2_BINS=y BR2_PACKAGE_LIBOPENH264=y BR2_PACKAGE_LIBOPUSENC=y -BR2_PACKAGE_X264=y BR2_PACKAGE_X265=y BR2_PACKAGE_GLIB_NETWORKING=y BR2_PACKAGE_LIBCURL_CURL=y @@ -519,7 +534,6 @@ BR2_PACKAGE_LOTTIE_QML=y BR2_PACKAGE_NCPAMIXER=y BR2_PACKAGE_OVOS_SPLASH=y BR2_PACKAGE_QT5CT=y -BR2_PACKAGE_RESPEAKER=y BR2_PACKAGE_SNAPCAST=y BR2_PACKAGE_SNAPCAST_SERVER=y BR2_PACKAGE_SPOTIFYD=y diff --git a/buildroot-external/package/fann/fann.hash b/buildroot-external/package/fann/fann.hash index 3d826a52..53d29749 100644 --- a/buildroot-external/package/fann/fann.hash +++ b/buildroot-external/package/fann/fann.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 220744f0510480217d72191ae54e929ef5fa6cf69733b39a7c8ea52d99e8ed8e fann-7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1.tar.gz +sha256 488e4c52e3ca00ebfe6010e61856184ff4fe470ec36c8b8efe0515c4c316378d fann-a3cd24e528d6a865915a4fed6e8fac164ff8bfdc-br1.tar.gz diff --git a/buildroot-external/package/fann/fann.mk b/buildroot-external/package/fann/fann.mk index 441e4aab..fa423ec6 100644 --- a/buildroot-external/package/fann/fann.mk +++ b/buildroot-external/package/fann/fann.mk @@ -4,7 +4,7 @@ # ################################################################################ -FANN_VERSION = 7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1 +FANN_VERSION = a3cd24e528d6a865915a4fed6e8fac164ff8bfdc FANN_SITE = git://github.com/libfann/fann.git FANN_LICENSE = GNU Lesser General Public License v2.1 FANN_AUTORECONF = YES diff --git a/buildroot-external/package/python-pymplayer/python-pymplayer.hash b/buildroot-external/package/python-pymplayer/python-pymplayer.hash index 6215b7b5..8924a5d0 100644 --- a/buildroot-external/package/python-pymplayer/python-pymplayer.hash +++ b/buildroot-external/package/python-pymplayer/python-pymplayer.hash @@ -1,2 +1,2 @@ # sha256 from https://pypi.org -sha256 f4048a6e882a093affc52469889fbbfa0514fec2e4b01b39446f9d795ab44333 python-pymplayer-eaa0a1dbfc60cb0f4f1b3e495d665714c089474a.tar.gz +sha256 4e8e4581761fffdd8915829baf2b16b83265a6aa75455f1647667fdc8091bad2 python-pymplayer-eaa0a1dbfc60cb0f4f1b3e495d665714c089474a-br1.tar.gz diff --git a/buildroot-external/package/qt5ct/qt5ct.hash b/buildroot-external/package/qt5ct/qt5ct.hash index c2fe4295..c9fd9400 100644 --- a/buildroot-external/package/qt5ct/qt5ct.hash +++ b/buildroot-external/package/qt5ct/qt5ct.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 e4559ce376aa180fe6cbd4dc8b6821150be63f5d2a3dc60b2c104e01d0076fad qt5ct-587.tar.gz +sha256 7c8aaa1e107e9d3d6ce7ef12a65c458c1202285dfafe26138272fddb7b9bb24a qt5ct-587-br2.tar.gz diff --git a/buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch b/buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch index 1547be2a..d852dc01 100644 --- a/buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch +++ b/buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch @@ -1,47 +1,47 @@ -From f058f4270a1dadee8ade285c55fc26b9224920e9 Mon Sep 17 00:00:00 2001 +From 9869a77fbda84c96968708e1c32116a6b742c6f8 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 29 Oct 2020 19:39:49 +0100 +Date: Thu, 18 Mar 2021 09:57:31 +0100 Subject: [PATCH 1/1] Downgrade python-pillow to 7.1.2 --- - package/python-pillow/Config.in | 1 - + package/python-pillow/Config.in | 2 -- package/python-pillow/python-pillow.hash | 2 +- package/python-pillow/python-pillow.mk | 4 ++-- - 3 files changed, 3 insertions(+), 4 deletions(-) + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in -index f98a4a9e5b..f824d1371e 100644 +index ae6d8c8346..f824d1371e 100644 --- a/package/python-pillow/Config.in +++ b/package/python-pillow/Config.in -@@ -1,7 +1,6 @@ +@@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime +- select BR2_PACKAGE_PYTHON3_ZLIB help Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash -index f80b79fe5f..d222645633 100644 +index 0849577f66..0354269e0e 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash -@@ -1,5 +1,5 @@ +@@ -1,4 +1,4 @@ # md5, sha256 from https://pypi.org/project/Pillow/ - md5 f1f7592c51260e5080d3cd71781ea675 Pillow-7.1.2.tar.gz --sha256 97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 Pillow-7.2.0.tar.gz +-sha256 11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e Pillow-8.0.1.tar.gz +sha256 a0b49960110bc6ff5fead46013bcb8825d101026d466f3a4de3476defe0fb0dd Pillow-7.1.2.tar.gz # Locally computed sha256 checksums sha256 37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk -index 931dce53d2..2832eeee0b 100644 +index 60a0bb3e1b..a091ebe64f 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ --PYTHON_PILLOW_VERSION = 7.2.0 --PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/3e/02/b09732ca4b14405ff159c470a612979acfc6e8645dc32f83ea0129709f7a +-PYTHON_PILLOW_VERSION = 8.0.1 +-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1 +PYTHON_PILLOW_VERSION = 7.1.2 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ce/ef/e793f6ffe245c960c42492d0bb50f8d14e2ba223f1922a5c3c81569cec44 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz diff --git a/buildroot-patches/0004-Downgrade-python-serial-to-3.0.patch b/buildroot-patches/0004-Downgrade-python-serial-to-3.0.patch index 4be966cd..04e33820 100644 --- a/buildroot-patches/0004-Downgrade-python-serial-to-3.0.patch +++ b/buildroot-patches/0004-Downgrade-python-serial-to-3.0.patch @@ -1,40 +1,40 @@ -From b331a66c7cc9efadf2dcb4ae26cd592bbecb4278 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 7 Jan 2019 14:57:24 +0100 +From 132d418ad686aadf646ba7a8c90774e460f05690 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 18 Mar 2021 10:01:14 +0100 Subject: [PATCH 1/1] Downgrade python-serial to 3.0 --- - package/python-serial/python-serial.hash | 1 + + package/python-serial/python-serial.hash | 2 +- package/python-serial/python-serial.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-serial/python-serial.hash b/package/python-serial/python-serial.hash -index 96209a9965..0c68849324 100644 +index d885d3c0c8..dff215eff2 100644 --- a/package/python-serial/python-serial.hash +++ b/package/python-serial/python-serial.hash -@@ -1,5 +1,6 @@ +@@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyserial/json - md5 ed6183b15519a0ae96675e9c3330c69b pyserial-3.4.tar.gz - sha256 6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 pyserial-3.4.tar.gz -+sha256 056c2d96c83c009d8d04aad43a90f91f10f6a97d42c0d9656c2655c63fb8ff07 pyserial-3.0.tar.gz + md5 1cf25a76da59b530dbfc2cf99392dc83 pyserial-3.5.tar.gz +-sha256 3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb pyserial-3.5.tar.gz ++sha256 056c2d96c83c009d8d04aad43a90f91f10f6a97d42c0d9656c2655c63fb8ff07 pyserial-3.0.tar.gz # Locally computed sha256 checksums - sha256 a89d951d157e2c199fbbe7ecf8d41bc3bc93de166db524aa6b9b610dbccc832d LICENSE.txt + sha256 f91cb9813de6a5b142b8f7f2dede630b5134160aedaeaf55f4d6a7e2593ca3f3 LICENSE.txt diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk -index d583ac65ab..70cf6452f5 100644 +index 249ea9d5a3..70cf6452f5 100644 --- a/package/python-serial/python-serial.mk +++ b/package/python-serial/python-serial.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_SERIAL_VERSION = 3.4 +-PYTHON_SERIAL_VERSION = 3.5 +PYTHON_SERIAL_VERSION = 3.0 PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz --PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/cc/74/11b04703ec416717b247d789103277269d567db575d2fd88f25d9767fe3d +-PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/1e/7d/ae3f0a63f41e4d2f6cb66a5b57197850f919f59e558159a4dd3a818f5082 +PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/69/89/24fc8c26e23710a0d8fdf9e8134b28ceeab421d3f3e0165ceca6bdb98193 PYTHON_SERIAL_LICENSE = BSD-3-Clause PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt PYTHON_SERIAL_SETUP_TYPE = setuptools -- -2.11.0 +2.20.1 diff --git a/buildroot-patches/0008-Downgrade-python-pyjwt-to-1.6.4.patch b/buildroot-patches/0008-Downgrade-python-pyjwt-to-1.6.4.patch index 11e6abfe..8aa9cb35 100644 --- a/buildroot-patches/0008-Downgrade-python-pyjwt-to-1.6.4.patch +++ b/buildroot-patches/0008-Downgrade-python-pyjwt-to-1.6.4.patch @@ -1,40 +1,40 @@ -From 3bee492eb3f991b66401e4d47730e02dd59bca99 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 2 Sep 2019 20:37:58 +0200 +From 8f9cad2b43052880a35c4b33bcf20fbf43adf5e6 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 18 Mar 2021 15:14:11 +0100 Subject: [PATCH 1/1] Downgrade python-pyjwt to 1.6.4 --- - package/python-pyjwt/python-pyjwt.hash | 1 + + package/python-pyjwt/python-pyjwt.hash | 2 +- package/python-pyjwt/python-pyjwt.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash -index 62ec3559af..0842d2d899 100644 +index 10875510f0..249ffa285c 100644 --- a/package/python-pyjwt/python-pyjwt.hash +++ b/package/python-pyjwt/python-pyjwt.hash -@@ -1,5 +1,6 @@ +@@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json - md5 a4712f980c008696e13e09504120b2a0 PyJWT-1.7.1.tar.gz - sha256 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 PyJWT-1.7.1.tar.gz -+sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz + md5 7a1b1c8bfeb67c31ee4fdadefe5ff4b8 PyJWT-2.0.0.tar.gz +-sha256 7a2b271c6dac2fda9e0c33d176c4253faba2c6c6b3a99c7f28a32c3c97522779 PyJWT-2.0.0.tar.gz ++sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz # Locally computed sha256 checksums - sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE + sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk -index dfc66e5651..18b7976b19 100644 +index 9215911389..18b7976b19 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_PYJWT_VERSION = 1.7.1 +-PYTHON_PYJWT_VERSION = 2.0.0 +PYTHON_PYJWT_VERSION = 1.6.4 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz --PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c +-PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/14/6d/096dc269d105ba374d6bfd3ecb22b516795ca0572499820dadc8178d9ae1 +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE -- -2.11.0 +2.20.1 diff --git a/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch b/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch index 1846c50c..f0dec0c3 100644 --- a/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch +++ b/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch @@ -1,6 +1,6 @@ -From 04b2b1e2bc267a68b8b377d070a655a47e901744 Mon Sep 17 00:00:00 2001 +From e33b75b1d7184d593b376b70cb6253edbd96215f Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 29 Oct 2020 20:05:23 +0100 +Date: Thu, 18 Mar 2021 15:18:06 +0100 Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2 --- @@ -10,46 +10,48 @@ Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash -index 90e1f2199e..fb6cd3b365 100644 +index 82b2f4f880..025b5ac065 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json - md5 d3590b85917362e837298e733321962b PyYAML-5.3.1.tar.gz --sha256 b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d PyYAML-5.3.1.tar.gz + md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz +-sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz +sha256 01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4 PyYAML-5.1.2.tar.gz # Locally computed sha256 checksums - sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 LICENSE + sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk -index 7bbae309c6..7cdd8edefb 100644 +index c9013de8ec..87c2079f92 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync package/python3-pyyaml/python3-pyyaml.mk --PYTHON_PYYAML_VERSION = 5.3.1 +-PYTHON_PYYAML_VERSION = 5.4.1 +PYTHON_PYYAML_VERSION = 5.1.2 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz --PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c +-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe - PYTHON_PYYAML_SETUP_TYPE = distutils +-PYTHON_PYYAML_SETUP_TYPE = setuptools ++PYTHON_PYYAML_SETUP_TYPE = distutils PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk -index c0dcebf4fc..6c149168ae 100644 +index f758341502..5a331905a3 100644 --- a/package/python3-pyyaml/python3-pyyaml.mk +++ b/package/python3-pyyaml/python3-pyyaml.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pyyaml/python-pyyaml.mk --PYTHON3_PYYAML_VERSION = 5.3.1 +-PYTHON3_PYYAML_VERSION = 5.4.1 +PYTHON3_PYYAML_VERSION = 5.1.2 PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz --PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c +-PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe - PYTHON3_PYYAML_SETUP_TYPE = distutils +-PYTHON3_PYYAML_SETUP_TYPE = setuptools ++PYTHON3_PYYAML_SETUP_TYPE = distutils PYTHON3_PYYAML_LICENSE = MIT PYTHON3_PYYAML_LICENSE_FILES = LICENSE -- diff --git a/buildroot-patches/0103-Downgrade-Python-to-3.8.6.patch b/buildroot-patches/0103-Downgrade-Python-to-3.8.6.patch deleted file mode 100644 index c6c49d1c..00000000 --- a/buildroot-patches/0103-Downgrade-Python-to-3.8.6.patch +++ /dev/null @@ -1,1556 +0,0 @@ -From 84c91c90f10bbfe7a6f2b804c0f1a9513ff2c08a Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Mon, 11 Jan 2021 15:59:51 +0100 -Subject: [PATCH 1/1] Downgrade Python to 3.8.6 - ---- - ...e-the-build-of-pyc-files-conditional.patch | 14 +++---- - ...taddrinfo-configure-test-when-cross-.patch | 8 ++-- - ...re-to-disable-the-build-of-certain-e.patch | 20 +++++----- - ...y-header-paths-for-cross-compilation.patch | 12 +++--- - ...ook-in-usr-lib-termcap-for-libraries.patch | 8 ++-- - .../0006-Don-t-add-multiarch-paths.patch | 8 ++-- - .../0007-Abort-on-failed-module-build.patch | 8 ++-- - .../0008-Serial-ioctl-workaround.patch | 6 +-- - ...e-shebang-of-Python-scripts-for-cros.patch | 4 +- - ...ig.sh.in-ensure-sed-invocations-only.patch | 4 +- - ...locale-and-set-to-default-when-addin.patch | 14 +++---- - ...Add-importlib-fix-for-PEP-3147-issue.patch | 12 +++--- - ...-disable-installation-of-test-module.patch | 29 ++++++-------- - .../0014-Add-an-option-to-disable-pydoc.patch | 28 ++++++------- - ...015-Add-an-option-to-disable-lib2to3.patch | 24 +++++------ - ...option-to-disable-the-sqlite3-module.patch | 16 ++++---- - ...d-an-option-to-disable-the-tk-module.patch | 20 +++++----- - ...-option-to-disable-the-curses-module.patch | 26 ++++++------ - .../0019-Add-an-option-to-disable-expat.patch | 20 +++++----- - ...-Add-an-option-to-disable-CJK-codecs.patch | 8 ++-- - .../0021-Add-an-option-to-disable-NIS.patch | 8 ++-- - ...Add-an-option-to-disable-unicodedata.patch | 8 ++-- - .../0023-Add-an-option-to-disable-IDLE.patch | 20 +++++----- - ...024-Add-an-option-to-disable-decimal.patch | 16 ++++---- - ...on-to-disable-the-ossaudiodev-module.patch | 8 ++-- - ...an-option-to-disable-openssl-support.patch | 8 ++-- - ...ption-to-disable-the-readline-module.patch | 8 ++-- - ...to-disable-zlib-bzip2-and-xz-modules.patch | 8 ++-- - ...thon-config.sh-don-t-reassign-prefix.patch | 4 +- - ...-Fix-cross-compiling-the-uuid-module.patch | 8 ++-- - ...Add-an-option-to-disable-uuid-module.patch | 8 ++-- - ...-fix-building-on-older-distributions.patch | 4 +- - ...up-CC-print-multiarch-output-for-mus.patch | 8 ++-- - ...-ng-doesn-t-set-errno-when-encryptio.patch | 40 ------------------- - package/python3/python3.hash | 6 +-- - package/python3/python3.mk | 4 +- - 36 files changed, 204 insertions(+), 251 deletions(-) - delete mode 100644 package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch - -diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch -index 5eb296c6d8..1010d08d53 100644 ---- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch -+++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch -@@ -1,4 +1,4 @@ --From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 -+From 586a67bb448290a98df45e9f61d803952d2aa761 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 16:21:31 -0800 - Subject: [PATCH] Make the build of pyc files conditional -@@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov - 2 files changed, 8 insertions(+) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 77f91e72b1..0c809f3d8a 100644 -+index 502317aa0c..f9011c132a 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1528,6 +1528,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c -+@@ -1455,6 +1455,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -@@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -j0 -d $(LIBDEST) -f \ --@@ -1555,6 +1556,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c -+@@ -1482,6 +1483,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ - -j0 -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -@@ -35,10 +35,10 @@ index 77f91e72b1..0c809f3d8a 100644 - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - diff --git a/configure.ac b/configure.ac --index d60f05251a..1ee5a09588 100644 -+index a189d42c2c..4690cdba9f 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -1112,6 +1112,12 @@ fi -+@@ -1091,6 +1091,12 @@ fi - - AC_MSG_CHECKING(LDLIBRARY) - -@@ -52,5 +52,5 @@ index d60f05251a..1ee5a09588 100644 - # library that we build, but we do not want to link against it (we - # will find it with a -framework option). For this reason there is an - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch -index c291d14460..e9e5b32ca2 100644 ---- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch -+++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch -@@ -1,4 +1,4 @@ --From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 -+From 3b558cfb1670300afece09b957e1e4b7072bce6b Mon Sep 17 00:00:00 2001 - From: Vanya Sergeev - Date: Wed, 23 Dec 2015 11:30:33 +0100 - Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling -@@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev - 1 file changed, 1 insertion(+), 1 deletion(-) - - diff --git a/configure.ac b/configure.ac --index 1ee5a09588..c2445edc88 100644 -+index 4690cdba9f..ffeec102b7 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -4175,7 +4175,7 @@ fi -+@@ -4080,7 +4080,7 @@ fi - - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - -@@ -23,5 +23,5 @@ index 1ee5a09588..c2445edc88 100644 - if test $ipv6 = yes - then - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch -index b0dcce7d77..c4620949bd 100644 ---- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch -+++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch -@@ -1,4 +1,4 @@ --From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 -+From 36c138c15515e80f72a570b61da324e55ae3e80c Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 16:33:22 -0800 - Subject: [PATCH] Add infrastructure to disable the build of certain extensions -@@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 11 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 0c809f3d8a..7c3dde8dd4 100644 -+index f9011c132a..e8a6bd5c03 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -213,6 +213,8 @@ FILEMODE= 644 -+@@ -205,6 +205,8 @@ FILEMODE= 644 - # configure script arguments - CONFIG_ARGS= @CONFIG_ARGS@ - -@@ -56,7 +56,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 - - # Subdirectories with code - SRCDIRS= @SRCDIRS@ --@@ -629,6 +631,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o -+@@ -605,6 +607,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o - esac; \ - echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -64,7 +64,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ --@@ -1674,7 +1677,8 @@ libainstall: @DEF_MAKE_RULE@ python-config -+@@ -1601,7 +1604,8 @@ libainstall: @DEF_MAKE_RULE@ python-config - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -@@ -75,10 +75,10 @@ index 0c809f3d8a..7c3dde8dd4 100644 - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ - diff --git a/configure.ac b/configure.ac --index c2445edc88..73d66167de 100644 -+index ffeec102b7..7872b4dfee 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3052,6 +3052,8 @@ LIBS="$withval $LIBS" -+@@ -2958,6 +2958,8 @@ LIBS="$withval $LIBS" - - PKG_PROG_PKG_CONFIG - -@@ -88,10 +88,10 @@ index c2445edc88..73d66167de 100644 - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, - diff --git a/setup.py b/setup.py --index 770866bca7..b6c829b3a5 100644 -+index 20d7f35652..d3f2cc1b37 100644 - --- a/setup.py - +++ b/setup.py --@@ -43,7 +43,10 @@ from distutils.spawn import find_executable -+@@ -24,7 +24,10 @@ from distutils.spawn import find_executable - TEST_EXTENSIONS = True - - # This global variable is used to hold the list of modules to be disabled. -@@ -104,5 +104,5 @@ index 770866bca7..b6c829b3a5 100644 - - def get_platform(): - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch -index 24f369f87f..0ac5116213 100644 ---- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch -+++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch -@@ -1,4 +1,4 @@ --From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 -+From f5ed27c9b9efb4756630e5799be14fefdc3b2702 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:33:14 +0100 - Subject: [PATCH] Adjust library/header paths for cross-compilation -@@ -21,7 +21,7 @@ Signed-off-by: Thomas Petazzoni - 2 files changed, 15 insertions(+), 5 deletions(-) - - diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --index 1a9bd1200f..3cf7d6746e 100644 -+index 2d7cdf063f..cba150075c 100644 - --- a/Lib/distutils/command/build_ext.py - +++ b/Lib/distutils/command/build_ext.py - @@ -234,7 +234,10 @@ class build_ext(Command): -@@ -37,11 +37,11 @@ index 1a9bd1200f..3cf7d6746e 100644 - # building python standard extensions - self.library_dirs.append('.') - diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py --index 37feae5df7..e9c3a27856 100644 -+index b51629eb94..011a437bcd 100644 - --- a/Lib/distutils/sysconfig.py - +++ b/Lib/distutils/sysconfig.py --@@ -17,10 +17,17 @@ import sys -- from .errors import DistutilsPlatformError -+@@ -18,10 +18,17 @@ from .errors import DistutilsPlatformError -+ from .util import get_platform, get_host_platform - - # These are needed in a couple of spots, so just compute them once. - -PREFIX = os.path.normpath(sys.prefix) -@@ -63,5 +63,5 @@ index 37feae5df7..e9c3a27856 100644 - # Path to the base directory of the project. On Windows the binary may - # live in project/PCbuild/win32 or project/PCbuild/amd64. - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch -index 83c88ff399..935e0c3b55 100644 ---- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch -+++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch -@@ -1,4 +1,4 @@ --From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 -+From 5bcb991a8de2f1b9bdf44e78894417ed2ee137a5 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:36:00 +0100 - Subject: [PATCH] Don't look in /usr/lib/termcap for libraries -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 1 insertion(+), 4 deletions(-) - - diff --git a/setup.py b/setup.py --index b6c829b3a5..ec3ba60607 100644 -+index d3f2cc1b37..5d504d7638 100644 - --- a/setup.py - +++ b/setup.py --@@ -1056,12 +1056,9 @@ class PyBuildExt(build_ext): -+@@ -955,12 +955,9 @@ class PyBuildExt(build_ext): - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -@@ -27,5 +27,5 @@ index b6c829b3a5..ec3ba60607 100644 - libraries=readline_libs)) - else: - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch -index f55238d0c4..ab1e295e70 100644 ---- a/package/python3/0006-Don-t-add-multiarch-paths.patch -+++ b/package/python3/0006-Don-t-add-multiarch-paths.patch -@@ -1,4 +1,4 @@ --From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 -+From b878b174e12a5cb2e1943f1f79d94033c1ee80d7 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:36:27 +0100 - Subject: [PATCH] Don't add multiarch paths -@@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 1 insertion(+), 1 deletion(-) - - diff --git a/setup.py b/setup.py --index ec3ba60607..e27620035c 100644 -+index 5d504d7638..282a592dc6 100644 - --- a/setup.py - +++ b/setup.py --@@ -749,10 +749,10 @@ class PyBuildExt(build_ext): -+@@ -654,10 +654,10 @@ class PyBuildExt(build_ext): - if not CROSS_COMPILING: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -@@ -33,5 +33,5 @@ index ec3ba60607..e27620035c 100644 - - def init_inc_lib_dirs(self): - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch -index 0e96e7522a..1dcf8a017d 100644 ---- a/package/python3/0007-Abort-on-failed-module-build.patch -+++ b/package/python3/0007-Abort-on-failed-module-build.patch -@@ -1,4 +1,4 @@ --From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 -+From fceda5bae52571213b6671ce0220d1a85b38f8c7 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:43:24 +0100 - Subject: [PATCH] Abort on failed module build -@@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 1 insertion(+) - - diff --git a/setup.py b/setup.py --index e27620035c..d3f0e663f2 100644 -+index 282a592dc6..8fda3b4d47 100644 - --- a/setup.py - +++ b/setup.py --@@ -539,6 +539,7 @@ class PyBuildExt(build_ext): -+@@ -444,6 +444,7 @@ class PyBuildExt(build_ext): - print("Failed to build these modules:") - print_three_column(failed) - print() -@@ -26,5 +26,5 @@ index e27620035c..d3f0e663f2 100644 - if self.failed_on_import: - failed = self.failed_on_import[:] - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch -index df31cd6220..9303e188c9 100644 ---- a/package/python3/0008-Serial-ioctl-workaround.patch -+++ b/package/python3/0008-Serial-ioctl-workaround.patch -@@ -1,4 +1,4 @@ --From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 -+From 91e8058cf9085795db64f43e2c9548926ea46ab0 Mon Sep 17 00:00:00 2001 - From: Baruch Siach - Date: Wed, 23 Dec 2015 11:44:02 +0100 - Subject: [PATCH] Serial ioctl() workaround -@@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach - 1 file changed, 2 insertions(+) - - diff --git a/Modules/termios.c b/Modules/termios.c --index 75e5e52320..eefbddfe69 100644 -+index aee7f12c57..ba2ff77d06 100644 - --- a/Modules/termios.c - +++ b/Modules/termios.c - @@ -15,7 +15,9 @@ -@@ -29,5 +29,5 @@ index 75e5e52320..eefbddfe69 100644 - /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, - * MDTR, MRI, and MRTS (apparently used internally by some things - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch -index 8a77fe3708..32e3bdfea0 100644 ---- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch -+++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch -@@ -1,4 +1,4 @@ --From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 -+From 3ec9bbf5bd9cced0005c99d7d65997b119abf2f6 Mon Sep 17 00:00:00 2001 - From: Christophe Vu-Brugier - Date: Wed, 23 Dec 2015 11:44:30 +0100 - Subject: [PATCH] Do not adjust the shebang of Python scripts for -@@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 - self.build_dir) - updated_files.append(outfile) - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch -index a1f9ab6cd9..a8ccba7784 100644 ---- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch -+++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch -@@ -1,4 +1,4 @@ --From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 -+From 7b3839bcf9f79988fb944cd65717839cde166cb8 Mon Sep 17 00:00:00 2001 - From: Peter Korsgaard - Date: Thu, 20 Nov 2014 13:24:59 +0100 - Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match -@@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" - INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch -index 57f1bb5a2f..1a40b74d21 100644 ---- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch -+++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch -@@ -1,4 +1,4 @@ --From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 -+From a9affe1f3f98342b682848c9b3f862ee194ff625 Mon Sep 17 00:00:00 2001 - From: Samuel Cabrero - Date: Wed, 23 Dec 2015 11:45:48 +0100 - Subject: [PATCH] Override system locale and set to default when adding gcc -@@ -15,25 +15,23 @@ any system library (eg. libz, libssl, etc.) - - Signed-off-by: Samuel Cabrero - Signed-off-by: Thomas Petazzoni --[james.hilliard1@gmail.com: adapt to python 3.9] --Signed-off-by: James Hilliard - --- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - diff --git a/setup.py b/setup.py --index d3f0e663f2..926c16f58f 100644 -+index 8fda3b4d47..bb7eb44213 100644 - --- a/setup.py - +++ b/setup.py --@@ -695,7 +695,7 @@ class PyBuildExt(build_ext): -+@@ -600,7 +600,7 @@ class PyBuildExt(build_ext): - tmpfile = os.path.join(self.build_temp, 'ccpaths') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) --- ret = run_command('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) --+ ret = run_command('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) -+- ret = os.system('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) -++ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) - is_gcc = False - is_clang = False - in_incdirs = False - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch -index 42dfa0d693..aacb6dca6c 100644 ---- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch -+++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch -@@ -1,4 +1,4 @@ --From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 -+From c50b8e7fb9b2e61d4d195a055cd1bbf993cc455f Mon Sep 17 00:00:00 2001 - From: Christophe Vu-Brugier - Date: Wed, 22 Feb 2017 16:48:49 -0800 - Subject: [PATCH] Add importlib fix for PEP 3147 issue -@@ -25,10 +25,10 @@ Signed-off-by: Andrey Smirnov - 1 file changed, 5 insertions(+), 39 deletions(-) - - diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py --index 25a3f8c0e0..2cb9a9aa52 100644 -+index b8ac482994..db034f605a 100644 - --- a/Lib/importlib/_bootstrap_external.py - +++ b/Lib/importlib/_bootstrap_external.py --@@ -313,8 +313,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): -+@@ -306,8 +306,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - a True value is the same as setting 'optimization' to the empty string - while a False value is equivalent to setting 'optimization' to '1'. - -@@ -37,7 +37,7 @@ index 25a3f8c0e0..2cb9a9aa52 100644 - """ - if debug_override is not None: - _warnings.warn('the debug_override parameter is deprecated; use ' --@@ -326,10 +324,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): -+@@ -319,10 +317,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - path = _os.fspath(path) - head, tail = _path_split(path) - base, sep, rest = tail.rpartition('.') -@@ -49,7 +49,7 @@ index 25a3f8c0e0..2cb9a9aa52 100644 - if optimization is None: - if sys.flags.optimize == 0: - optimization = '' --@@ -366,46 +361,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): -+@@ -359,46 +354,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - head.lstrip(path_separators), - filename, - ) -@@ -101,5 +101,5 @@ index 25a3f8c0e0..2cb9a9aa52 100644 - - - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch -index b3380fd53f..675c2c1abf 100644 ---- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch -+++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch -@@ -1,4 +1,4 @@ --From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 -+From 5ee3e5ad62919c431b1f7b5ff91ddf606582df0e Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:01:18 -0800 - Subject: [PATCH] Add an option to disable installation of test modules -@@ -10,18 +10,16 @@ Signed-off-by: Thomas Petazzoni - Signed-off-by: Samuel Martin - [ Andrey Smirnov: ported to Python 3.6 ] - Signed-off-by: Andrey Smirnov --[james.hilliard1@gmail.com: adapt to python 3.9] --Signed-off-by: James Hilliard - --- -- Makefile.pre.in | 56 ++++++++++++++++++++++++++++++++----------------- -+ Makefile.pre.in | 54 ++++++++++++++++++++++++++++++++----------------- - configure.ac | 5 +++++ -- 2 files changed, 42 insertions(+), 19 deletions(-) -+ 2 files changed, 41 insertions(+), 18 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 7c3dde8dd4..204f293d53 100644 -+index e8a6bd5c03..3abee36f49 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1385,8 +1385,29 @@ maninstall: altmaninstall -+@@ -1317,8 +1317,28 @@ maninstall: altmaninstall - - # Install the library - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax -@@ -45,17 +43,16 @@ index 7c3dde8dd4..204f293d53 100644 - + multiprocessing multiprocessing/dummy \ - + unittest \ - + venv venv/scripts venv/scripts/common venv/scripts/posix \ --+ curses pydoc_data \ --+ zoneinfo -++ curses pydoc_data - + - +TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - + tkinter/test/test_ttk test \ - test/audiodata \ - test/capath test/data \ - test/cjkencodings test/decimaltestdata \ --@@ -1446,28 +1467,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ -+@@ -1376,26 +1396,24 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ -+ test/test_importlib/zipdata01 \ - test/test_importlib/zipdata02 \ -- test/test_zoneinfo test/test_zoneinfo/data \ - test/ziptestdata \ - - asyncio \ - test/test_asyncio \ -@@ -78,15 +75,13 @@ index 7c3dde8dd4..204f293d53 100644 - + ctypes/test \ - + idlelib/idle_test \ - + distutils/tests \ -- test/test_peg_generator \ - + test/test_importlib test/test_importlib/builtin \ - test/test_tools test/test_warnings test/test_warnings/data \ - - turtledemo \ - - multiprocessing multiprocessing/dummy \ - - unittest unittest/test unittest/test/testmock \ - - venv venv/scripts venv/scripts/common venv/scripts/posix \ --- curses pydoc_data \ --- zoneinfo -+- curses pydoc_data - + unittest/test unittest/test/testmock - + - +ifeq (@TEST_MODULES@,yes) -@@ -97,10 +92,10 @@ index 7c3dde8dd4..204f293d53 100644 - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ - diff --git a/configure.ac b/configure.ac --index 73d66167de..92e28d02ee 100644 -+index 7872b4dfee..b820d18c7c 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3329,6 +3329,11 @@ if test "$posix_threads" = "yes"; then -+@@ -3234,6 +3234,11 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -@@ -113,5 +108,5 @@ index 73d66167de..92e28d02ee 100644 - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch -index abb86ea07b..a3436e31bf 100644 ---- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch -+++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch -@@ -1,4 +1,4 @@ --From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 -+From 13a8be57e79f2657c75391bfa524dc1ba4993b02 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:07:56 -0800 - Subject: [PATCH] Add an option to disable pydoc -@@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 20 insertions(+), 3 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 204f293d53..63e3df0470 100644 -+index 3abee36f49..6fa0549a56 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1357,7 +1357,9 @@ bininstall: altbininstall -+@@ -1289,7 +1289,9 @@ bininstall: altbininstall - -rm -f $(DESTDIR)$(BINDIR)/idle3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 -@@ -30,16 +30,16 @@ index 204f293d53..63e3df0470 100644 - -rm -f $(DESTDIR)$(BINDIR)/2to3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) - if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ --@@ -1403,7 +1405,7 @@ LIBSUBDIRS= tkinter site-packages \ -+@@ -1335,7 +1337,7 @@ LIBSUBDIRS= tkinter site-packages \ - multiprocessing multiprocessing/dummy \ - unittest \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ --- curses pydoc_data \ --+ curses \ -- zoneinfo -+- curses pydoc_data -++ curses - - TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ --@@ -1486,6 +1488,10 @@ ifeq (@TEST_MODULES@,yes) -+ tkinter/test/test_ttk test \ -+@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif - -@@ -51,10 +51,10 @@ index 204f293d53..63e3df0470 100644 - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ - diff --git a/configure.ac b/configure.ac --index 92e28d02ee..174ed85a7c 100644 -+index b820d18c7c..f53cc86d89 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3329,6 +3329,12 @@ if test "$posix_threads" = "yes"; then -+@@ -3234,6 +3234,12 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -@@ -68,10 +68,10 @@ index 92e28d02ee..174ed85a7c 100644 - - AC_ARG_ENABLE(test-modules, - diff --git a/setup.py b/setup.py --index 926c16f58f..1fc5fac90c 100644 -+index bb7eb44213..748c269960 100644 - --- a/setup.py - +++ b/setup.py --@@ -2586,6 +2586,12 @@ def main(): -+@@ -2401,6 +2401,12 @@ def main(): - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -@@ -84,7 +84,7 @@ index 926c16f58f..1fc5fac90c 100644 - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], --@@ -2610,8 +2616,7 @@ def main(): -+@@ -2425,8 +2431,7 @@ def main(): - # If you change the scripts installed here, you also need to - # check the PyBuildScripts command above, and change the links - # created by the bininstall target in Makefile.pre.in -@@ -95,5 +95,5 @@ index 926c16f58f..1fc5fac90c 100644 - - # --install-platlib - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch -index 5cec11a00a..1bd1ae511f 100644 ---- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch -+++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch -@@ -1,4 +1,4 @@ --From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 -+From 868823f15bab031caf05dc5e8ce2eac076bfc82b Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:15:31 -0800 - Subject: [PATCH] Add an option to disable lib2to3 -@@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 21 insertions(+), 6 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 63e3df0470..8b7de12999 100644 -+index 6fa0549a56..3e1f130532 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1361,7 +1361,9 @@ ifeq (@PYDOC@,yes) -+@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) - endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 -@@ -30,7 +30,7 @@ index 63e3df0470..8b7de12999 100644 - if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ - rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ --@@ -1396,7 +1398,6 @@ LIBSUBDIRS= tkinter site-packages \ -+@@ -1328,7 +1330,6 @@ LIBSUBDIRS= tkinter site-packages \ - html json http dbm xmlrpc \ - sqlite3 \ - logging csv wsgiref urllib \ -@@ -38,7 +38,7 @@ index 63e3df0470..8b7de12999 100644 - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ --@@ -1473,9 +1474,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+@@ -1402,9 +1403,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_email test/test_email/data \ - test/test_json \ - sqlite3/test \ -@@ -48,7 +48,7 @@ index 63e3df0470..8b7de12999 100644 - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ --@@ -1484,6 +1482,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+@@ -1412,6 +1410,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_tools test/test_warnings test/test_warnings/data \ - unittest/test unittest/test/testmock - -@@ -63,7 +63,7 @@ index 63e3df0470..8b7de12999 100644 - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif --@@ -1584,10 +1590,12 @@ ifeq (@PYC_BUILD@,yes) -+@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes) - -j0 -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - endif -@@ -77,10 +77,10 @@ index 63e3df0470..8b7de12999 100644 - # bpo-21536: Misc/python-config.sh is generated in the build directory - # from $(srcdir)Misc/python-config.sh.in. - diff --git a/configure.ac b/configure.ac --index 174ed85a7c..f1f5e9a7b0 100644 -+index f53cc86d89..caa8eaf88a 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3341,6 +3341,12 @@ AC_ARG_ENABLE(test-modules, -+@@ -3246,6 +3246,12 @@ AC_ARG_ENABLE(test-modules, - AS_HELP_STRING([--disable-test-modules], [disable test modules]), - [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) - -@@ -94,10 +94,10 @@ index 174ed85a7c..f1f5e9a7b0 100644 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) - diff --git a/setup.py b/setup.py --index 1fc5fac90c..4063d7ffa5 100644 -+index 748c269960..1669797cad 100644 - --- a/setup.py - +++ b/setup.py --@@ -2587,10 +2587,11 @@ def main(): -+@@ -2402,10 +2402,11 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -@@ -112,5 +112,5 @@ index 1fc5fac90c..4063d7ffa5 100644 - setup(# PyPI Metadata (PEP 301) - name = "Python", - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch -index 47ee112e27..364d1b1ec8 100644 ---- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch -+++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch -@@ -1,4 +1,4 @@ --From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 -+From 1a1d13a973d9dcbd6660bfef40cf35c7638f779b Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:20:45 -0800 - Subject: [PATCH] Add option to disable the sqlite3 module -@@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov - 2 files changed, 14 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 8b7de12999..d826d8ac4b 100644 -+index 3e1f130532..cf9add0bc7 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1396,7 +1396,6 @@ LIBSUBDIRS= tkinter site-packages \ -+@@ -1328,7 +1328,6 @@ LIBSUBDIRS= tkinter site-packages \ - email email/mime \ - ensurepip ensurepip/_bundled \ - html json http dbm xmlrpc \ -@@ -24,7 +24,7 @@ index 8b7de12999..d826d8ac4b 100644 - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ --@@ -1473,7 +1472,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+@@ -1402,7 +1401,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_asyncio \ - test/test_email test/test_email/data \ - test/test_json \ -@@ -32,7 +32,7 @@ index 8b7de12999..d826d8ac4b 100644 - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ --@@ -1490,6 +1488,11 @@ TESTSUBDIRS += lib2to3/tests \ -+@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests \ - lib2to3/tests/data/fixers/myfixes - endif - -@@ -45,10 +45,10 @@ index 8b7de12999..d826d8ac4b 100644 - LIBSUBDIRS += $(TESTSUBDIRS) - endif - diff --git a/configure.ac b/configure.ac --index f1f5e9a7b0..8b5c65974c 100644 -+index caa8eaf88a..79a8255f44 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3329,6 +3329,15 @@ if test "$posix_threads" = "yes"; then -+@@ -3234,6 +3234,15 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -@@ -65,5 +65,5 @@ index f1f5e9a7b0..8b5c65974c 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch -index 132fd17386..eb0ad26daa 100644 ---- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch -+++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch -@@ -1,4 +1,4 @@ --From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 -+From c54cb57b3bd80fa2819f6409d5d2b98d82fbfcb2 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:23:42 -0800 - Subject: [PATCH] Add an option to disable the tk module -@@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov - 2 files changed, 17 insertions(+), 3 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index d826d8ac4b..dc84384680 100644 -+index cf9add0bc7..5d78419fd4 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1390,7 +1390,7 @@ maninstall: altmaninstall -+@@ -1322,7 +1322,7 @@ maninstall: altmaninstall - # Install the library - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax - -@@ -25,9 +25,9 @@ index d826d8ac4b..dc84384680 100644 - asyncio \ - collections concurrent concurrent/futures encodings \ - email email/mime \ --@@ -1408,8 +1408,7 @@ LIBSUBDIRS= tkinter site-packages \ -- curses \ -- zoneinfo -+@@ -1339,8 +1339,7 @@ LIBSUBDIRS= tkinter site-packages \ -+ venv venv/scripts venv/scripts/common venv/scripts/posix \ -+ curses - - -TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - - tkinter/test/test_ttk test \ -@@ -35,7 +35,7 @@ index d826d8ac4b..dc84384680 100644 - test/audiodata \ - test/capath test/data \ - test/cjkencodings test/decimaltestdata \ --@@ -1480,6 +1479,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+@@ -1408,6 +1407,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_tools test/test_warnings test/test_warnings/data \ - unittest/test unittest/test/testmock - -@@ -49,10 +49,10 @@ index d826d8ac4b..dc84384680 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index 8b5c65974c..4c72dae960 100644 -+index 79a8255f44..b5922451cc 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3338,6 +3338,15 @@ if test "$SQLITE3" = "no" ; then -+@@ -3243,6 +3243,15 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -@@ -69,5 +69,5 @@ index 8b5c65974c..4c72dae960 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch -index d51267bbf0..0628669b93 100644 ---- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch -+++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch -@@ -1,4 +1,4 @@ --From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 -+From 332373ca25f2dbe5473330666ec49143506a4dc0 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:31:51 -0800 - Subject: [PATCH] Add an option to disable the curses module -@@ -8,23 +8,25 @@ Signed-off-by: Samuel Martin - [ Andrey Smirnov: ported to Python 3.6 ] - Signed-off-by: Andrey Smirnov - --- -- Makefile.pre.in | 5 ++++- -+ Makefile.pre.in | 7 +++++-- - configure.ac | 9 +++++++++ -- 2 files changed, 13 insertions(+), 1 deletion(-) -+ 2 files changed, 14 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index dc84384680..2a82f3308f 100644 -+index 5d78419fd4..660c292765 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1405,7 +1405,6 @@ LIBSUBDIRS= site-packages \ -+@@ -1336,8 +1336,7 @@ LIBSUBDIRS= site-packages \ -+ turtledemo \ - multiprocessing multiprocessing/dummy \ - unittest \ -- venv venv/scripts venv/scripts/common venv/scripts/posix \ --- curses \ -- zoneinfo -+- venv venv/scripts venv/scripts/common venv/scripts/posix \ -+- curses -++ venv venv/scripts venv/scripts/common venv/scripts/posix - - TESTSUBDIRS= test \ --@@ -1485,6 +1484,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ -+ test/audiodata \ -+@@ -1413,6 +1412,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk - endif - -@@ -36,10 +38,10 @@ index dc84384680..2a82f3308f 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index 4c72dae960..acd98381a3 100644 -+index b5922451cc..ea422a86a9 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3347,6 +3347,15 @@ if test "$TK" = "no"; then -+@@ -3252,6 +3252,15 @@ if test "$TK" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi - -@@ -56,5 +58,5 @@ index 4c72dae960..acd98381a3 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch -index af6e1ebcc1..e31f3e105e 100644 ---- a/package/python3/0019-Add-an-option-to-disable-expat.patch -+++ b/package/python3/0019-Add-an-option-to-disable-expat.patch -@@ -1,4 +1,4 @@ --From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 -+From d88f2d3430bbbe285ae3de5fbc1bde34da7f0478 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:40:45 -0800 - Subject: [PATCH] Add an option to disable expat -@@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 19 insertions(+), 7 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 2a82f3308f..e678c8817e 100644 -+index 660c292765..f49abf8395 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1399,7 +1399,7 @@ LIBSUBDIRS= site-packages \ -+@@ -1331,7 +1331,7 @@ LIBSUBDIRS= site-packages \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -@@ -32,7 +32,7 @@ index 2a82f3308f..e678c8817e 100644 - importlib \ - turtledemo \ - multiprocessing multiprocessing/dummy \ --@@ -1488,6 +1488,10 @@ ifeq (@CURSES@,yes) -+@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes) - LIBSUBDIRS += curses - endif - -@@ -44,16 +44,16 @@ index 2a82f3308f..e678c8817e 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index acd98381a3..9ef0ecd42f 100644 -+index ea422a86a9..3c1e2c088d 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3055,13 +3055,21 @@ PKG_PROG_PKG_CONFIG -+@@ -2961,13 +2961,21 @@ PKG_PROG_PKG_CONFIG - AC_SUBST(DISABLED_EXTENSIONS) - - # Check for use of the system expat library - -AC_MSG_CHECKING(for --with-system-expat) - -AC_ARG_WITH(system_expat, --- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), -+- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), - +AC_MSG_CHECKING(for --with-expat) - +AC_ARG_WITH(expat, - + AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), -@@ -75,10 +75,10 @@ index acd98381a3..9ef0ecd42f 100644 - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) - diff --git a/setup.py b/setup.py --index 4063d7ffa5..211a160f29 100644 -+index 1669797cad..d2727c0da5 100644 - --- a/setup.py - +++ b/setup.py --@@ -1681,7 +1681,7 @@ class PyBuildExt(build_ext): -+@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext): - # - # More information on Expat can be found at www.libexpat.org. - # -@@ -88,5 +88,5 @@ index 4063d7ffa5..211a160f29 100644 - define_macros = [] - extra_compile_args = [] - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch -index ede78c9b1e..1b18c54591 100644 ---- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch -+++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch -@@ -1,4 +1,4 @@ --From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 -+From 347f359b484c8e34b49f71132701252b966d93aa Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:49:55 +0100 - Subject: [PATCH] Add an option to disable CJK codecs -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 9ef0ecd42f..18e6fd70a0 100644 -+index 3c1e2c088d..30a92f9c2e 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3346,6 +3346,12 @@ if test "$SQLITE3" = "no" ; then -+@@ -3251,6 +3251,12 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -@@ -26,5 +26,5 @@ index 9ef0ecd42f..18e6fd70a0 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch -index b2668c6eb2..71645be9f4 100644 ---- a/package/python3/0021-Add-an-option-to-disable-NIS.patch -+++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch -@@ -1,4 +1,4 @@ --From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 -+From ff9bebed083c5d20fe31f94b868f6f1a8c6cc744 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:50:11 +0100 - Subject: [PATCH] Add an option to disable NIS -@@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 18e6fd70a0..46d2a8131e 100644 -+index 30a92f9c2e..20f326db46 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3352,6 +3352,12 @@ AC_ARG_ENABLE(codecs-cjk, -+@@ -3257,6 +3257,12 @@ AC_ARG_ENABLE(codecs-cjk, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" - fi]) - -@@ -29,5 +29,5 @@ index 18e6fd70a0..46d2a8131e 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch -index 7a0157fd71..3805e1aad9 100644 ---- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch -+++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch -@@ -1,4 +1,4 @@ --From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 -+From 47f9caca90e6c8c18736e5dfd0acf47aae27eefb Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:50:27 +0100 - Subject: [PATCH] Add an option to disable unicodedata -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 46d2a8131e..5844e3b73f 100644 -+index 20f326db46..99bbc37b07 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3358,6 +3358,12 @@ AC_ARG_ENABLE(nis, -+@@ -3263,6 +3263,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -@@ -26,5 +26,5 @@ index 46d2a8131e..5844e3b73f 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch -index 0611e3a347..3a138f966f 100644 ---- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch -+++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch -@@ -1,4 +1,4 @@ --From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 -+From c3ad1d6fc8f1fa56ee0522389227454710bf7877 Mon Sep 17 00:00:00 2001 - From: Maxime Ripard - Date: Wed, 22 Feb 2017 17:45:14 -0800 - Subject: [PATCH] Add an option to disable IDLE -@@ -16,10 +16,10 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 15 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index e678c8817e..1148bd8708 100644 -+index f49abf8395..bc777e6504 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1355,7 +1355,9 @@ bininstall: altbininstall -+@@ -1287,7 +1287,9 @@ bininstall: altbininstall - -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) - -rm -f $(DESTDIR)$(BINDIR)/idle3 -@@ -29,7 +29,7 @@ index e678c8817e..1148bd8708 100644 - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 - ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) --@@ -1398,7 +1400,6 @@ LIBSUBDIRS= site-packages \ -+@@ -1330,7 +1332,6 @@ LIBSUBDIRS= site-packages \ - html json http dbm xmlrpc \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ -@@ -37,7 +37,7 @@ index e678c8817e..1148bd8708 100644 - distutils distutils/command \ - importlib \ - turtledemo \ --@@ -1492,6 +1493,10 @@ ifeq (@EXPAT@,yes) -+@@ -1420,6 +1421,10 @@ ifeq (@EXPAT@,yes) - LIBSUBDIRS += $(XMLLIBSUBDIRS) - endif - -@@ -49,10 +49,10 @@ index e678c8817e..1148bd8708 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index 5844e3b73f..7bd4623ccd 100644 -+index 99bbc37b07..8c9706582e 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3400,6 +3400,12 @@ AC_ARG_ENABLE(lib2to3, -+@@ -3305,6 +3305,12 @@ AC_ARG_ENABLE(lib2to3, - AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), - [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) - -@@ -66,10 +66,10 @@ index 5844e3b73f..7bd4623ccd 100644 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) - diff --git a/setup.py b/setup.py --index 211a160f29..c4ee989ba3 100644 -+index d2727c0da5..9f09b3d985 100644 - --- a/setup.py - +++ b/setup.py --@@ -2587,11 +2587,13 @@ def main(): -+@@ -2402,11 +2402,13 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -@@ -85,5 +85,5 @@ index 211a160f29..c4ee989ba3 100644 - setup(# PyPI Metadata (PEP 301) - name = "Python", - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch -index 438b76b91f..5906f9d385 100644 ---- a/package/python3/0024-Add-an-option-to-disable-decimal.patch -+++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch -@@ -1,4 +1,4 @@ --From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 -+From c82efeabd2f9b89ff2ecd5261eceeeb3af022ae8 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:51:31 +0100 - Subject: [PATCH] Add an option to disable decimal -@@ -11,24 +11,22 @@ the libmpdec builtin the Python sources, or no libmpdec at all. - Signed-off-by: Thomas Petazzoni - [aduskett@gmail.com: Update for python 3.7.0] - Signed-off-by: Adam Duskett --[james.hilliard1@gmail.com: adapt to python 3.9] --Signed-off-by: James Hilliard - --- - configure.ac | 17 ++++++++++++----- - setup.py | 2 +- - 2 files changed, 13 insertions(+), 6 deletions(-) - - diff --git a/configure.ac b/configure.ac --index 7bd4623ccd..e513ef6a20 100644 -+index 8c9706582e..e6255babb6 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3106,13 +3106,20 @@ fi -+@@ -3012,13 +3012,20 @@ fi - AC_SUBST(LIBFFI_INCLUDEDIR) - - # Check for use of the system libmpdec library - -AC_MSG_CHECKING(for --with-system-libmpdec) - -AC_ARG_WITH(system_libmpdec, --- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]), -+- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library]), - +AC_MSG_CHECKING(for --with-libmpdec) - +AC_ARG_WITH(libmpdec, - + AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), -@@ -49,10 +47,10 @@ index 7bd4623ccd..e513ef6a20 100644 - # Check whether _decimal should use a coroutine-local or thread-local context - AC_MSG_CHECKING(for --with-decimal-contextvar) - diff --git a/setup.py b/setup.py --index c4ee989ba3..3d0c74bb7f 100644 -+index 9f09b3d985..a7f2e23d87 100644 - --- a/setup.py - +++ b/setup.py --@@ -2221,7 +2221,7 @@ class PyBuildExt(build_ext): -+@@ -2076,7 +2076,7 @@ class PyBuildExt(build_ext): - # Stefan Krah's _decimal module - extra_compile_args = [] - undef_macros = [] -@@ -62,5 +60,5 @@ index c4ee989ba3..3d0c74bb7f 100644 - libraries = [':libmpdec.so.2'] - sources = ['_decimal/_decimal.c'] - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch -index 8a792c1fac..55ba22a0e5 100644 ---- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch -+++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch -@@ -1,4 +1,4 @@ --From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 -+From c68234aba844cb1034fdcfb50aef03da454723f9 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:51:58 +0100 - Subject: [PATCH] Add an option to disable the ossaudiodev module -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index e513ef6a20..c07505e89e 100644 -+index e6255babb6..5809233aac 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3136,6 +3136,12 @@ fi -+@@ -3042,6 +3042,12 @@ fi - - AC_MSG_RESULT($with_decimal_contextvar) - -@@ -26,5 +26,5 @@ index e513ef6a20..c07505e89e 100644 - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) - AC_ARG_ENABLE(loadable-sqlite-extensions, - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch -index d9e9d13f31..814ffdb561 100644 ---- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch -+++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch -@@ -1,4 +1,4 @@ --From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 -+From 8faf197969bf531279d5c59a5bb2bc3a21acc378 Mon Sep 17 00:00:00 2001 - From: Nicolas Cavallari - Date: Wed, 22 Feb 2017 17:55:59 -0800 - Subject: [PATCH] Add an option to disable openssl support. -@@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index c07505e89e..612e32faf5 100644 -+index 5809233aac..6b09bafda4 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3377,6 +3377,12 @@ AC_ARG_ENABLE(unicodedata, -+@@ -3282,6 +3282,12 @@ AC_ARG_ENABLE(unicodedata, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" - fi]) - -@@ -26,5 +26,5 @@ index c07505e89e..612e32faf5 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch -index 2324ffdcf2..30651244f4 100644 ---- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch -+++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch -@@ -1,4 +1,4 @@ --From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 -+From 6e3923f90497ba7230b62fdd3f2dca1cb79852bf Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Tue, 7 Mar 2017 23:29:05 +0100 - Subject: [PATCH] Add an option to disable the readline module -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 612e32faf5..2a6aaeff60 100644 -+index 6b09bafda4..b64518eed5 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3383,6 +3383,12 @@ AC_ARG_ENABLE(openssl, -+@@ -3288,6 +3288,12 @@ AC_ARG_ENABLE(openssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" - fi]) - -@@ -26,5 +26,5 @@ index 612e32faf5..2a6aaeff60 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch -index 04d0ab31bf..330b549c01 100644 ---- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch -+++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch -@@ -1,4 +1,4 @@ --From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 -+From e6f44f93db96ed7f3b2baa0e09ea32a32c78c638 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Tue, 7 Mar 2017 23:31:11 +0100 - Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 18 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 2a6aaeff60..21479bbd7d 100644 -+index b64518eed5..d07e371c57 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3389,6 +3389,24 @@ AC_ARG_ENABLE(readline, -+@@ -3294,6 +3294,24 @@ AC_ARG_ENABLE(readline, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" - fi]) - -@@ -38,5 +38,5 @@ index 2a6aaeff60..21479bbd7d 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch -index 4478b40162..f69b887c9b 100644 ---- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch -+++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch -@@ -1,4 +1,4 @@ --From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 -+From e3221e3b714374e1e53dc11c9556733bd2807c2c Mon Sep 17 00:00:00 2001 - From: Matt Weber - Date: Fri, 6 Oct 2017 09:54:15 -0500 - Subject: [PATCH] python-config.sh: don't reassign ${prefix} -@@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 - SO="@EXT_SUFFIX@" - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch -index 806801b2b9..d39befaf1c 100644 ---- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch -+++ b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch -@@ -1,4 +1,4 @@ --From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 -+From 28008e1e4f0349241d22aace3c54f7e9425c6c1f Mon Sep 17 00:00:00 2001 - From: Adam Duskett - Date: Fri, 20 Jul 2018 10:17:39 -0400 - Subject: [PATCH] Fix cross compiling the uuid module -@@ -20,10 +20,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 2 insertions(+), 1 deletion(-) - - diff --git a/setup.py b/setup.py --index 3d0c74bb7f..c7be85f352 100644 -+index a7f2e23d87..b0274a3f67 100644 - --- a/setup.py - +++ b/setup.py --@@ -1779,7 +1779,8 @@ class PyBuildExt(build_ext): -+@@ -1674,7 +1674,8 @@ class PyBuildExt(build_ext): - - def detect_uuid(self): - # Build the _uuid module if possible -@@ -34,5 +34,5 @@ index 3d0c74bb7f..c7be85f352 100644 - if self.compiler.find_library_file(self.lib_dirs, 'uuid'): - uuid_libs = ['uuid'] - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch -index 6ea57d2cde..6ea5f68590 100644 ---- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch -+++ b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch -@@ -1,4 +1,4 @@ --From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 -+From 74007603df0921450f14e8626df36140426cc300 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Sat, 18 Aug 2018 10:54:56 +0200 - Subject: [PATCH] Add an option to disable uuid module -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 9 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 21479bbd7d..615c16aced 100644 -+index d07e371c57..55ab6c3c26 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3425,6 +3425,15 @@ if test "$CURSES" = "no"; then -+@@ -3330,6 +3330,15 @@ if test "$CURSES" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" - fi - -@@ -29,5 +29,5 @@ index 21479bbd7d..615c16aced 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0032-fix-building-on-older-distributions.patch -index fb59e593f4..69998a36dd 100644 ---- a/package/python3/0032-fix-building-on-older-distributions.patch -+++ b/package/python3/0032-fix-building-on-older-distributions.patch -@@ -1,4 +1,4 @@ --From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 -+From 3ddda00652f809a3bd8b4e3f7b0a3a4270b280a6 Mon Sep 17 00:00:00 2001 - From: Adam Duskett - Date: Thu, 16 Aug 2018 14:52:37 -0700 - Subject: [PATCH] fix building on older distributions -@@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 - os.unlink(new_path) - - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch -index 304a595fce..2f5f7a8bf0 100644 ---- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch -+++ b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch -@@ -1,4 +1,4 @@ --From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001 -+From 5932fedd9d1d43a230fa353df434f253e9d2b5a0 Mon Sep 17 00:00:00 2001 - From: Peter Korsgaard - Date: Fri, 2 Aug 2019 15:53:16 +0200 - Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for -@@ -29,10 +29,10 @@ Signed-off-by: Peter Korsgaard - 1 file changed, 3 insertions(+), 1 deletion(-) - - diff --git a/configure.ac b/configure.ac --index 615c16aced..241298e6cf 100644 -+index 55ab6c3c26..4a6d0662ac 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -718,7 +718,9 @@ then -+@@ -706,7 +706,9 @@ then - fi - - -@@ -44,5 +44,5 @@ index 615c16aced..241298e6cf 100644 - - AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) - -- --2.25.1 -+2.20.1 - -diff --git a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch -deleted file mode 100644 -index 880277eb1d..0000000000 ---- a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch -+++ /dev/null -@@ -1,40 +0,0 @@ --From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 --From: Romain Naour --Date: Thu, 12 Nov 2020 00:16:18 +0100 --Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method -- is not available -- --Since commit [1] in cpython, an exception is raised when an encryption method --is not available. This eception is handled only if errno is set to EINVAL by --crypt() but uClibc-ng doesn't set errno in crypt() [2]. -- --Fixes: --https://gitlab.com/buildroot.org/buildroot/-/jobs/830981961 --https://gitlab.com/buildroot.org/buildroot/-/jobs/830981979 -- --[1] https://github.com/python/cpython/commit/0d3fe8ae4961bf551e7d5e42559e2ede1a08fd7c --[2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libcrypt/crypt.c?h=v1.0.36#n29 -- --Signed-off-by: Romain Naour ----- -- Lib/crypt.py | 4 +++- -- 1 file changed, 3 insertions(+), 1 deletion(-) -- --diff --git a/Lib/crypt.py b/Lib/crypt.py --index 33dbc46bb3..4692a5270c 100644 ----- a/Lib/crypt.py --+++ b/Lib/crypt.py --@@ -94,7 +94,9 @@ def _add_method(name, *args, rounds=None): -- result = crypt('', salt) -- except OSError as e: -- # Not all libc libraries support all encryption methods. --- if e.errno == errno.EINVAL: --+ # Not all libc libraries set errno when encryption method is not --+ # available. --+ if e.errno == errno.EINVAL or e.errno == 0: -- return False -- raise -- if result and len(result) == method.total_size: ---- --2.25.4 -- -diff --git a/package/python3/python3.hash b/package/python3/python3.hash -index 2165daffcc..4c03293dd1 100644 ---- a/package/python3/python3.hash -+++ b/package/python3/python3.hash -@@ -1,5 +1,5 @@ --# From https://www.python.org/downloads/release/python-391/ --md5 61981498e75ac8f00adcb908281fadb6 Python-3.9.1.tar.xz -+# From https://www.python.org/downloads/release/python-386/ -+md5 69e73c49eeb1a853cefd26d18c9d069d Python-3.8.6.tar.xz - # Locally computed --sha256 991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff Python-3.9.1.tar.xz -+sha256 a9e0b79d27aa056eb9cce8d63a427b5f9bab1465dee3f942dcfdb25a82f4ab8a Python-3.8.6.tar.xz - sha256 1dceef1677a39befa8bf0285ab2db441ba117520bb2de839547ace006a17750d LICENSE -diff --git a/package/python3/python3.mk b/package/python3/python3.mk -index f2516dee90..af1e5e50d9 100644 ---- a/package/python3/python3.mk -+++ b/package/python3/python3.mk -@@ -4,8 +4,8 @@ - # - ################################################################################ - --PYTHON3_VERSION_MAJOR = 3.9 --PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 -+PYTHON3_VERSION_MAJOR = 3.8 -+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 - PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz - PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) - PYTHON3_LICENSE = Python-2.0, others --- -2.20.1 - diff --git a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch index 97052648..68d78d04 100644 --- a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch +++ b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch @@ -14,8 +14,8 @@ index 8730ec959b..d10a8b1db9 100644 +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed --sha256 c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz -+sha256 1d9ec856aa152f059a80c457fd679144fab163dd72c8fbecb9e53532ea294748 rpi-firmware-70f1581eec2c036b7e9309f1af41c651fb125447.tar.gz +-sha256 ae4e317681995e0f7becd7900ae667cba394e3a0b7ca93a267f3303df7284697 rpi-firmware-d016a6eb01c8c7326a89cb42809fed2a21525de5.tar.gz ++sha256 x rpi-firmware-8717598c7eb443c39c28a4b3a66b4d369ae0a83f.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 8b2b2c7154..6099e1f170 100644 @@ -25,8 +25,8 @@ index 8b2b2c7154..6099e1f170 100644 # ################################################################################ --RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44 -+RPI_FIRMWARE_VERSION = 70f1581eec2c036b7e9309f1af41c651fb125447 +-RPI_FIRMWARE_VERSION = d016a6eb01c8c7326a89cb42809fed2a21525de5 ++RPI_FIRMWARE_VERSION = 8717598c7eb443c39c28a4b3a66b4d369ae0a83f RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch index 9f1855da..acaebcd3 100644 --- a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch +++ b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch @@ -14,8 +14,8 @@ index b8931d2c45..9afc5a96b0 100644 +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated --sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz -+sha256 033a21d19fbdc7617b8c5b58d4be5951e29be5be787a45875b615f4d4dcf3f5b rpi-wifi-firmware-b66ab26cebff689d0d3257f56912b9bb03c20567.tar.gz +-sha256 cf806f6bdba0f803b90bc210f524a6ac37bac7ad19306c61474bb2dc59875e87 rpi-wifi-firmware-9c0ffe9a7f0753b36ed88f7981905a989d940ea9.tar.gz ++sha256 a942cc52cabf17661675d0877f39b1159fca2c83d57299d2dde06ad6e39ab0ab rpi-wifi-firmware-83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5.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 6be02509fe..3277a6e4a0 100644 @@ -25,9 +25,9 @@ index 6be02509fe..3277a6e4a0 100644 # ################################################################################ --RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 +-RPI_WIFI_FIRMWARE_VERSION = 9c0ffe9a7f0753b36ed88f7981905a989d940ea9 -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -+RPI_WIFI_FIRMWARE_VERSION = b66ab26cebff689d0d3257f56912b9bb03c20567 ++RPI_WIFI_FIRMWARE_VERSION = 83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5 +RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx diff --git a/buildroot-patches/0115-Fix-qt5webengine-host-dependencies.patch b/buildroot-patches/0115-Fix-qt5webengine-host-dependencies.patch new file mode 100644 index 00000000..43df7f91 --- /dev/null +++ b/buildroot-patches/0115-Fix-qt5webengine-host-dependencies.patch @@ -0,0 +1,35 @@ +From 4a26b5d65bcfccaff6d32f751e668d663c883f1e Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Fri, 26 Mar 2021 09:59:24 +0100 +Subject: [PATCH 1/1] Fix qt5webengine host dependencies + +--- + package/qt5/qt5webengine/qt5webengine.mk | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk +index 7e557725d3..6ac99823e4 100644 +--- a/package/qt5/qt5webengine/qt5webengine.mk ++++ b/package/qt5/qt5webengine/qt5webengine.mk +@@ -29,6 +29,18 @@ endif + + QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss + ++ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y) ++QT5WEBENGINE_DEPENDENCIES += host-freetype ++endif ++ ++ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y) ++QT5WEBENGINE_DEPENDENCIES += host-libjpeg ++endif ++ ++ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) ++QT5WEBENGINE_DEPENDENCIES += host-harfbuzz ++endif ++ + QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg + + ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) +-- +2.20.1 + From b9b7b9361c13311fe71e9fe75004f37a157e34cb Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 29 Mar 2021 12:26:18 +0200 Subject: [PATCH 03/10] Bump python-mycroft and its dependencies --- ...quirement-to-2.24.0-inline-with-buil.patch | 24 -- ...{0002-Shut-up.patch => 0001-Shut-up.patch} | 0 .../python-mycroft/0003-OVOS-PR2843.patch | 292 -------------- .../0004-OVOS-enclosure_assumptions.patch | 375 ------------------ .../python-mycroft/python-mycroft.hash | 2 +- .../package/python-mycroft/python-mycroft.mk | 2 +- ...0009-Downgrade-python-pyyaml-to-5.4.patch} | 28 +- 7 files changed, 15 insertions(+), 708 deletions(-) delete mode 100644 buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch rename buildroot-external/package/python-mycroft/{0002-Shut-up.patch => 0001-Shut-up.patch} (100%) delete mode 100644 buildroot-external/package/python-mycroft/0003-OVOS-PR2843.patch delete mode 100644 buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch rename buildroot-patches/{0009-Downgrade-python-pyyaml-to-5.1.2.patch => 0009-Downgrade-python-pyyaml-to-5.4.patch} (71%) diff --git a/buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch b/buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch deleted file mode 100644 index f7ce099c..00000000 --- a/buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d0e630337d7b81abfe7fdf018252e8c6b06f741d Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Wed, 17 Feb 2021 13:53:37 +0100 -Subject: [PATCH 1/1] Bump requests requirement to >= 2.24.0 inline with - buildroot. This to prevent issues with the urllib3 package in combination - with the HASS skill. - ---- - requirements/requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements/requirements.txt b/requirements/requirements.txt -index 8c22b4a4c5..dab7856965 100644 ---- a/requirements/requirements.txt -+++ b/requirements/requirements.txt -@@ -1,4 +1,4 @@ --requests==2.20.0 -+requests>=2.24.0 - gTTS>=2.2.2,<2.3.0 - PyAudio==0.2.11 - pyee==8.1.0 --- -2.20.1 - diff --git a/buildroot-external/package/python-mycroft/0002-Shut-up.patch b/buildroot-external/package/python-mycroft/0001-Shut-up.patch similarity index 100% rename from buildroot-external/package/python-mycroft/0002-Shut-up.patch rename to buildroot-external/package/python-mycroft/0001-Shut-up.patch diff --git a/buildroot-external/package/python-mycroft/0003-OVOS-PR2843.patch b/buildroot-external/package/python-mycroft/0003-OVOS-PR2843.patch deleted file mode 100644 index 3c8a1a69..00000000 --- a/buildroot-external/package/python-mycroft/0003-OVOS-PR2843.patch +++ /dev/null @@ -1,292 +0,0 @@ -From b81587defdd84e1f5d72f9db57eee5c880a77a21 Mon Sep 17 00:00:00 2001 -From: jarbasal -Date: Thu, 18 Feb 2021 13:24:34 +0000 -Subject: [PATCH 1/2] fix/padatious_mess - ---- - .../intent_services/padatious_service.py | 25 +++ - mycroft/skills/padatious_service.py | 199 +----------------- - 2 files changed, 27 insertions(+), 197 deletions(-) - -diff --git a/mycroft/skills/intent_services/padatious_service.py b/mycroft/skills/intent_services/padatious_service.py -index f58f86bc195..e1843f6c984 100644 ---- a/mycroft/skills/intent_services/padatious_service.py -+++ b/mycroft/skills/intent_services/padatious_service.py -@@ -52,6 +52,11 @@ def __init__(self, bus, config): - self.bus.on('detach_intent', self.handle_detach_intent) - self.bus.on('detach_skill', self.handle_detach_skill) - self.bus.on('mycroft.skills.initialized', self.train) -+ self.bus.on('intent.service.padatious.get', self.handle_get_padatious) -+ self.bus.on('intent.service.padatious.manifest.get', -+ self.handle_manifest) -+ self.bus.on('intent.service.padatious.entities.manifest.get', -+ self.handle_entity_manifest) - - self.finished_training_event = Event() - self.finished_initial_train = False -@@ -238,3 +243,23 @@ def calc_intent(self, utt): - utt (str): utterance to calculate best intent for - """ - return self.container.calc_intent(utt) -+ -+ def handle_get_padatious(self, message): -+ utterance = message.data["utterance"] -+ norm = message.data.get('norm_utt', utterance) -+ intent = self.calc_intent(utterance) -+ if not intent and norm != utterance: -+ intent = self.calc_intent(norm) -+ if intent: -+ intent = intent.__dict__ -+ self.bus.emit(message.reply("intent.service.padatious.reply", -+ {"intent": intent})) -+ -+ def handle_manifest(self, message): -+ self.bus.emit(message.reply("intent.service.padatious.manifest", -+ {"intents": self.registered_intents})) -+ -+ def handle_entity_manifest(self, message): -+ self.bus.emit( -+ message.reply("intent.service.padatious.entities.manifest", -+ {"entities": self.registered_entities})) -\ No newline at end of file -diff --git a/mycroft/skills/padatious_service.py b/mycroft/skills/padatious_service.py -index 1b6c248ab04..72f6425d6d7 100644 ---- a/mycroft/skills/padatious_service.py -+++ b/mycroft/skills/padatious_service.py -@@ -12,201 +12,6 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - # --from functools import lru_cache --from subprocess import call --from threading import Event --from time import time as get_time, sleep - --from os.path import expanduser, isfile -- --from mycroft.configuration import Configuration --from mycroft.messagebus.message import Message --from mycroft.skills.core import FallbackSkill --from mycroft.util.log import LOG -- -- --class PadatiousService(FallbackSkill): -- instance = None -- -- fallback_tight_match = 5 # Fallback priority for the conf > 0.8 match -- fallback_loose_match = 89 # Fallback priority for the conf > 0.5 match -- -- def __init__(self, bus, service): -- FallbackSkill.__init__(self, use_settings=False) -- if not PadatiousService.instance: -- PadatiousService.instance = self -- -- self.padatious_config = Configuration.get()['padatious'] -- self.service = service -- intent_cache = expanduser(self.padatious_config['intent_cache']) -- -- try: -- from padatious import IntentContainer -- except ImportError: -- LOG.error('Padatious not installed. Please re-run dev_setup.sh') -- try: -- call(['notify-send', 'Padatious not installed', -- 'Please run build_host_setup and dev_setup again']) -- except OSError: -- pass -- return -- -- self.container = IntentContainer(intent_cache) -- -- self._bus = bus -- self.bus.on('padatious:register_intent', self.register_intent) -- self.bus.on('padatious:register_entity', self.register_entity) -- self.bus.on('detach_intent', self.handle_detach_intent) -- self.bus.on('detach_skill', self.handle_detach_skill) -- self.bus.on('mycroft.skills.initialized', self.train) -- self.bus.on('intent.service.padatious.get', self.handle_get_padatious) -- self.bus.on('intent.service.padatious.manifest.get', -- self.handle_manifest) -- self.bus.on('intent.service.padatious.entities.manifest.get', -- self.handle_entity_manifest) -- -- # Call Padatious an an early fallback, looking for a high match intent -- self.register_fallback(self.handle_fallback, -- PadatiousService.fallback_tight_match) -- -- # Try loose Padatious intent match before going to fallback-unknown -- self.register_fallback(self.handle_fallback_last_chance, -- PadatiousService.fallback_loose_match) -- -- self.finished_training_event = Event() -- self.finished_initial_train = False -- -- self.train_delay = self.padatious_config['train_delay'] -- self.train_time = get_time() + self.train_delay -- -- self.registered_intents = [] -- self.registered_entities = [] -- -- def make_active(self): -- """Override the make active since this is not a real fallback skill.""" -- pass -- -- def train(self, message=None): -- padatious_single_thread = Configuration.get()[ -- 'padatious']['single_thread'] -- if message is None: -- single_thread = padatious_single_thread -- else: -- single_thread = message.data.get('single_thread', -- padatious_single_thread) -- -- self.finished_training_event.clear() -- -- LOG.info('Training... (single_thread={})'.format(single_thread)) -- self.container.train(single_thread=single_thread) -- LOG.info('Training complete.') -- -- self.finished_training_event.set() -- if not self.finished_initial_train: -- self.bus.emit(Message('mycroft.skills.trained')) -- self.finished_initial_train = True -- -- def wait_and_train(self): -- if not self.finished_initial_train: -- return -- sleep(self.train_delay) -- if self.train_time < 0.0: -- return -- -- if self.train_time <= get_time() + 0.01: -- self.train_time = -1.0 -- self.train() -- -- def __detach_intent(self, intent_name): -- """ Remove an intent if it has been registered. -- -- Arguments: -- intent_name (str): intent identifier -- """ -- if intent_name in self.registered_intents: -- self.registered_intents.remove(intent_name) -- self.container.remove_intent(intent_name) -- -- def handle_detach_intent(self, message): -- self.__detach_intent(message.data.get('intent_name')) -- -- def handle_detach_skill(self, message): -- skill_id = message.data['skill_id'] -- remove_list = [i for i in self.registered_intents if skill_id in i] -- for i in remove_list: -- self.__detach_intent(i) -- -- def _register_object(self, message, object_name, register_func): -- file_name = message.data['file_name'] -- name = message.data['name'] -- -- LOG.debug('Registering Padatious ' + object_name + ': ' + name) -- -- if not isfile(file_name): -- LOG.warning('Could not find file ' + file_name) -- return -- -- register_func(name, file_name) -- self.train_time = get_time() + self.train_delay -- self.wait_and_train() -- -- def register_intent(self, message): -- self.registered_intents.append(message.data['name']) -- self._register_object(message, 'intent', self.container.load_intent) -- -- def register_entity(self, message): -- self.registered_entities.append(message.data) -- self._register_object(message, 'entity', self.container.load_entity) -- -- def handle_fallback(self, message, threshold=0.8): -- if not self.finished_training_event.is_set(): -- LOG.debug('Waiting for Padatious training to finish...') -- return False -- -- utt = message.data.get('utterance', '') -- LOG.debug("Padatious fallback attempt: " + utt) -- intent = self.calc_intent(utt) -- -- if not intent or intent.conf < threshold: -- # Attempt to use normalized() version -- norm = message.data.get('norm_utt', utt) -- if norm != utt: -- LOG.debug(" alt attempt: " + norm) -- intent = self.calc_intent(norm) -- utt = norm -- if not intent or intent.conf < threshold: -- return False -- -- intent.matches['utterance'] = utt -- self.service.add_active_skill(intent.name.split(':')[0]) -- self.bus.emit(message.forward(intent.name, data=intent.matches)) -- return True -- -- def handle_fallback_last_chance(self, message): -- return self.handle_fallback(message, 0.5) -- -- def handle_get_padatious(self, message): -- utterance = message.data["utterance"] -- norm = message.data.get('norm_utt', utterance) -- intent = self.calc_intent(utterance) -- if not intent and norm != utterance: -- intent = PadatiousService.instance.calc_intent(norm) -- if intent: -- intent = intent.__dict__ -- self.bus.emit(message.reply("intent.service.padatious.reply", -- {"intent": intent})) -- -- def handle_manifest(self, message): -- self.bus.emit(message.reply("intent.service.padatious.manifest", -- {"intents": self.registered_intents})) -- -- def handle_entity_manifest(self, message): -- self.bus.emit( -- message.reply("intent.service.padatious.entities.manifest", -- {"entities": self.registered_entities})) -- -- # NOTE: This cache will keep a reference to this calss (PadatiousService), -- # but we can live with that since it is used as a singleton. -- @lru_cache(maxsize=2) # 2 catches both raw and normalized utts in cache -- def calc_intent(self, utt): -- return self.container.calc_intent(utt) -+## BACKWARDS COMPATIBILITY -+from mycroft.skills.intent_services.padatious_service import PadatiousService - -From bd5bd6fac9258a733b099f66679b8b762ae87a77 Mon Sep 17 00:00:00 2001 -From: jarbasal -Date: Thu, 18 Feb 2021 13:32:08 +0000 -Subject: [PATCH 2/2] pep8 - ---- - mycroft/skills/intent_services/padatious_service.py | 2 +- - mycroft/skills/padatious_service.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mycroft/skills/intent_services/padatious_service.py b/mycroft/skills/intent_services/padatious_service.py -index e1843f6c984..d3fcc18de47 100644 ---- a/mycroft/skills/intent_services/padatious_service.py -+++ b/mycroft/skills/intent_services/padatious_service.py -@@ -262,4 +262,4 @@ def handle_manifest(self, message): - def handle_entity_manifest(self, message): - self.bus.emit( - message.reply("intent.service.padatious.entities.manifest", -- {"entities": self.registered_entities})) -\ No newline at end of file -+ {"entities": self.registered_entities})) -diff --git a/mycroft/skills/padatious_service.py b/mycroft/skills/padatious_service.py -index 72f6425d6d7..6dffa13d872 100644 ---- a/mycroft/skills/padatious_service.py -+++ b/mycroft/skills/padatious_service.py -@@ -13,5 +13,5 @@ - # limitations under the License. - # - --## BACKWARDS COMPATIBILITY -+# BACKWARDS COMPATIBILITY - from mycroft.skills.intent_services.padatious_service import PadatiousService diff --git a/buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch b/buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch deleted file mode 100644 index e7fe0789..00000000 --- a/buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch +++ /dev/null @@ -1,375 +0,0 @@ -From ae33770b5b842b9ac51fa7eefcb9b3808590f2e8 Mon Sep 17 00:00:00 2001 -From: jarbasal -Date: Thu, 18 Feb 2021 18:28:31 +0000 -Subject: [PATCH 1/4] enclosure cleanup - ---- - mycroft/client/enclosure/base.py | 39 ++++++ - mycroft/client/enclosure/generic/__init__.py | 139 +------------------ - 2 files changed, 42 insertions(+), 136 deletions(-) - -diff --git a/mycroft/client/enclosure/base.py b/mycroft/client/enclosure/base.py -index 4d26a42f43f..7d55040d13b 100644 ---- a/mycroft/client/enclosure/base.py -+++ b/mycroft/client/enclosure/base.py -@@ -23,6 +23,7 @@ - from mycroft.util.log import LOG - - import json -+import time - import tornado.web as web - from tornado import ioloop - from tornado.websocket import WebSocketHandler -@@ -70,6 +71,10 @@ def __init__(self): - # Create Message Bus Client - self.bus = MessageBusClient() - -+ # TODO: this requires the Enclosure to be up and running before the -+ # training is complete. -+ self.bus.on('mycroft.skills.trained', self.is_device_ready) -+ - self.gui = create_gui_service(self, config['gui_websocket']) - # This datastore holds the data associated with the GUI provider. Data - # is stored in Namespaces, so you can have: -@@ -115,6 +120,40 @@ def stop(self): - """Perform any enclosure shutdown processes.""" - pass - -+ def is_device_ready(self, message): -+ is_ready = False -+ # Bus service assumed to be alive if messages sent and received -+ # Enclosure assumed to be alive if this method is running -+ services = {'audio': False, 'speech': False, 'skills': False} -+ start = time.monotonic() -+ while not is_ready: -+ is_ready = self.check_services_ready(services) -+ if is_ready: -+ break -+ elif time.monotonic() - start >= 60: -+ raise Exception('Timeout waiting for services start.') -+ else: -+ time.sleep(3) -+ -+ if is_ready: -+ LOG.info("Mycroft is all loaded and ready to roll!") -+ self.bus.emit(Message('mycroft.ready')) -+ -+ return is_ready -+ -+ def check_services_ready(self, services): -+ """Report if all specified services are ready. -+ -+ services (iterable): service names to check. -+ """ -+ for ser in services: -+ services[ser] = False -+ response = self.bus.wait_for_response(Message( -+ 'mycroft.{}.is_ready'.format(ser))) -+ if response and response.data['status']: -+ services[ser] = True -+ return all([services[ser] for ser in services]) -+ - ###################################################################### - # GUI client API - @property -diff --git a/mycroft/client/enclosure/generic/__init__.py b/mycroft/client/enclosure/generic/__init__.py -index 3c47a545943..23c4fde794c 100644 ---- a/mycroft/client/enclosure/generic/__init__.py -+++ b/mycroft/client/enclosure/generic/__init__.py -@@ -12,144 +12,11 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - # --import subprocess --import time --import sys --from threading import Thread, Timer -- --import mycroft.dialog - from mycroft.client.enclosure.base import Enclosure --from mycroft.api import has_been_paired --from mycroft.audio import wait_while_speaking --from mycroft.enclosure.display_manager import \ -- init_display_manager_bus_connection --from mycroft.messagebus.message import Message --from mycroft.util import connected --from mycroft.util.log import LOG - - - class EnclosureGeneric(Enclosure): - """ -- Serves as a communication interface between a simple text frontend and -- Mycroft Core. This is used for Picroft or other headless systems, -- and/or for users of the CLI. -- """ -- -- _last_internet_notification = 0 -- -- def __init__(self): -- super().__init__() -- -- # Notifications from mycroft-core -- self.bus.on('enclosure.notify.no_internet', self.on_no_internet) -- # TODO: this requires the Enclosure to be up and running before the -- # training is complete. -- self.bus.on('mycroft.skills.trained', self.is_device_ready) -- -- # initiates the web sockets on display manager -- # NOTE: this is a temporary place to connect the display manager -- init_display_manager_bus_connection() -- -- # verify internet connection and prompt user on bootup if needed -- if not connected(): -- # We delay this for several seconds to ensure that the other -- # clients are up and connected to the messagebus in order to -- # receive the "speak". This was sometimes happening too -- # quickly and the user wasn't notified what to do. -- Timer(5, self._do_net_check).start() -- -- def is_device_ready(self, message): -- is_ready = False -- # Bus service assumed to be alive if messages sent and received -- # Enclosure assumed to be alive if this method is running -- services = {'audio': False, 'speech': False, 'skills': False} -- start = time.monotonic() -- while not is_ready: -- is_ready = self.check_services_ready(services) -- if is_ready: -- break -- elif time.monotonic() - start >= 60: -- raise Exception('Timeout waiting for services start.') -- else: -- time.sleep(3) -- -- if is_ready: -- LOG.info("Mycroft is all loaded and ready to roll!") -- self.bus.emit(Message('mycroft.ready')) -- -- return is_ready -- -- def check_services_ready(self, services): -- """Report if all specified services are ready. -- -- services (iterable): service names to check. -- """ -- for ser in services: -- services[ser] = False -- response = self.bus.wait_for_response(Message( -- 'mycroft.{}.is_ready'.format(ser))) -- if response and response.data['status']: -- services[ser] = True -- return all([services[ser] for ser in services]) -- -- def on_no_internet(self, event=None): -- if connected(): -- # One last check to see if connection was established -- return -- -- if time.time() - Enclosure._last_internet_notification < 30: -- # don't bother the user with multiple notifications with 30 secs -- return -- -- Enclosure._last_internet_notification = time.time() -- -- # TODO: This should go into EnclosureMark1 subclass of Enclosure. -- if has_been_paired(): -- # Handle the translation within that code. -- self.bus.emit(Message("speak", { -- 'utterance': "This device is not connected to the Internet. " -- "Either plug in a network cable or set up your " -- "wifi connection."})) -- else: -- # enter wifi-setup mode automatically -- self.bus.emit(Message('system.wifi.setup', {'lang': self.lang})) -- -- def speak(self, text): -- self.bus.emit(Message("speak", {'utterance': text})) -- -- def _handle_pairing_complete(self, _): -- """ -- Handler for 'mycroft.paired', unmutes the mic after the pairing is -- complete. -- """ -- self.bus.emit(Message("mycroft.mic.unmute")) -- -- def _do_net_check(self): -- # TODO: This should live in the derived Enclosure, e.g. EnclosureMark1 -- LOG.info("Checking internet connection") -- if not connected(): # and self.conn_monitor is None: -- if has_been_paired(): -- # TODO: Enclosure/localization -- self.speak("This unit is not connected to the Internet. " -- "Either plug in a network cable or setup your " -- "wifi connection.") -- else: -- # Begin the unit startup process, this is the first time it -- # is being run with factory defaults. -- -- # TODO: This logic should be in EnclosureMark1 -- # TODO: Enclosure/localization -- -- # Don't listen to mic during this out-of-box experience -- self.bus.emit(Message("mycroft.mic.mute")) -- # Setup handler to unmute mic at the end of on boarding -- # i.e. after pairing is complete -- self.bus.once('mycroft.paired', self._handle_pairing_complete) -- -- self.speak(mycroft.dialog.get('mycroft.intro')) -- wait_while_speaking() -- time.sleep(2) # a pause sounds better than just jumping in -- -- # Kick off wifi-setup automatically -- data = {'allow_timeout': False, 'lang': self.lang} -- self.bus.emit(Message('system.wifi.setup', data)) -+ Serves as a communication interface between GUI and -+ Mycroft Core. This is used for Picroft or other headless systems -+ """ -\ No newline at end of file - -From a5ab14ae5acc5c88fef2dbb23a6729d1eff5ca9e Mon Sep 17 00:00:00 2001 -From: jarbasal -Date: Thu, 18 Feb 2021 19:24:59 +0000 -Subject: [PATCH 2/4] only report ready after pairing - ---- - mycroft/client/enclosure/base.py | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/mycroft/client/enclosure/base.py b/mycroft/client/enclosure/base.py -index 7d55040d13b..aacefe46449 100644 ---- a/mycroft/client/enclosure/base.py -+++ b/mycroft/client/enclosure/base.py -@@ -16,7 +16,7 @@ - - from collections import namedtuple - from threading import Lock -- -+from mycroft.api import is_paired - from mycroft.configuration import Configuration - from mycroft.messagebus.client import MessageBusClient - from mycroft.util import create_daemon, start_message_bus_client -@@ -73,7 +73,8 @@ def __init__(self): - - # TODO: this requires the Enclosure to be up and running before the - # training is complete. -- self.bus.on('mycroft.skills.trained', self.is_device_ready) -+ self.bus.once('mycroft.skills.trained', -+ self.handle_check_device_readiness) - - self.gui = create_gui_service(self, config['gui_websocket']) - # This datastore holds the data associated with the GUI provider. Data -@@ -120,7 +121,7 @@ def stop(self): - """Perform any enclosure shutdown processes.""" - pass - -- def is_device_ready(self, message): -+ def is_device_ready(self): - is_ready = False - # Bus service assumed to be alive if messages sent and received - # Enclosure assumed to be alive if this method is running -@@ -134,12 +135,19 @@ def is_device_ready(self, message): - raise Exception('Timeout waiting for services start.') - else: - time.sleep(3) -+ return is_ready - -- if is_ready: -- LOG.info("Mycroft is all loaded and ready to roll!") -- self.bus.emit(Message('mycroft.ready')) -+ def handle_check_device_readiness(self, message): - -- return is_ready -+ def handle_ready(message=None): -+ if self.is_device_ready(): -+ LOG.info("Mycroft is all loaded and ready to roll!") -+ self.bus.emit(Message('mycroft.ready')) -+ -+ if not is_paired(): -+ self.bus.once("mycroft.paired", handle_ready) -+ else: -+ handle_ready() - - def check_services_ready(self, services): - """Report if all specified services are ready. - -From 4d67450e0e1b9d86a1d452f7e683500335224d3b Mon Sep 17 00:00:00 2001 -From: jarbasal -Date: Sun, 21 Feb 2021 15:01:30 +0000 -Subject: [PATCH 3/4] pairing non sense - ---- - mycroft/skills/__main__.py | 12 ++++-------- - mycroft/stt/__init__.py | 2 +- - 2 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/mycroft/skills/__main__.py b/mycroft/skills/__main__.py -index 0d0cc378edf..bca66ccdfc1 100644 ---- a/mycroft/skills/__main__.py -+++ b/mycroft/skills/__main__.py -@@ -39,10 +39,10 @@ - from mycroft.util.lang import set_active_lang - from mycroft.util.log import LOG - from mycroft.util.process_utils import ProcessStatus, StatusCallbackMap --from .core import FallbackSkill --from .event_scheduler import EventScheduler --from .intent_service import IntentService --from .skill_manager import SkillManager -+from mycroft.skills.core import FallbackSkill -+from mycroft.skills.event_scheduler import EventScheduler -+from mycroft.skills.intent_service import IntentService -+from mycroft.skills.skill_manager import SkillManager - - RASPBERRY_PI_PLATFORMS = ('mycroft_mark_1', 'picroft', 'mycroft_mark_2pi') - -@@ -127,10 +127,6 @@ def _ensure_device_is_paired(self): - Pairing cannot be performed if there is no connection to the back end. - So skip pairing if the backend is down. - """ -- if not self.is_paired and not self.backend_down: -- LOG.info('Device not paired, invoking the pairing skill') -- payload = dict(utterances=["pair my device"], lang="en-us") -- self.bus.emit(Message("recognizer_loop:utterance", payload)) - - def _update_device_attributes_on_backend(self): - """Communicate version information to the backend. -diff --git a/mycroft/stt/__init__.py b/mycroft/stt/__init__.py -index 5028f20ea1d..a0d49a6e510 100644 ---- a/mycroft/stt/__init__.py -+++ b/mycroft/stt/__init__.py -@@ -285,7 +285,7 @@ def wrapper(*args, **kwargs): - if e.response.status_code == 401: - LOG.warning('Access Denied at mycroft.ai') - # phrase to start the pairing process -- return 'pair my device' -+ return None - else: - raise - return wrapper - -From 87113e92f3909a13c1007d6f935398aa98d96be3 Mon Sep 17 00:00:00 2001 -From: jarbasal -Date: Sun, 21 Feb 2021 20:45:50 +0000 -Subject: [PATCH 4/4] pairing trigger - ---- - mycroft/skills/__main__.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mycroft/skills/__main__.py b/mycroft/skills/__main__.py -index bca66ccdfc1..609fb0ee932 100644 ---- a/mycroft/skills/__main__.py -+++ b/mycroft/skills/__main__.py -@@ -123,10 +123,10 @@ def _display_skill_loading_notification(self): - - def _ensure_device_is_paired(self): - """Determine if device is paired, if not automatically start pairing. -- -- Pairing cannot be performed if there is no connection to the back end. -- So skip pairing if the backend is down. - """ -+ if not self.is_paired: -+ LOG.info('Device not paired, invoking the pairing skill') -+ self.bus.emit(Message("mycroft.not.paired")) - - def _update_device_attributes_on_backend(self): - """Communicate version information to the backend. diff --git a/buildroot-external/package/python-mycroft/python-mycroft.hash b/buildroot-external/package/python-mycroft/python-mycroft.hash index 7b32fb04..7ff0d5c1 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.hash +++ b/buildroot-external/package/python-mycroft/python-mycroft.hash @@ -1 +1 @@ -sha256 48e54c3e05347667e068cf6db5cd0905647b85bea32533d8e4aedf0611776185 python-mycroft-a976bd1094dbfba155811df1ca227b40be9422ff.tar.gz +sha256 fc0b7c2411829fb88259c4f45f9b5ae8875e27f87e651398430bd40d7ca8fe37 python-mycroft-fd4e0dc160391f1b5703c66f9482e93d30c15118.tar.gz diff --git a/buildroot-external/package/python-mycroft/python-mycroft.mk b/buildroot-external/package/python-mycroft/python-mycroft.mk index d2087c18..14a4cc43 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 = a976bd1094dbfba155811df1ca227b40be9422ff +PYTHON_MYCROFT_VERSION = fd4e0dc160391f1b5703c66f9482e93d30c15118 PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION)) PYTHON_MYCROFT_SETUP_TYPE = setuptools PYTHON_MYCROFT_LICENSE_FILES = LICENSE diff --git a/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch b/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.4.patch similarity index 71% rename from buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch rename to buildroot-patches/0009-Downgrade-python-pyyaml-to-5.4.patch index f0dec0c3..02dd2be9 100644 --- a/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch +++ b/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.4.patch @@ -1,7 +1,7 @@ -From e33b75b1d7184d593b376b70cb6253edbd96215f Mon Sep 17 00:00:00 2001 +From ef42b24ee3a4c4ddf58a56a4e35d07cc8942d45f Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 18 Mar 2021 15:18:06 +0100 -Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2 +Date: Mon, 29 Mar 2021 10:54:29 +0200 +Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.4 --- package/python-pyyaml/python-pyyaml.hash | 2 +- @@ -10,18 +10,18 @@ Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash -index 82b2f4f880..025b5ac065 100644 +index 82b2f4f880..93d1af5879 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz -sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz -+sha256 01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4 PyYAML-5.1.2.tar.gz ++sha256 3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a PyYAML-5.4.tar.gz # Locally computed sha256 checksums sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk -index c9013de8ec..87c2079f92 100644 +index c9013de8ec..fb3f42251b 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -5,9 +5,9 @@ @@ -29,16 +29,15 @@ index c9013de8ec..87c2079f92 100644 # Please keep in sync package/python3-pyyaml/python3-pyyaml.mk -PYTHON_PYYAML_VERSION = 5.4.1 -+PYTHON_PYYAML_VERSION = 5.1.2 ++PYTHON_PYYAML_VERSION = 5.4 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d -+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe --PYTHON_PYYAML_SETUP_TYPE = setuptools -+PYTHON_PYYAML_SETUP_TYPE = distutils ++PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/b5/fd/15638de2da0a5aa91c095718444624aa565f766fc178249ca6faa372f71a + PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk -index f758341502..5a331905a3 100644 +index f758341502..0ed35c5335 100644 --- a/package/python3-pyyaml/python3-pyyaml.mk +++ b/package/python3-pyyaml/python3-pyyaml.mk @@ -5,9 +5,9 @@ @@ -46,12 +45,11 @@ index f758341502..5a331905a3 100644 # Please keep in sync with package/python-pyyaml/python-pyyaml.mk -PYTHON3_PYYAML_VERSION = 5.4.1 -+PYTHON3_PYYAML_VERSION = 5.1.2 ++PYTHON3_PYYAML_VERSION = 5.4 PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz -PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d -+PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe --PYTHON3_PYYAML_SETUP_TYPE = setuptools -+PYTHON3_PYYAML_SETUP_TYPE = distutils ++PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/b5/fd/15638de2da0a5aa91c095718444624aa565f766fc178249c + PYTHON3_PYYAML_SETUP_TYPE = setuptools PYTHON3_PYYAML_LICENSE = MIT PYTHON3_PYYAML_LICENSE_FILES = LICENSE -- From df7a4027dc2d319ecb4271ca85c1163940a55ecb Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 29 Mar 2021 14:48:28 +0200 Subject: [PATCH 04/10] Bump mycroft-gui --- buildroot-external/package/mycroft-gui/mycroft-gui.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/package/mycroft-gui/mycroft-gui.hash b/buildroot-external/package/mycroft-gui/mycroft-gui.hash index daaeaca7..fdee2330 100644 --- a/buildroot-external/package/mycroft-gui/mycroft-gui.hash +++ b/buildroot-external/package/mycroft-gui/mycroft-gui.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2522d6e7cddbc8db99dc8c3ae239969845cc526ad90ab620db1424cdff5a8660 mycroft-gui-c78d742af14381ea0017916175d2fb0155fc95a3.tar.gz +sha256 2522d6e7cddbc8db99dc8c3ae239969845cc526ad90ab620db1424cdff5a8660 mycroft-gui-c78d742af14381ea0017916175d2fb0155fc95a3.tar.gz From 8d00a9687222768f38e6da828b478649fcac7c3b Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 29 Mar 2021 14:51:57 +0200 Subject: [PATCH 05/10] Move vosk preinstalled package to 3.9 path (for testing) --- .../site-packages/vosk-0.3.17.dist-info/METADATA | 0 .../site-packages/vosk-0.3.17.dist-info/RECORD | 0 .../site-packages/vosk-0.3.17.dist-info/WHEEL | 0 .../vosk-0.3.17.dist-info/top_level.txt | 0 .../site-packages/vosk/__init__.py | 0 .../vosk/_vosk.cpython-38-aarch64-linux-gnu.so | Bin .../site-packages/vosk/vosk.py | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename buildroot-external/rootfs-overlay/usr/lib/{python3.8 => python3.9}/site-packages/vosk-0.3.17.dist-info/METADATA (100%) rename buildroot-external/rootfs-overlay/usr/lib/{python3.8 => python3.9}/site-packages/vosk-0.3.17.dist-info/RECORD (100%) rename buildroot-external/rootfs-overlay/usr/lib/{python3.8 => python3.9}/site-packages/vosk-0.3.17.dist-info/WHEEL (100%) rename buildroot-external/rootfs-overlay/usr/lib/{python3.8 => python3.9}/site-packages/vosk-0.3.17.dist-info/top_level.txt (100%) rename buildroot-external/rootfs-overlay/usr/lib/{python3.8 => python3.9}/site-packages/vosk/__init__.py (100%) rename buildroot-external/rootfs-overlay/usr/lib/{python3.8 => python3.9}/site-packages/vosk/_vosk.cpython-38-aarch64-linux-gnu.so (100%) rename buildroot-external/rootfs-overlay/usr/lib/{python3.8 => python3.9}/site-packages/vosk/vosk.py (100%) diff --git a/buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/METADATA b/buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/METADATA similarity index 100% rename from buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/METADATA rename to buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/METADATA diff --git a/buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/RECORD b/buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/RECORD similarity index 100% rename from buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/RECORD rename to buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/RECORD diff --git a/buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/WHEEL b/buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/WHEEL similarity index 100% rename from buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/WHEEL rename to buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/WHEEL diff --git a/buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/top_level.txt b/buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/top_level.txt similarity index 100% rename from buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk-0.3.17.dist-info/top_level.txt rename to buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk-0.3.17.dist-info/top_level.txt diff --git a/buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk/__init__.py b/buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk/__init__.py similarity index 100% rename from buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk/__init__.py rename to buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk/__init__.py diff --git a/buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk/_vosk.cpython-38-aarch64-linux-gnu.so b/buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk/_vosk.cpython-38-aarch64-linux-gnu.so similarity index 100% rename from buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk/_vosk.cpython-38-aarch64-linux-gnu.so rename to buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk/_vosk.cpython-38-aarch64-linux-gnu.so diff --git a/buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk/vosk.py b/buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk/vosk.py similarity index 100% rename from buildroot-external/rootfs-overlay/usr/lib/python3.8/site-packages/vosk/vosk.py rename to buildroot-external/rootfs-overlay/usr/lib/python3.9/site-packages/vosk/vosk.py From c75b8f0cc1b57f54a33b77ae91a8322986c30454 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 29 Mar 2021 17:33:09 +0200 Subject: [PATCH 06/10] Bump ovos-utils --- .../package/python-ovos-utils/python-ovos-utils.hash | 2 +- .../package/python-ovos-utils/python-ovos-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash index cd15d082..38574c14 100644 --- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash +++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash @@ -1 +1 @@ -sha256 417094ab4016fba6f1347712f811f2ce93eb27deedee4e095d8bc52b8483c02a python-ovos-utils-7329fe7aa6454131e795d80f4ba6cc1c24cb3fed.tar.gz +sha256 f05d420f11b38bb295af251739bf8b4d1c503f2dabc255ea704b737c9b74d43f python-ovos-utils-8d87353defd0d8fff26e031a33879ed5938bf372.tar.gz diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk index 216d7da2..4258b925 100644 --- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk +++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_OVOS_UTILS_VERSION = 7329fe7aa6454131e795d80f4ba6cc1c24cb3fed +PYTHON_OVOS_UTILS_VERSION = 8d87353defd0d8fff26e031a33879ed5938bf372 PYTHON_OVOS_UTILS_SITE = $(call github,OpenVoiceOS,ovos_utils,$(PYTHON_OVOS_UTILS_VERSION)) PYTHON_OVOS_UTILS_SETUP_TYPE = setuptools PYTHON_OVOS_UTILS_LICENSE_FILES = LICENSE From b205bc002d4467cd5afcae06419674c50ec5ac19 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 30 Mar 2021 10:22:10 +0200 Subject: [PATCH 07/10] Bump snapcast --- buildroot-external/package/snapcast/snapcast.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/package/snapcast/snapcast.mk b/buildroot-external/package/snapcast/snapcast.mk index 0058a913..5f09e87c 100644 --- a/buildroot-external/package/snapcast/snapcast.mk +++ b/buildroot-external/package/snapcast/snapcast.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAPCAST_VERSION = v0.23.0 +SNAPCAST_VERSION = v0.24.0 SNAPCAST_SITE = $(call github,badaix,snapcast,$(SNAPCAST_VERSION)) SNAPCAST_DEPENDENCIES = libogg alsa-lib avahi # libstdcpp libatomic libflac libvorbisidec SNAPCAST_LICENSE = GPL-3.0+ From af2dbd37164b2f991303b00bdb7cb7100824eb17 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 30 Mar 2021 10:33:55 +0200 Subject: [PATCH 08/10] Bump ncpamixer --- buildroot-external/package/ncpamixer/ncpamixer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/package/ncpamixer/ncpamixer.mk b/buildroot-external/package/ncpamixer/ncpamixer.mk index be280d65..5b826af5 100644 --- a/buildroot-external/package/ncpamixer/ncpamixer.mk +++ b/buildroot-external/package/ncpamixer/ncpamixer.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCPAMIXER_VERSION = 8cfb65955025b866cfc42215d1e4f51726944620 +NCPAMIXER_VERSION = a69610aa7dd2fb98a4b9558d0a0f73e14cc16aab NCPAMIXER_SITE = $(call github,fulhax,ncpamixer,$(NCPAMIXER_VERSION)) NCPAMIXER_SUBDIR = src NCPAMIXER_LICENSE = MIT From e03341fdd9f2acd34d7447aff69358ad7f8839a8 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 30 Mar 2021 11:06:48 +0200 Subject: [PATCH 09/10] Bump spotifyd --- .../package/spotifyd/spotifyd.conf | 94 +++++++++++++++++-- .../package/spotifyd/spotifyd.mk | 2 +- 2 files changed, 86 insertions(+), 10 deletions(-) diff --git a/buildroot-external/package/spotifyd/spotifyd.conf b/buildroot-external/package/spotifyd/spotifyd.conf index 47c45e01..87e0a3df 100644 --- a/buildroot-external/package/spotifyd/spotifyd.conf +++ b/buildroot-external/package/spotifyd/spotifyd.conf @@ -1,14 +1,90 @@ [global] +# Your Spotify account name. +#username = "username" + +# Your Spotify account password. +#password = "password" + +# A command that gets executed and can be used to +# retrieve your password. +# The command should return the password on stdout. +# +# This is an alternative to the `password` field. Both +# can't be used simultaneously. +#password_cmd = "command_that_writes_password_to_stdout" + +# If set to true, `spotifyd` tries to look up your +# password in the system's password storage. +# +# This is an alternative to the `password` field. Both +# can't be used simultaneously. +#use_keyring = true + +# +# If set to true, `spotifyd` tries to bind to the session dbus +# and expose MPRIS controls. When running headless, without a dbus session, +# then set this to false to avoid binding errors +# +#use_mpris = true + +# The audio backend used to play the your music. To get +# a list of possible backends, run `spotifyd --help`. +backend = "pulseaudio" + +# The alsa audio device to stream audio to. To get a +# list of valid devices, run `aplay -L`, +#device = "alsa_audio_device" # omit for macOS + +# The alsa control device. By default this is the same +# name as the `device` field. +#control = "alsa_audio_device" # omit for macOS + +# The alsa mixer used by `spotifyd`. +#mixer = "PCM" + +# The volume controller. Each one behaves different to +# volume increases. For possible values, run +# `spotifyd --help`. +#volume_controller = "alsa" # use softvol for macOS + +# A command that gets executed in your shell after each song changes. +#on_song_change_hook = "command_to_run_on_playback_events" + +# The name that gets displayed under the connect tab on +# official clients. Spaces are not allowed! +device_name = "OpenVoiceOS" + +# The audio bitrate. 96, 160 or 320 kbit/s +#bitrate = 160 + +# The directory used to cache audio data. This setting can save +# a lot of bandwidth when activated, as it will avoid re-downloading +# audio files when replaying them. +# +# Note: The file path does not get expanded. Environment variables and +# shell placeholders like $HOME or ~ don't work! +#cache_path = "cache_directory" + +# If set to true, audio data does NOT get cached. +#no_audio_cache = true + +# Volume on startup between 0 and 100 +# NOTE: This variable's type will change in v0.4, to a number (instead of string) +#initial_volume = "90" + +# If set to true, enables volume normalisation between songs. +#volume_normalisation = true + +# The normalisation pregain that is applied for each song. +#normalisation_pregain = -10 + # The port `spotifyd` uses to announce its service over the network. zeroconf_port = 57621 -# Cleartext username and password for remote Spotify access. -# Make sure the file is only accessible by spotifyd. -# username = USER -# password = PASS +# The proxy `spotifyd` will use to connect to spotify. +#proxy = "http://proxy.example.org:8080" -# alsa, pulseaudio or pipe -backend = pulseaudio - -# Name in Spotify Connect, cannot contain spaces: -device_name = OpenVoiceOS +# The displayed device type in Spotify clients. +# Can be unknown, computer, tablet, smartphone, speaker, t_v, +# a_v_r (Audio/Video Receiver), s_t_b (Set-Top Box), and audio_dongle. +device_type = "speaker" diff --git a/buildroot-external/package/spotifyd/spotifyd.mk b/buildroot-external/package/spotifyd/spotifyd.mk index 6b2ff2d1..6ca342ca 100644 --- a/buildroot-external/package/spotifyd/spotifyd.mk +++ b/buildroot-external/package/spotifyd/spotifyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPOTIFYD_VERSION = v0.2.24 +SPOTIFYD_VERSION = v0.3.0 SPOTIFYD_SITE = $(call github,Spotifyd,spotifyd,$(SPOTIFYD_VERSION)) SPOTIFYD_LICENSE = GPL-3.0 SPOTIFYD_LICENSE_FILES = LICENSE From 474bc0d9cfd49a9c533aa043149cf6467033ad74 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 30 Mar 2021 11:21:31 +0200 Subject: [PATCH 10/10] Switch respeaker drivers to a linux 5.10 compatible version. --- buildroot-external/configs/rpi4_64-gui_defconfig | 3 +-- buildroot-external/package/respeaker/respeaker.hash | 2 +- buildroot-external/package/respeaker/respeaker.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 284c9cec..d0b87dad 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -394,8 +394,6 @@ BR2_PACKAGE_LIBSVG_CAIRO=y BR2_PACKAGE_OPENJPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_WAFFLE=y -BR2_PACKAGE_DTC=y -BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBV4L=y @@ -534,6 +532,7 @@ BR2_PACKAGE_LOTTIE_QML=y BR2_PACKAGE_NCPAMIXER=y BR2_PACKAGE_OVOS_SPLASH=y BR2_PACKAGE_QT5CT=y +BR2_PACKAGE_RESPEAKER=y BR2_PACKAGE_SNAPCAST=y BR2_PACKAGE_SNAPCAST_SERVER=y BR2_PACKAGE_SPOTIFYD=y diff --git a/buildroot-external/package/respeaker/respeaker.hash b/buildroot-external/package/respeaker/respeaker.hash index 919d2d2e..285bcc7e 100644 --- a/buildroot-external/package/respeaker/respeaker.hash +++ b/buildroot-external/package/respeaker/respeaker.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d2e01910ac61f1f84599bd1b15ab9ce18ddd02c713f81418724ac7c8f584fb47 respeaker-8cce4e8ffa77e1e2b89812e5e2ccf6cfbc1086cf.tar.gz +sha256 9a97eb4e53398761b26104bd43018d1563efb133d7ac67e0e5ea25d15ab45e66 respeaker-50dbe24b7839fb4d82d01693ca15fa631b5a761d.tar.gz diff --git a/buildroot-external/package/respeaker/respeaker.mk b/buildroot-external/package/respeaker/respeaker.mk index addf87cb..ad65b902 100644 --- a/buildroot-external/package/respeaker/respeaker.mk +++ b/buildroot-external/package/respeaker/respeaker.mk @@ -4,8 +4,8 @@ # ################################################################################ -RESPEAKER_VERSION = 8cce4e8ffa77e1e2b89812e5e2ccf6cfbc1086cf -RESPEAKER_SITE = $(call github,respeaker,seeed-voicecard,$(RESPEAKER_VERSION)) +RESPEAKER_VERSION = 50dbe24b7839fb4d82d01693ca15fa631b5a761d +RESPEAKER_SITE = $(call github,HinTak,seeed-voicecard,$(RESPEAKER_VERSION)) RESPEAKER_LICENSE = GNU General Public License v3.0 RESPEAKER_DEPENDENCIES = rpi-firmware dtc