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,47 @@
|
||||
From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 29 Aug 2020 23:19:26 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: do not force SHARED
|
||||
|
||||
Allow the user to build static libraries by removing SHARED from
|
||||
ADD_LIBRARY calls.
|
||||
|
||||
Here is an extract of
|
||||
https://cmake.org/cmake/help/latest/command/add_library.html:
|
||||
|
||||
"If no type is given explicitly the type is STATIC or SHARED based on
|
||||
whether the current value of the variable BUILD_SHARED_LIBS is ON."
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: probably not upstreamable as is because it will
|
||||
conflict with https://github.com/redis/hiredis/pull/851. So, this patch
|
||||
will probably have to be reworked for 1.0.x]
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1beccc6..fed79fd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -40,7 +40,7 @@ IF(WIN32)
|
||||
ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN)
|
||||
ENDIF()
|
||||
|
||||
-ADD_LIBRARY(hiredis SHARED ${hiredis_sources})
|
||||
+ADD_LIBRARY(hiredis ${hiredis_sources})
|
||||
|
||||
SET_TARGET_PROPERTIES(hiredis
|
||||
PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE
|
||||
@@ -97,7 +97,7 @@ IF(ENABLE_SSL)
|
||||
FIND_PACKAGE(OpenSSL REQUIRED)
|
||||
SET(hiredis_ssl_sources
|
||||
ssl.c)
|
||||
- ADD_LIBRARY(hiredis_ssl SHARED
|
||||
+ ADD_LIBRARY(hiredis_ssl
|
||||
${hiredis_ssl_sources})
|
||||
|
||||
IF (APPLE)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 5 Sep 2020 12:54:21 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler
|
||||
|
||||
Define hiredis as a C project (and use a single PROJECT statement) to
|
||||
avoid the following build failure if a C++ compiler is not found:
|
||||
|
||||
CMake Error at CMakeLists.txt:3 (PROJECT):
|
||||
The CMAKE_CXX_COMPILER:
|
||||
|
||||
/srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++
|
||||
|
||||
is not a full path to an existing compiler tool.
|
||||
|
||||
Tell CMake where to find the compiler by setting either the environment
|
||||
variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path
|
||||
to the compiler, or to the compiler name if it is in the PATH.
|
||||
|
||||
The only cpp source file is examples/example-qt.cpp which is never
|
||||
compiled with cmake buildsystem. This file is compiled only with the
|
||||
Makefile buildsystem so perhaps it should be removed. If it is added to
|
||||
the cmake buildsystem, a call to enable_language(CXX) will have to be
|
||||
added.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/redis/hiredis/pull/872]
|
||||
---
|
||||
CMakeLists.txt | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4cbd438..9d65b7f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,6 +1,5 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0)
|
||||
INCLUDE(GNUInstallDirs)
|
||||
-PROJECT(hiredis)
|
||||
|
||||
OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF)
|
||||
OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF)
|
||||
@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME)
|
||||
SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}")
|
||||
MESSAGE("Detected version: ${VERSION}")
|
||||
|
||||
-PROJECT(hiredis VERSION "${VERSION}")
|
||||
+PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}")
|
||||
|
||||
# Hiredis requires C99
|
||||
SET(CMAKE_C_STANDARD 99)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 13a35bdb64615e381c5e1151cdd4e78bba71a6db Mon Sep 17 00:00:00 2001
|
||||
From: michael-grunder <michael.grunder@gmail.com>
|
||||
Date: Fri, 28 Aug 2020 12:35:01 -0700
|
||||
Subject: [PATCH] Explicitly set c99 in CMake
|
||||
|
||||
See #869
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1beccc69a..4cbd438d7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -22,6 +22,9 @@ MESSAGE("Detected version: ${VERSION}")
|
||||
|
||||
PROJECT(hiredis VERSION "${VERSION}")
|
||||
|
||||
+# Hiredis requires C99
|
||||
+SET(CMAKE_C_STANDARD 99)
|
||||
+
|
||||
SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples")
|
||||
|
||||
SET(hiredis_sources
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 2663b2aed9fd430507e30fc5e63274ee40cdd1a296026e22eafd7d99b01c8913 hiredis-0.14.1.tar.gz
|
||||
sha256 2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f hiredis-1.0.0.tar.gz
|
||||
sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING
|
||||
|
||||
@@ -4,66 +4,19 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HIREDIS_VERSION_MAJOR = 0.14
|
||||
HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).1
|
||||
HIREDIS_VERSION_MAJOR = 1.0
|
||||
HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0
|
||||
HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION))
|
||||
HIREDIS_LICENSE = BSD-3-Clause
|
||||
HIREDIS_LICENSE_FILES = COPYING
|
||||
HIREDIS_INSTALL_STAGING = YES
|
||||
HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON
|
||||
|
||||
HIREDIS_MAKE_OPTS = \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
PREFIX=/usr
|
||||
|
||||
HIREDIS_TARGETS = hiredis.pc
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
HIREDIS_TARGETS += static
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
HIREDIS_TARGETS += dynamic
|
||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
HIREDIS_TARGETS += dynamic static
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
HIREDIS_CONF_OPTS += -DENABLE_SSL=ON
|
||||
HIREDIS_DEPENDENCIES += openssl
|
||||
else
|
||||
HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF
|
||||
endif
|
||||
|
||||
define HIREDIS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(HIREDIS_MAKE_OPTS) -C $(@D) \
|
||||
$(HIREDIS_TARGETS)
|
||||
endef
|
||||
|
||||
HIREDIS_INCLUDE_DIR = $(STAGING_DIR)/usr/include/hiredis
|
||||
|
||||
ifeq ($(BR2_SHARED_LIBS),)
|
||||
define HIREDIS_INSTALL_STAGING_STATIC_LIB
|
||||
$(INSTALL) -D -m 0755 $(@D)/libhiredis.a \
|
||||
$(STAGING_DIR)/usr/lib/libhiredis.a
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
define HIREDIS_INSTALL_STAGING_SHARED_LIB
|
||||
$(INSTALL) -D -m 0755 $(@D)/libhiredis.so \
|
||||
$(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
|
||||
ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(STAGING_DIR)/usr/lib/libhiredis.so
|
||||
endef
|
||||
define HIREDIS_INSTALL_TARGET_SHARED_LIB
|
||||
$(INSTALL) -D -m 0755 $(@D)/libhiredis.so \
|
||||
$(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
|
||||
ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(TARGET_DIR)/usr/lib/libhiredis.so
|
||||
endef
|
||||
endif
|
||||
|
||||
# Do not call make install as this target will build shared and static libraries
|
||||
define HIREDIS_INSTALL_STAGING_CMDS
|
||||
mkdir -p $(HIREDIS_INCLUDE_DIR)
|
||||
cp -dpfr $(@D)/hiredis.h $(@D)/async.h $(@D)/read.h $(@D)/sds.h \
|
||||
$(@D)/alloc.h $(@D)/adapters $(HIREDIS_INCLUDE_DIR)
|
||||
$(INSTALL) -D -m 0644 $(@D)/hiredis.pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc
|
||||
$(HIREDIS_INSTALL_STAGING_STATIC_LIB)
|
||||
$(HIREDIS_INSTALL_STAGING_SHARED_LIB)
|
||||
endef
|
||||
|
||||
define HIREDIS_INSTALL_TARGET_CMDS
|
||||
$(HIREDIS_INSTALL_TARGET_SHARED_LIB)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user