Bump buildroot to 2020.11-rc1 (#985)
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
This commit is contained in:
Stefan Agner
@@ -1,49 +0,0 @@
|
||||
From cf3c8e6ac8c428151dc191510554b4ee2705958d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 30 Oct 2019 10:08:35 +0100
|
||||
Subject: [PATCH] gluon/languages.py: import escape from html instead of cgi
|
||||
|
||||
import escape from html and fallback on current import from cgi to fix
|
||||
the following build failure with python 3.8:
|
||||
|
||||
/home/buildroot/autobuild/run/instance-2/output-1/host/bin/python -c 'import os; os.chdir("/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2"); from gluon.main import save_password; save_password("web2py",8000)'
|
||||
Traceback (most recent call last):
|
||||
File "<string>", line 1, in <module>
|
||||
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/__init__.py", line 34, in <module>
|
||||
from .globals import current
|
||||
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/globals.py", line 24, in <module>
|
||||
from gluon.serializers import json, custom_json
|
||||
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/serializers.py", line 10, in <module>
|
||||
from gluon.languages import lazyT
|
||||
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/languages.py", line 19, in <module>
|
||||
from cgi import escape
|
||||
ImportError: cannot import name 'escape' from 'cgi' (/home/buildroot/autobuild/run/instance-2/output-1/host/lib/python3.8/cgi.py)
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/fa515627ae888d08fc10074e8d9f6e9dbede91a7
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/web2py/web2py/pull/2272]
|
||||
---
|
||||
gluon/languages.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gluon/languages.py b/gluon/languages.py
|
||||
index 9ed60f9c..554d7339 100644
|
||||
--- a/gluon/languages.py
|
||||
+++ b/gluon/languages.py
|
||||
@@ -16,7 +16,10 @@ import re
|
||||
import sys
|
||||
import pkgutil
|
||||
import logging
|
||||
-from cgi import escape
|
||||
+try:
|
||||
+ from html import escape
|
||||
+except ImportError:
|
||||
+ from cgi import escape
|
||||
from threading import RLock
|
||||
|
||||
from pydal._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes, iteritems, to_native, pjoin
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
config BR2_PACKAGE_PYTHON_WEB2PY
|
||||
bool "python-web2py"
|
||||
select BR2_PACKAGE_PYTHON_PYDAL
|
||||
select BR2_PACKAGE_PYTHON_PYDAL # runtime
|
||||
select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
|
||||
select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
|
||||
select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
|
||||
select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
|
||||
select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
|
||||
select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
|
||||
select BR2_PACKAGE_PYTHON_YATL # runtime
|
||||
help
|
||||
web2py is a free open source full-stack framework for rapid
|
||||
development of fast, scalable, secure and portable
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# sha256 locally computed
|
||||
sha256 8205a7a08595ca1a41919750a8dc4e431258966cb46c8021564b25003cf90863 python-web2py-2.17.2.tar.gz
|
||||
sha256 e3f05266b4b97650b76bfb85028df5e2194955674c9b98cfc065c72ed5791690 python-web2py-2.20.4.tar.gz
|
||||
sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_WEB2PY_VERSION = 2.17.2
|
||||
PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,R-$(PYTHON_WEB2PY_VERSION))
|
||||
PYTHON_WEB2PY_VERSION = 2.20.4
|
||||
PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION))
|
||||
PYTHON_WEB2PY_LICENSE = LGPL-3.0
|
||||
PYTHON_WEB2PY_LICENSE_FILES = LICENSE
|
||||
PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \
|
||||
python-pydal host-python-pydal
|
||||
host-python-pydal host-python-yatl
|
||||
|
||||
PYTHON_WEB2PY_EXCLUSIONS = \
|
||||
welcome.w2p \
|
||||
|
||||
Reference in New Issue
Block a user