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,32 +0,0 @@
|
||||
[PATCH] m4/python.m4: add PYTHON_INCLUDES override for cross compilation
|
||||
|
||||
As the configure script mixes up host/target python. Equivalent to the
|
||||
similar code in dbus-python.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
m4/python.m4 | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
Index: python-gobject-2.28.6/m4/python.m4
|
||||
===================================================================
|
||||
--- python-gobject-2.28.6.orig/m4/python.m4
|
||||
+++ python-gobject-2.28.6/m4/python.m4
|
||||
@@ -43,6 +43,9 @@
|
||||
[AC_REQUIRE([AM_PATH_PYTHON])
|
||||
AC_MSG_CHECKING(for headers required to compile python extensions)
|
||||
dnl deduce PYTHON_INCLUDES
|
||||
+if test "${PYTHON_INCLUDES+set}" = set; then
|
||||
+ AC_MSG_NOTICE([PYTHON_INCLUDES overridden to: $PYTHON_INCLUDES])
|
||||
+else
|
||||
py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
|
||||
py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
|
||||
PYTHON_CONFIG=`which $PYTHON`-config
|
||||
@@ -54,6 +57,7 @@
|
||||
PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
|
||||
fi
|
||||
fi
|
||||
+fi
|
||||
AC_SUBST(PYTHON_INCLUDES)
|
||||
dnl check if the headers exist:
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
@@ -1,16 +1,19 @@
|
||||
config BR2_PACKAGE_PYTHON_GOBJECT
|
||||
bool "python-gobject"
|
||||
depends on BR2_USE_WCHAR # libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
||||
depends on BR2_USE_MMU # libglib2
|
||||
depends on BR2_PACKAGE_PYTHON # Broken with python 3.8
|
||||
depends on BR2_USE_MMU # libglib2, gobject-introspection
|
||||
depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection
|
||||
depends on BR2_PACKAGE_PYTHON3 # gobject-introspection
|
||||
select BR2_PACKAGE_GOBJECT_INTROSPECTION
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
help
|
||||
Python bindings for the GLib/GObject library
|
||||
|
||||
https://wiki.gnome.org/action/show/Projects/PyGObject
|
||||
|
||||
comment "python-gobject needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_PACKAGE_PYTHON
|
||||
comment "python-gobject needs a glibc toolchain, gcc >= 4.9"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.6.sha256sum
|
||||
sha256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 pygobject-2.28.6.tar.xz
|
||||
# Locally computed
|
||||
# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.36/pygobject-3.36.1.sha256sum
|
||||
sha256 d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f pygobject-3.36.1.tar.xz
|
||||
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
|
||||
|
||||
@@ -4,36 +4,29 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_GOBJECT_VERSION_MAJOR = 2.28
|
||||
PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).6
|
||||
PYTHON_GOBJECT_VERSION_MAJOR = 3.36
|
||||
PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).1
|
||||
PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz
|
||||
PYTHON_GOBJECT_SITE = http://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR)
|
||||
PYTHON_GOBJECT_SITE = https://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR)
|
||||
PYTHON_GOBJECT_LICENSE = LGPL-2.1+
|
||||
PYTHON_GOBJECT_LICENSE_FILES = COPYING
|
||||
PYTHON_GOBJECT_DEPENDENCIES = host-pkgconf libglib2
|
||||
PYTHON_GOBJECT_CONF_OPTS = --disable-introspection
|
||||
# for 0001-add-PYTHON_INCLUDES-override.patch
|
||||
PYTHON_GOBJECT_AUTORECONF = YES
|
||||
PYTHON_GOBJECT_INSTALL_STAGING = YES
|
||||
PYTHON_GOBJECT_DEPENDENCIES = \
|
||||
gobject-introspection \
|
||||
host-pkgconf \
|
||||
libglib2 \
|
||||
python3
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
PYTHON_GOBJECT_DEPENDENCIES += python host-python
|
||||
PYTHON_GOBJECT_CONF_OPTS += \
|
||||
-Dpycairo=false \
|
||||
-Dtests=false
|
||||
|
||||
PYTHON_GOBJECT_CONF_ENV = \
|
||||
PYTHON=$(HOST_DIR)/bin/python2 \
|
||||
PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`"
|
||||
else
|
||||
PYTHON_GOBJECT_DEPENDENCIES += python3 host-python3
|
||||
# A sysconfigdata_name must be manually specified or the resulting .so
|
||||
# will have a x86_64 prefix, which causes "import gi" to fail.
|
||||
# A pythonpath must be specified or the host python path will be used resulting
|
||||
# in a "not a valid python" error.
|
||||
PYTHON_GOBJECT_CONF_ENV += \
|
||||
_PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \
|
||||
PYTHONPATH=$(PYTHON3_PATH)
|
||||
|
||||
PYTHON_GOBJECT_CONF_ENV = \
|
||||
PYTHON=$(HOST_DIR)/bin/python3 \
|
||||
PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBFFI),y)
|
||||
PYTHON_GOBJECT_CONF_OPTS += --with-ffi
|
||||
PYTHON_GOBJECT_DEPENDENCIES += libffi
|
||||
else
|
||||
PYTHON_GOBJECT_CONF_OPTS += --without-ffi
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(meson-package))
|
||||
|
||||
Reference in New Issue
Block a user