[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-189-g3d8edc187
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-189-g3d8edc187
|
From: Sébastien S. <ss...@us...> - 2020-05-29 14:26:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3d8edc187f324dc183a34e07fc1eccb16bc63694 (commit)
from 05ae6cb57901f55d99a2fc8b73f438b0f9afdf93 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3d8edc187f324dc183a34e07fc1eccb16bc63694
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri May 29 16:24:40 2020 +0200
[BUILDROOT] 2020.02: drop upstream patches
-----------------------------------------------------------------------
Summary of changes:
...hon-flask-fix-runtime-python-modules-depe.patch | 41 ----------------
...-package-python-flask-update-homepage-URL.patch | 28 -----------
...ackage-python-flask-bump-version-to-1.1.2.patch | 51 -------------------
.../343-package-evtest-switch-to-Gitlab.patch | 57 ----------------------
4 files changed, 177 deletions(-)
delete mode 100644 patches/buildroot/2020.02/245-package-python-flask-fix-runtime-python-modules-depe.patch
delete mode 100644 patches/buildroot/2020.02/246-package-python-flask-update-homepage-URL.patch
delete mode 100644 patches/buildroot/2020.02/247-package-python-flask-bump-version-to-1.1.2.patch
delete mode 100644 patches/buildroot/2020.02/343-package-evtest-switch-to-Gitlab.patch
diff --git a/patches/buildroot/2020.02/245-package-python-flask-fix-runtime-python-modules-depe.patch b/patches/buildroot/2020.02/245-package-python-flask-fix-runtime-python-modules-depe.patch
deleted file mode 100644
index 1bb5ad8d5..000000000
--- a/patches/buildroot/2020.02/245-package-python-flask-fix-runtime-python-modules-depe.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6576d26024f40647a15633b52a2a27c5779801e5 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps....@gm...>
-Date: Sun, 22 Mar 2020 22:39:25 +0100
-Subject: [PATCH 3/3] package/python-flask: fix runtime python modules
- dependencies
-
-- add python setuptools runtime dependency, fixes:
- ModuleNotFoundError: No module named 'pkg_resources'
-
-- add python libxml2 runtime dependency, fixes:
- ModuleNotFoundError: No module named 'xml'
-
-- add python ssl runtime dependency, fixes:
- AttributeError: 'NoneType' object has no attribute 'SSLContext'
-
-Signed-off-by: Peter Seiderer <ps....@gm...>
-Signed-off-by: Thomas Petazzoni <tho...@bo...>
----
- package/python-flask/Config.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in
-index 6f77913ed1..72fcb61999 100644
---- a/package/python-flask/Config.in
-+++ b/package/python-flask/Config.in
-@@ -2,8 +2,12 @@ config BR2_PACKAGE_PYTHON_FLASK
- bool "python-flask"
- select BR2_PACKAGE_PYTHON_CLICK # runtime
- select BR2_PACKAGE_PYTHON_JINJA2 # runtime
-+ select BR2_PACKAGE_PYTHON_LXML # runtime
- select BR2_PACKAGE_PYTHON_WERKZEUG # runtime
- select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime
-+ select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
-+ select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON
-+ select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3
- select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
- select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
- help
---
-2.24.1
-
diff --git a/patches/buildroot/2020.02/246-package-python-flask-update-homepage-URL.patch b/patches/buildroot/2020.02/246-package-python-flask-update-homepage-URL.patch
deleted file mode 100644
index 68f7861d7..000000000
--- a/patches/buildroot/2020.02/246-package-python-flask-update-homepage-URL.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3572176dcdd7b653a1948fc3fe2b672b2fa55f99 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps....@gm...>
-Date: Wed, 8 Apr 2020 22:48:25 +0200
-Subject: [PATCH 1/2] package/python-flask: update homepage URL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Peter Seiderer <ps....@gm...>
-Reviewed-by: Sébastien Szymanski <seb...@ar...>
-Signed-off-by: Thomas Petazzoni <tho...@bo...>
----
- package/python-flask/Config.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in
-index 556afab6d2..0e5b64ce59 100644
---- a/package/python-flask/Config.in
-+++ b/package/python-flask/Config.in
-@@ -13,4 +13,4 @@ config BR2_PACKAGE_PYTHON_FLASK
- Flask is a microframework for Python based on Werkzeug,
- Jinja 2 and good intentions.
-
-- http://flask.pocoo.org/
-+ https://palletsprojects.com/p/flask
---
-2.24.1
-
diff --git a/patches/buildroot/2020.02/247-package-python-flask-bump-version-to-1.1.2.patch b/patches/buildroot/2020.02/247-package-python-flask-bump-version-to-1.1.2.patch
deleted file mode 100644
index 7ba951ba0..000000000
--- a/patches/buildroot/2020.02/247-package-python-flask-bump-version-to-1.1.2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 196109cb63885c5d85f284cbb00254c02b71ec0b Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps....@gm...>
-Date: Wed, 8 Apr 2020 22:48:26 +0200
-Subject: [PATCH 2/2] package/python-flask: bump version to 1.1.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Peter Seiderer <ps....@gm...>
-Reviewed-by: Sébastien Szymanski <seb...@ar...>
-Signed-off-by: Thomas Petazzoni <tho...@bo...>
----
- package/python-flask/python-flask.hash | 9 +++++----
- package/python-flask/python-flask.mk | 4 ++--
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash
-index 24f68c6605..c6ccd633f8 100644
---- a/package/python-flask/python-flask.hash
-+++ b/package/python-flask/python-flask.hash
-@@ -1,6 +1,7 @@
--# md5, sha256 from https://pypi.org/pypi/flask/json
--md5 0e3ed44ece1c489ed835d1b7047e349c Flask-1.1.1.tar.gz
--sha256 13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52 Flask-1.1.1.tar.gz
--# Locally computed sha256 checksums
-+# From https://pypi.org/project/Flask/#copy-hash-modal-911ffb67-fe84-4e25-a1a9-f4c745a0a980
-+md5 0da4145d172993cd28a6c619630cc19c Flask-1.1.2.tar.gz
-+sha256 4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060 Flask-1.1.2.tar.gz
-+
-+# License files
- sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst
- sha256 0ef3ae025f4a398761079f0d687ff3d66f4fef3a32ac2607318e909c0cba9150 docs/license.rst
-diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk
-index 0cd1a18018..cc39bf7e49 100644
---- a/package/python-flask/python-flask.mk
-+++ b/package/python-flask/python-flask.mk
-@@ -4,9 +4,9 @@
- #
- ################################################################################
-
--PYTHON_FLASK_VERSION = 1.1.1
-+PYTHON_FLASK_VERSION = 1.1.2
- PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz
--PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/2e/80/3726a729de758513fd3dbc64e93098eb009c49305a97c6751de55b20b694
-+PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/4e/0b/cb02268c90e67545a0e3a37ea1ca3d45de3aca43ceb7dbf1712fb5127d5d
- PYTHON_FLASK_SETUP_TYPE = setuptools
- PYTHON_FLASK_LICENSE = BSD-3-Clause
- PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst
---
-2.24.1
-
diff --git a/patches/buildroot/2020.02/343-package-evtest-switch-to-Gitlab.patch b/patches/buildroot/2020.02/343-package-evtest-switch-to-Gitlab.patch
deleted file mode 100644
index 8fe81b828..000000000
--- a/patches/buildroot/2020.02/343-package-evtest-switch-to-Gitlab.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 39f1c6cc28f0e168715a7b059013d104f1504866 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Wed, 22 Apr 2020 11:26:03 +0200
-Subject: [PATCH 1/1] package/evtest: switch to Gitlab
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Downloading from the cgit repo is now broken and it is a mirror of the
-Gitlab repo so use the Gitlab repo.
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- package/evtest/Config.in | 2 +-
- package/evtest/evtest.hash | 2 +-
- package/evtest/evtest.mk | 3 ++-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/package/evtest/Config.in b/package/evtest/Config.in
-index 1087217ee4..e74bac02fd 100644
---- a/package/evtest/Config.in
-+++ b/package/evtest/Config.in
-@@ -6,4 +6,4 @@ config BR2_PACKAGE_EVTEST
- device. It then monitors the device and displays all the
- events layer events generated.
-
-- http://cgit.freedesktop.org/evtest
-+ https://gitlab.freedesktop.org/libevdev/evtest
-diff --git a/package/evtest/evtest.hash b/package/evtest/evtest.hash
-index 566d423fcd..b1ee24371e 100644
---- a/package/evtest/evtest.hash
-+++ b/package/evtest/evtest.hash
-@@ -1,5 +1,5 @@
- # locally computed
--sha256 73d5b604d57551418d282fedee3deae9f851afb3c355dccc87153364c046efd3 evtest-1.34.tar.gz
-+sha256 0e7a2eeff380af796e5e9b21b6f48fd706c58c931162c151c2c1074bdfeb85c6 evtest-evtest-1.34.tar.gz
-
- # License files
- sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
-diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk
-index d2fd01c2d9..8b8667e045 100644
---- a/package/evtest/evtest.mk
-+++ b/package/evtest/evtest.mk
-@@ -5,7 +5,8 @@
- ################################################################################
-
- EVTEST_VERSION = 1.34
--EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot
-+EVTEST_SOURCE = evtest-evtest-$(EVTEST_VERSION).tar.gz
-+EVTEST_SITE = https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-$(EVTEST_VERSION)
- EVTEST_LICENSE = GPL-2.0+
- EVTEST_LICENSE_FILES = COPYING
- EVTEST_DEPENDENCIES = host-pkgconf
---
-2.25.3
-
hooks/post-receive
--
armadeus
|