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
@@ -1,45 +0,0 @@
|
||||
From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001
|
||||
From: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
Date: Sun, 8 Dec 2019 01:55:59 +0100
|
||||
Subject: [PATCH] Allow avro C to be built on musl based systems.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The type `ssize_t` is defined in sys/types.h, and nowhere else
|
||||
in the musl standard C library, so it should be included for the
|
||||
compilation to succeed.
|
||||
|
||||
This fixes several errors like:
|
||||
|
||||
In file included from src/generic.c:29:0:
|
||||
src/generic.c: In function ‘avro_generic_value_new’:
|
||||
src/avro_generic_internal.h:63:39:
|
||||
error: ‘ssize_t’ undeclared (first use in this function);
|
||||
did you mean ‘size_t’?
|
||||
|
||||
Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
[yann.morin.1998@free.fr:
|
||||
- backported from upstream 9b39a98, adapted to the release tarball
|
||||
]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
src/avro_generic_internal.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/avro_generic_internal.h b/src/avro_generic_internal.h
|
||||
index 709403c0..9843ed65 100644
|
||||
--- a/src/avro_generic_internal.h
|
||||
+++ b/src/avro_generic_internal.h
|
||||
@@ -24,6 +24,8 @@ extern "C" {
|
||||
#define CLOSE_EXTERN
|
||||
#endif
|
||||
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
#include "avro/generic.h"
|
||||
#include "avro/schema.h"
|
||||
#include "avro/value.h"
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 8f5633a29b083a84876c00b88fba6d3e8dbbf1a8 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 19 Jul 2020 09:35:09 +0200
|
||||
Subject: [PATCH] cmake: Build failure without a C++ compiler (again)
|
||||
|
||||
avro-c fails to build (again) without a C++ compiler because commit
|
||||
664c2fc7fba19709c1f974055f9cf4c8a799e108 reverted the change made by
|
||||
commit 414a51fdc1856083bb16851f09a4c61a48796132
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/cfa91db53cf5502cbb6f902d1e7ad6397c8d70fd
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://issues.apache.org/jira/browse/AVRO-2898]
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6c8d7aaf..aa923e18 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -17,7 +17,7 @@
|
||||
# under the License.
|
||||
#
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
-project(AvroC)
|
||||
+project(AvroC C)
|
||||
enable_testing()
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
From cdab7db8ad81884cfb21cc1cf94c981c59d17ef4 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 30 Dec 2019 12:32:20 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: fix build without C++
|
||||
|
||||
Specify that AvroC is a C project and remove tests_cpp.cpp to avoid the
|
||||
following build failure if a C++ compiler is not found:
|
||||
|
||||
CMake Error at CMakeLists.txt:20 (project):
|
||||
The CMAKE_CXX_COMPILER:
|
||||
|
||||
/home/naourr/work/instance-2/output-1/host/bin/microblazeel-buildroot-linux-uclibc-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.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/135e246aa70f28c6b9aea5fd6b0eb9c7b45ebfe7
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/apache/avro/pull/754]
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
tests/CMakeLists.txt | 1 -
|
||||
tests/test_cpp.cpp | 27 ---------------------------
|
||||
3 files changed, 1 insertion(+), 29 deletions(-)
|
||||
delete mode 100644 lang/c/tests/test_cpp.cpp
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 11cbf018..b75418c3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -17,7 +17,7 @@
|
||||
# under the License.
|
||||
#
|
||||
cmake_minimum_required(VERSION 2.4)
|
||||
-project(AvroC)
|
||||
+project(AvroC C)
|
||||
enable_testing()
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index b9e8fe1d..2e84a06a 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -81,7 +81,6 @@ add_avro_test_checkmem(test_avro_1405)
|
||||
add_avro_test_checkmem(test_avro_1572)
|
||||
add_avro_test(test_avro_data) # Skip memory check for datum. Deprecated and has a lot of memory issues
|
||||
add_avro_test_checkmem(test_refcount)
|
||||
-add_avro_test_checkmem(test_cpp test_cpp.cpp)
|
||||
add_avro_test_checkmem(test_avro_1379)
|
||||
add_avro_test_checkmem(test_avro_1691)
|
||||
add_avro_test_checkmem(test_avro_1906)
|
||||
diff --git a/lang/c/tests/test_cpp.cpp b/lang/c/tests/test_cpp.cpp
|
||||
deleted file mode 100644
|
||||
index 13f98a9b..00000000
|
||||
--- a/tests/test_cpp.cpp
|
||||
+++ /dev/null
|
||||
@@ -1,27 +0,0 @@
|
||||
-/*
|
||||
- * Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
- * contributor license agreements. See the NOTICE file distributed with
|
||||
- * this work for additional information regarding copyright ownership.
|
||||
- * The ASF licenses this file to you under the Apache License, Version 2.0
|
||||
- * (the "License"); you may not use this file except in compliance with
|
||||
- * the License. You may obtain a copy of the License at
|
||||
- *
|
||||
- * https://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
- * implied. See the License for the specific language governing
|
||||
- * permissions and limitations under the License.
|
||||
- */
|
||||
-
|
||||
-#include "avro.h"
|
||||
-
|
||||
-int main(int argc, char **argv)
|
||||
-{
|
||||
- (void)argc;
|
||||
- (void)argv;
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www-eu.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz.sha512
|
||||
sha512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904 avro-c-1.9.1.tar.gz
|
||||
# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512
|
||||
sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE
|
||||
sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AVRO_C_VERSION = 1.9.1
|
||||
AVRO_C_VERSION = 1.10.0
|
||||
AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c
|
||||
AVRO_C_LICENSE = Apache-2.0
|
||||
AVRO_C_LICENSE_FILES = LICENSE
|
||||
|
||||
Reference in New Issue
Block a user