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,38 +0,0 @@
|
||||
From 754897490d9478025d174c2b1c1849305f728324 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Mon, 28 Dec 2015 12:13:07 +0100
|
||||
Subject: [PATCH] libsecret.pc: add Libs.private field for libgcrypt
|
||||
|
||||
When libgcrypt is available, libsecret links with it. When dynamic
|
||||
linking is used, there is no problem: libsecret.so has a NEEDED
|
||||
pointing to libgcrypt, so linking an application with -lsecret works
|
||||
fine. However, when doing static linking, you must specify the entire
|
||||
chain of libraries, otherwise you get unresolved symbols errors, such
|
||||
as:
|
||||
|
||||
host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libsecret-1.a(libsecret_1_la-secret-session.o): In function `request_open_session_aes':
|
||||
build/libsecret-0.18.3/libsecret/secret-session.c:99: undefined reference to `gcry_mpi_release'
|
||||
build/libsecret-0.18.3/libsecret/secret-session.c:101: undefined reference to `gcry_mpi_aprint'
|
||||
build/libsecret-0.18.3/libsecret/secret-session.c:107: undefined reference to `gcry_free'
|
||||
|
||||
In order to solve this, we simply need to indicate in the Libs.private
|
||||
field of the .pc file that we depend on libgcrypt.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
libsecret/libsecret.pc.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libsecret/libsecret.pc.in b/libsecret/libsecret.pc.in
|
||||
index 0c342ef..d99cf44 100644
|
||||
--- a/libsecret/libsecret.pc.in
|
||||
+++ b/libsecret/libsecret.pc.in
|
||||
@@ -11,4 +11,5 @@ Description: GObject bindings for Secret Service API
|
||||
Version: @VERSION@
|
||||
Requires: glib-2.0 gobject-2.0 gio-2.0
|
||||
Libs: -L${libdir} -lsecret-@SECRET_MAJOR@
|
||||
+Libs.private: @LIBGCRYPT_LIBS@
|
||||
Cflags: -I${includedir}/libsecret-@SECRET_MAJOR@
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.8.sha256sum
|
||||
sha256 3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15 libsecret-0.18.8.tar.xz
|
||||
# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.3.sha256sum
|
||||
sha256 4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4 libsecret-0.20.3.tar.xz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING
|
||||
sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSECRET_VERSION_MAJOR = 0.18
|
||||
LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).8
|
||||
LIBSECRET_VERSION_MAJOR = 0.20
|
||||
LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).3
|
||||
LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR)
|
||||
LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz
|
||||
LIBSECRET_INSTALL_STAGING = YES
|
||||
@@ -15,11 +15,17 @@ LIBSECRET_CONF_OPTS = \
|
||||
--disable-manpages \
|
||||
--disable-strict \
|
||||
--disable-coverage \
|
||||
--enable-introspection=no \
|
||||
--enable-vala=no
|
||||
LIBSECRET_LICENSE = LGPL-2.1+
|
||||
LIBSECRET_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
|
||||
LIBSECRET_CONF_OPTS += --enable-introspection=yes
|
||||
LIBSECRET_DEPENDENCIES += gobject-introspection
|
||||
else
|
||||
LIBSECRET_CONF_OPTS += --enable-introspection=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
LIBSECRET_DEPENDENCIES += libgcrypt
|
||||
LIBSECRET_CONF_OPTS += --enable-gcrypt \
|
||||
|
||||
Reference in New Issue
Block a user