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:
@@ -1,35 +0,0 @@
|
||||
From 322b415f92d4dcd36824eef83bd617bac6e5c8c7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 24 Dec 2019 16:38:35 +0100
|
||||
Subject: [PATCH] librsvg.pc.in: add libcroco to Requires.private
|
||||
|
||||
libcroco is a mandatory dependency since version 2.35.0 so add it to
|
||||
Requires.Private to fix a static build failure with imagemagick
|
||||
|
||||
This patch is not upstreamable as librsvg no longer depends on libcroco
|
||||
since version 2.47.1. It now does all CSS processing using Rust crates
|
||||
from Mozilla Servo.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/42f4b4881569779162d3efe4628b934f965913b9
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
librsvg.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/librsvg.pc.in b/librsvg.pc.in
|
||||
index a451de05..4b09984a 100644
|
||||
--- a/librsvg.pc.in
|
||||
+++ b/librsvg.pc.in
|
||||
@@ -10,6 +10,6 @@ Name: librsvg
|
||||
Description: library that renders svg files
|
||||
Version: @VERSION@
|
||||
Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo
|
||||
-Requires.private:
|
||||
+Requires.private: libcroco-0.6
|
||||
Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
|
||||
Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_LIBRSVG
|
||||
bool "librsvg"
|
||||
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
||||
depends on BR2_USE_MMU # glib2
|
||||
@@ -8,8 +9,9 @@ config BR2_PACKAGE_LIBRSVG
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz
|
||||
select BR2_PACKAGE_CAIRO
|
||||
select BR2_PACKAGE_CAIRO_PNG
|
||||
select BR2_PACKAGE_CAIRO_SCRIPT
|
||||
select BR2_PACKAGE_GDK_PIXBUF
|
||||
select BR2_PACKAGE_LIBCROCO
|
||||
select BR2_PACKAGE_HOST_RUSTC
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
select BR2_PACKAGE_PANGO
|
||||
@@ -20,6 +22,7 @@ config BR2_PACKAGE_LIBRSVG
|
||||
https://wiki.gnome.org/Projects/LibRsvg
|
||||
|
||||
comment "librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.8"
|
||||
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.20.sha256sum
|
||||
sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b librsvg-2.40.20.tar.xz
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.0.sha256sum
|
||||
sha256 b3fadba240f09b9c9898ab20cb7311467243e607cf8f928b7c5f842474ee3df4 librsvg-2.50.0.tar.xz
|
||||
|
||||
# Locally computed
|
||||
sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
|
||||
@@ -4,20 +4,28 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBRSVG_VERSION_MAJOR = 2.40
|
||||
LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).20
|
||||
LIBRSVG_VERSION_MAJOR = 2.50
|
||||
LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).0
|
||||
LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
|
||||
LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz
|
||||
LIBRSVG_INSTALL_STAGING = YES
|
||||
LIBRSVG_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
|
||||
LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools --enable-introspection=no
|
||||
LIBRSVG_CONF_ENV = \
|
||||
LIBS=$(TARGET_NLS_LIBS) \
|
||||
RUST_TARGET=$(RUSTC_TARGET_NAME)
|
||||
LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools
|
||||
HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no
|
||||
LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \
|
||||
$(if $(BR2_PACKAGE_LIBGTK3),libgtk3) \
|
||||
LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf host-rustc libglib2 libxml2 pango \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango
|
||||
LIBRSVG_LICENSE = LGPL-2.0+
|
||||
HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml2 host-pango host-rustc
|
||||
LIBRSVG_LICENSE = LGPL-2.1+
|
||||
LIBRSVG_LICENSE_FILES = COPYING.LIB
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
|
||||
LIBRSVG_CONF_OPTS += --enable-introspection
|
||||
LIBRSVG_DEPENDENCIES += gobject-introspection
|
||||
else
|
||||
LIBRSVG_CONF_OPTS += --disable-introspection
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user