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
@@ -0,0 +1,43 @@
|
||||
From 10707f437f2fc3632067c6a0efa4432f7ebaf362 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Dröge <sebastian@centricular.com>
|
||||
Date: Fri, 13 Dec 2019 10:46:20 +0200
|
||||
Subject: [PATCH] backport of "fix build with Python 3.8 by also checking for
|
||||
python-3.X-embed.pc"
|
||||
|
||||
Since Python 3.8 the normal checks don't include the Python libraries
|
||||
anymore and linking of the gst-python module would fail.
|
||||
|
||||
See also https://github.com/mesonbuild/meson/issues/5629
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
|
||||
|
||||
Upstream commit: 22f28155d86e27c4134de4ed2861264003fcfd23
|
||||
|
||||
Signed-off-by: Sebastian Dröge <sebastian@centricular.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
meson.build | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 744b7ce..492af1a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -25,6 +25,14 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
|
||||
pymod = import('python')
|
||||
python = pymod.find_installation(get_option('python'))
|
||||
python_dep = python.dependency(required : true)
|
||||
+pythonver = python.language_version()
|
||||
+
|
||||
+# Workaround for https://github.com/mesonbuild/meson/issues/5629
|
||||
+# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
|
||||
+python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false)
|
||||
+if not python_dep.found()
|
||||
+ python_dep = python.dependency(required : true)
|
||||
+endif
|
||||
|
||||
python_abi_flags = python.get_variable('ABIFLAGS', '')
|
||||
pylib_loc = get_option('libpython-dir')
|
||||
--
|
||||
2.24.1
|
||||
|
||||
24
buildroot/package/gstreamer1/gst1-python/Config.in
Normal file
24
buildroot/package/gstreamer1/gst1-python/Config.in
Normal file
@@ -0,0 +1,24 @@
|
||||
config BR2_PACKAGE_GST1_PYTHON
|
||||
bool "gst1-python"
|
||||
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
|
||||
select BR2_PACKAGE_PYTHON_GOBJECT
|
||||
help
|
||||
GStreamer python overrides for the gobject-introspection-based
|
||||
pygst bindings.
|
||||
|
||||
https://gstreamer.freedesktop.org/modules/gst-python.html
|
||||
|
||||
comment "gst1-python needs python3"
|
||||
depends on !BR2_PACKAGE_PYTHON3
|
||||
|
||||
comment "gst1-python needs a glibc toolchain, gcc >= 4.9"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
@@ -0,0 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz.sha256sum
|
||||
sha256 208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8 gst-python-1.16.2.tar.xz
|
||||
sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING
|
||||
38
buildroot/package/gstreamer1/gst1-python/gst1-python.mk
Normal file
38
buildroot/package/gstreamer1/gst1-python/gst1-python.mk
Normal file
@@ -0,0 +1,38 @@
|
||||
################################################################################
|
||||
#
|
||||
# gst1-python
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PYTHON_VERSION = 1.16.2
|
||||
GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz
|
||||
GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python
|
||||
GST1_PYTHON_INSTALL_STAGING = YES
|
||||
GST1_PYTHON_LICENSE_FILES = COPYING
|
||||
GST1_PYTHON_LICENSE = LGPL-2.1+
|
||||
|
||||
GST1_PYTHON_DEPENDENCIES = \
|
||||
gstreamer1 \
|
||||
python-gobject
|
||||
|
||||
# A sysconfigdata_name must be manually specified or the resulting .so
|
||||
# will have a x86_64 prefix, which causes "from gi.repository import Gst"
|
||||
# to fail. A pythonpath must be specified or the host python path will be
|
||||
# used resulting in a "not a valid python" error.
|
||||
GST1_PYTHON_CONF_ENV += \
|
||||
_PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \
|
||||
PYTHONPATH=$(PYTHON3_PATH)
|
||||
|
||||
# Due to the CONF_ENV options, libpython-dir must be set manually
|
||||
# or else the error: "Python dynamic library path could not be determined"
|
||||
# occurs. We set the libpython-dir to /usr/lib as this path is hard-coded
|
||||
# into the resulting .so file as /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so.
|
||||
# Because we provide PYTHONPATH=$(PYTHON3_PATH) above, the logic in the meson
|
||||
# file uses the above python path to determine if /usr/lib/ has the proper .so
|
||||
# file. Because Buildroot provides the appropriate paths, the meson file finds
|
||||
# the correct .so file, and the resulting compiled library has the appropriate
|
||||
# path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so
|
||||
GST1_PYTHON_CONF_OPTS += \
|
||||
-Dlibpython-dir=/usr/lib/
|
||||
|
||||
$(eval $(meson-package))
|
||||
Reference in New Issue
Block a user