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:
@@ -27,29 +27,28 @@ diff --git a/Makefile.am b/Makefile.am
|
||||
index 2ff444e7bf1d..70443abb4fb6 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -26,9 +26,13 @@ AM_MAKEFLAGS = --no-print-directory
|
||||
|
||||
@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory
|
||||
|
||||
pkginclude_HEADERS = version.h
|
||||
|
||||
|
||||
+if ENABLE_PROGS
|
||||
+PROGS_SUBDIR = src
|
||||
+endif
|
||||
+
|
||||
# Add doc back when we have some real content.
|
||||
SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
|
||||
- backends src po tests
|
||||
+ backends $(PROGS_SUBDIR) po tests
|
||||
|
||||
SUBDIRS = config m4 lib libelf libcpu backends libebl libdwelf libdwfl libdw \
|
||||
- libasm debuginfod src po doc tests
|
||||
+ libasm debuginfod $(PROGS_SUBDIR) po doc tests
|
||||
|
||||
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
|
||||
COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c2c1d90b2133..7b4c38381cca 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -345,6 +345,12 @@ AC_SUBST([LIBEBL_SUBDIR])
|
||||
AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
|
||||
AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
|
||||
|
||||
@@ -390,6 +390,12 @@
|
||||
[tests_use_rpath=$enableval], [tests_use_rpath=no])
|
||||
AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes)
|
||||
|
||||
+AC_ARG_ENABLE([progs],
|
||||
+ AS_HELP_STRING([--enable-progs], [enable progs]),
|
||||
+ enable_progs=$enableval,
|
||||
@@ -59,6 +58,6 @@ index c2c1d90b2133..7b4c38381cca 100644
|
||||
dnl zlib is mandatory.
|
||||
save_LIBS="$LIBS"
|
||||
LIBS=
|
||||
--
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library"
|
||||
comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads"
|
||||
depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
|
||||
|| !BR2_TOOLCHAIN_HAS_THREADS \
|
||||
|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
|
||||
|
||||
config BR2_PACKAGE_ELFUTILS
|
||||
bool "elfutils"
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# Only glibc and uClibc implement the myriad of required GNUisms
|
||||
depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC
|
||||
select BR2_PACKAGE_ZLIB
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
# From https://sourceware.org/elfutils/ftp/0.177/md5.sum
|
||||
md5 0b583722f911e1632544718d502aab87 elfutils-0.177.tar.bz2
|
||||
# From https://sourceware.org/elfutils/ftp/0.177/sha512.sum
|
||||
sha512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f elfutils-0.177.tar.bz2
|
||||
# From https://sourceware.org/elfutils/ftp/0.181/sha512.sum
|
||||
sha512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36 elfutils-0.181.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ELFUTILS_VERSION = 0.177
|
||||
ELFUTILS_VERSION = 0.181
|
||||
ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
|
||||
ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION)
|
||||
ELFUTILS_INSTALL_STAGING = YES
|
||||
ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library)
|
||||
ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
ELFUTILS_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES)
|
||||
HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz
|
||||
ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES)
|
||||
HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz
|
||||
|
||||
# We patch configure.ac
|
||||
ELFUTILS_AUTORECONF = YES
|
||||
@@ -48,6 +48,10 @@ ELFUTILS_DEPENDENCIES += musl-fts
|
||||
ELFUTILS_LDFLAGS += -lfts
|
||||
endif
|
||||
|
||||
# disable for now, needs "distro" support
|
||||
ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod
|
||||
HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod
|
||||
|
||||
ELFUTILS_CONF_ENV += \
|
||||
LDFLAGS="$(ELFUTILS_LDFLAGS)"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user