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,147 +0,0 @@
|
||||
From 6bc55ec35d02931960ec1f5768fc9c56ab62ef66 Mon Sep 17 00:00:00 2001
|
||||
From: David Seifert <16636962+SoapGentoo@users.noreply.github.com>
|
||||
Date: Tue, 7 Jan 2020 02:23:50 +0100
|
||||
Subject: [PATCH] Meson updates (#1124)
|
||||
|
||||
* Modernize meson.build
|
||||
|
||||
* Make tests optional
|
||||
* Use `files()` for quick sanity checks
|
||||
|
||||
* Bump version to 1.9.3
|
||||
|
||||
* Bump SOVERSION, as some functions were removed
|
||||
and structs were changed, as determined by
|
||||
libabigail.
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/open-source-parsers/jsoncpp/commit/6bc55ec35d02931960ec1f5768fc9c56ab62ef66]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
include/json/version.h | 4 ++--
|
||||
meson.build | 33 ++++++++++++++++++---------------
|
||||
meson_options.txt | 5 +++++
|
||||
4 files changed, 26 insertions(+), 18 deletions(-)
|
||||
create mode 100644 meson_options.txt
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4e063317..c05ddccb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -70,7 +70,7 @@ project(JSONCPP
|
||||
# 2. /include/json/version.h
|
||||
# 3. /CMakeLists.txt
|
||||
# IMPORTANT: also update the SOVERSION!!
|
||||
- VERSION 1.9.2 # <major>[.<minor>[.<patch>[.<tweak>]]]
|
||||
+ VERSION 1.9.3 # <major>[.<minor>[.<patch>[.<tweak>]]]
|
||||
LANGUAGES CXX)
|
||||
|
||||
message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")
|
||||
diff --git a/include/json/version.h b/include/json/version.h
|
||||
index ff94372b..0f298341 100644
|
||||
--- a/include/json/version.h
|
||||
+++ b/include/json/version.h
|
||||
@@ -9,10 +9,10 @@
|
||||
// 3. /CMakeLists.txt
|
||||
// IMPORTANT: also update the SOVERSION!!
|
||||
|
||||
-#define JSONCPP_VERSION_STRING "1.9.2"
|
||||
+#define JSONCPP_VERSION_STRING "1.9.3"
|
||||
#define JSONCPP_VERSION_MAJOR 1
|
||||
#define JSONCPP_VERSION_MINOR 9
|
||||
-#define JSONCPP_VERSION_PATCH 2
|
||||
+#define JSONCPP_VERSION_PATCH 3
|
||||
#define JSONCPP_VERSION_QUALIFIER
|
||||
#define JSONCPP_VERSION_HEXA \
|
||||
((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1bc94a8a..c2932030 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -9,7 +9,7 @@ project(
|
||||
# 2. /include/json/version.h
|
||||
# 3. /CMakeLists.txt
|
||||
# IMPORTANT: also update the SOVERSION!!
|
||||
- version : '1.9.2',
|
||||
+ version : '1.9.3',
|
||||
default_options : [
|
||||
'buildtype=release',
|
||||
'cpp_std=c++11',
|
||||
@@ -18,7 +18,7 @@ project(
|
||||
meson_version : '>= 0.49.0')
|
||||
|
||||
|
||||
-jsoncpp_headers = [
|
||||
+jsoncpp_headers = files([
|
||||
'include/json/allocator.h',
|
||||
'include/json/assertions.h',
|
||||
'include/json/config.h',
|
||||
@@ -28,7 +28,8 @@ jsoncpp_headers = [
|
||||
'include/json/reader.h',
|
||||
'include/json/value.h',
|
||||
'include/json/version.h',
|
||||
- 'include/json/writer.h']
|
||||
+ 'include/json/writer.h',
|
||||
+])
|
||||
jsoncpp_include_directories = include_directories('include')
|
||||
|
||||
install_headers(
|
||||
@@ -44,13 +45,12 @@ else
|
||||
endif
|
||||
|
||||
jsoncpp_lib = library(
|
||||
- 'jsoncpp',
|
||||
- [ jsoncpp_headers,
|
||||
- 'src/lib_json/json_tool.h',
|
||||
+ 'jsoncpp', files([
|
||||
'src/lib_json/json_reader.cpp',
|
||||
'src/lib_json/json_value.cpp',
|
||||
- 'src/lib_json/json_writer.cpp'],
|
||||
- soversion : 22,
|
||||
+ 'src/lib_json/json_writer.cpp',
|
||||
+ ]),
|
||||
+ soversion : 23,
|
||||
install : true,
|
||||
include_directories : jsoncpp_include_directories,
|
||||
cpp_args: dll_export_flag)
|
||||
@@ -66,18 +66,21 @@ import('pkgconfig').generate(
|
||||
jsoncpp_dep = declare_dependency(
|
||||
include_directories : jsoncpp_include_directories,
|
||||
link_with : jsoncpp_lib,
|
||||
- version : meson.project_version(),
|
||||
- )
|
||||
+ version : meson.project_version())
|
||||
|
||||
# tests
|
||||
-python = import('python').find_installation()
|
||||
+if meson.is_subproject() or not get_option('tests')
|
||||
+ subdir_done()
|
||||
+endif
|
||||
+
|
||||
+python = import('python').find_installation('python3')
|
||||
|
||||
jsoncpp_test = executable(
|
||||
- 'jsoncpp_test',
|
||||
- [ 'src/test_lib_json/jsontest.cpp',
|
||||
- 'src/test_lib_json/jsontest.h',
|
||||
+ 'jsoncpp_test', files([
|
||||
+ 'src/test_lib_json/jsontest.cpp',
|
||||
'src/test_lib_json/main.cpp',
|
||||
- 'src/test_lib_json/fuzz.cpp'],
|
||||
+ 'src/test_lib_json/fuzz.cpp',
|
||||
+ ]),
|
||||
include_directories : jsoncpp_include_directories,
|
||||
link_with : jsoncpp_lib,
|
||||
install : false,
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
new file mode 100644
|
||||
index 00000000..9c215ae6
|
||||
--- /dev/null
|
||||
+++ b/meson_options.txt
|
||||
@@ -0,0 +1,5 @@
|
||||
+option(
|
||||
+ 'tests',
|
||||
+ type : 'boolean',
|
||||
+ value : true,
|
||||
+ description : 'Enable building tests')
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0 jsoncpp-1.9.2.tar.gz
|
||||
sha256 8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d jsoncpp-1.9.3.tar.gz
|
||||
sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JSONCPP_VERSION = 1.9.2
|
||||
JSONCPP_VERSION = 1.9.3
|
||||
JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION))
|
||||
JSONCPP_LICENSE = Public Domain or MIT
|
||||
JSONCPP_LICENSE_FILES = LICENSE
|
||||
|
||||
Reference in New Issue
Block a user