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:
@@ -0,0 +1,49 @@
|
||||
From 322294d7bf61f9fdf0e45e9b6c6013a7c6a35bfd Mon Sep 17 00:00:00 2001
|
||||
From: Derrick Lyndon Pallas <derrick@meter.com>
|
||||
Date: Wed, 14 Oct 2020 18:25:54 +0000
|
||||
Subject: [PATCH] Do not fail to build if ronn is missing
|
||||
|
||||
If ruby-ronn is missing, we can not compile the man page from markdown but
|
||||
that should not prevent the application from building.
|
||||
|
||||
Signed-off-by: Derrick Lyndon Pallas <derrick@meter.com>
|
||||
---
|
||||
meson.build | 23 ++++++++++++-----------
|
||||
1 file changed, 12 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a2169fc..981d4a4 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -72,16 +72,17 @@ ipcalc = executable('ipcalc',
|
||||
install : true
|
||||
)
|
||||
|
||||
-ronn = find_program('ronn', required: true)
|
||||
-
|
||||
-ipcalc_1 = custom_target(
|
||||
- 'ipcalc.1',
|
||||
- output : 'ipcalc.1',
|
||||
- input : 'ipcalc.1.md',
|
||||
- command : [ronn, '--pipe', '-r', '@INPUT@'],
|
||||
- capture: true,
|
||||
- install_dir: join_paths(get_option('mandir'), 'man1'),
|
||||
- install: true
|
||||
-)
|
||||
+ronn = find_program('ronn', required: false)
|
||||
+if ronn.found()
|
||||
+ ipcalc_1 = custom_target(
|
||||
+ 'ipcalc.1',
|
||||
+ output : 'ipcalc.1',
|
||||
+ input : 'ipcalc.1.md',
|
||||
+ command : [ronn, '--pipe', '-r', '@INPUT@'],
|
||||
+ capture: true,
|
||||
+ install_dir: join_paths(get_option('mandir'), 'man1'),
|
||||
+ install: true
|
||||
+ )
|
||||
+endif
|
||||
|
||||
subdir('tests')
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 7795c02fb1e0f5fdbdf949007e52684c590235d4 Mon Sep 17 00:00:00 2001
|
||||
From: Derrick Lyndon Pallas <derrick@meter.com>
|
||||
Date: Wed, 14 Oct 2020 18:40:38 +0000
|
||||
Subject: [PATCH] Include stdarg for va_list
|
||||
|
||||
While several function signatures use va_list, stdarg was never included.
|
||||
This fixes that.
|
||||
|
||||
Signed-off-by: Derrick Lyndon Pallas <derrick@meter.com>
|
||||
---
|
||||
ipcalc.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/ipcalc.h b/ipcalc.h
|
||||
index 0e81320..a220dc5 100644
|
||||
--- a/ipcalc.h
|
||||
+++ b/ipcalc.h
|
||||
@@ -20,6 +20,8 @@
|
||||
#ifndef _IPCALC_H
|
||||
#define _IPCALC_H
|
||||
|
||||
+#include <stdarg.h> /* for va_list */
|
||||
+
|
||||
#if defined(USE_GEOIP)
|
||||
void geo_ip_lookup(const char *ip, char **country, char **ccode, char **city, char **coord);
|
||||
int geo_setup(void);
|
||||
--
|
||||
2.28.0
|
||||
|
||||
8
buildroot/package/ipcalc/Config.in
Normal file
8
buildroot/package/ipcalc/Config.in
Normal file
@@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_IPCALC
|
||||
bool "ipcalc"
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
help
|
||||
A modern IPv4/IPv6 ipcalc tool, assisting in network
|
||||
calculations in command line and as a tool for scripts.
|
||||
|
||||
https://gitlab.com/ipcalc/ipcalc
|
||||
3
buildroot/package/ipcalc/ipcalc.hash
Normal file
3
buildroot/package/ipcalc/ipcalc.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 d7aca371335ab3e35364bcfe34cd0229db005be8bebb9236608ec318cb3f7748 ipcalc-1.0.0.tar.bz2
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
17
buildroot/package/ipcalc/ipcalc.mk
Normal file
17
buildroot/package/ipcalc/ipcalc.mk
Normal file
@@ -0,0 +1,17 @@
|
||||
################################################################################
|
||||
#
|
||||
# ipcalc
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IPCALC_VERSION = 1.0.0
|
||||
IPCALC_SITE = https://gitlab.com/ipcalc/ipcalc/-/archive/$(IPCALC_VERSION)
|
||||
IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2
|
||||
IPCALC_LICENSE = GPL-2.0+
|
||||
IPCALC_LICENSE_FILES = COPYING
|
||||
|
||||
IPCALC_CONF_OPTS = \
|
||||
-Duse_maxminddb=disabled \
|
||||
-Duse_geoip=disabled
|
||||
|
||||
$(eval $(meson-package))
|
||||
Reference in New Issue
Block a user