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,38 @@
|
||||
From 6bd18b0b7b4d916e474ba84707eb784a643b3e71 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 23 Feb 2020 16:23:20 +0100
|
||||
Subject: [PATCH] configure.ac: fix stack-protector detection
|
||||
|
||||
Use AC_LINK_IFELSE instead of AC_COMPILE_IFELSE to check for
|
||||
stack-protector availability as some compilers could missed the needed
|
||||
library (-lssp or -lssp_nonshared) at linking step:
|
||||
|
||||
/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/x86_64-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wformat=2 -fstack-protector-strong -o smartctl smartctl.o atacmdnames.o atacmds.o ataidentify.o ataprint.o dev_ata_cmd_set.o dev_intelliprop.o dev_interface.o dev_jmb39x_raid.o json.o knowndrives.o nvmecmds.o nvmeprint.o scsicmds.o scsiata.o scsinvme.o scsiprint.o utility.o os_linux.o cciss.o dev_areca.o -lselinux
|
||||
/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared
|
||||
/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/0de9f2a69fa2a39164211299f8a429d2fec6935a
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://www.smartmontools.org/ticket/1302]
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 87470d8a..ccb457e1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -770,7 +770,7 @@ if test "$GXX" = "yes"; then
|
||||
AC_MSG_CHECKING([whether $CXX supports $option])
|
||||
save_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS $option"
|
||||
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [res=yes], [res=no; CXXFLAGS=$save_CXXFLAGS])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()], [res=yes], [res=no; CXXFLAGS=$save_CXXFLAGS])
|
||||
AC_MSG_RESULT([$res])
|
||||
done
|
||||
else
|
||||
--
|
||||
2.25.0
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# From http://sourceforge.net/projects/smartmontools/files/smartmontools/6.5/
|
||||
md5 093aeec3f8f39fa9a37593c4012d3156 smartmontools-6.5.tar.gz
|
||||
sha1 7e788b429534a4ae627858fbcc826b93402cee7e smartmontools-6.5.tar.gz
|
||||
# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.1/
|
||||
md5 430cd5f64caa4524018b536e5ecd9c29 smartmontools-7.1.tar.gz
|
||||
sha1 207dc2b50cab1c6fba7bc248665fbbe3189374e1 smartmontools-7.1.tar.gz
|
||||
|
||||
# Locally computed
|
||||
sha256 3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846 smartmontools-7.1.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@@ -4,10 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SMARTMONTOOLS_VERSION = 6.5
|
||||
SMARTMONTOOLS_VERSION = 7.1
|
||||
SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
|
||||
SMARTMONTOOLS_LICENSE = GPL-2.0+
|
||||
SMARTMONTOOLS_LICENSE_FILES = COPYING
|
||||
# We're patching configure.ac
|
||||
SMARTMONTOOLS_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
|
||||
SMARTMONTOOLS_CONF_OPTS += --with-libcap-ng
|
||||
@@ -23,4 +25,11 @@ else
|
||||
SMARTMONTOOLS_CONF_OPTS += --without-selinux
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
SMARTMONTOOLS_CONF_OPTS += --with-libsystemd
|
||||
SMARTMONTOOLS_DEPENDENCIES += systemd
|
||||
else
|
||||
SMARTMONTOOLS_CONF_OPTS += --without-libsystemd
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user