a0871be6c0
* 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
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 60b4cd4c703be380aef194d31a1ffc4b42431bde Mon Sep 17 00:00:00 2001
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
|
Date: Thu, 9 Apr 2020 22:21:36 +0200
|
|
Subject: [PATCH] ell/rtnl: fix compile with older toolchains
|
|
|
|
Older toolchains need to include sys/types.h and sys/socket.h before
|
|
linux/if.h, RTA_PREF was introduces with linux-4.1.x.
|
|
|
|
Fixes:
|
|
|
|
In file included from ell/rtnl.c:28:0:
|
|
.../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:185:19: error: field 'ifru_addr' has incomplete type
|
|
.../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:186:19: error: field 'ifru_dstaddr' has incomplete type
|
|
.../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:187:19: error: field 'ifru_broadaddr' has incomplete type
|
|
.../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:188:19: error: field 'ifru_netmask' has incomplete type
|
|
.../arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:189:20: error: field 'ifru_hwaddr' has incomplete type
|
|
ell/rtnl.c: In function 'l_rtnl_route_extract':
|
|
ell/rtnl.c:120:8: error: 'RTA_PREF' undeclared (first use in this function)
|
|
|
|
[Upstream: https://lists.ofono.org/hyperkitty/list/ell@lists.01.org/thread/TOJ5XEY7X6WMOMJHX4KWI5LFEOX2QTBQ]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
configure.ac | 2 ++
|
|
ell/rtnl.c | 7 ++++++-
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 0351f89..3be35a4 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -113,6 +113,8 @@ AC_CHECK_LIB(dl, dlopen, dummy=yes,
|
|
|
|
AC_CHECK_HEADERS(linux/types.h linux/if_alg.h)
|
|
|
|
+AC_CHECK_DECLS([RTA_PREF], [], [], [[#include <linux/rtnetlink.h>]])
|
|
+
|
|
AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib],
|
|
[enable ell/glib main loop example]),
|
|
[enable_glib=${enableval}])
|
|
diff --git a/ell/rtnl.c b/ell/rtnl.c
|
|
index dc83937..3493d34 100644
|
|
--- a/ell/rtnl.c
|
|
+++ b/ell/rtnl.c
|
|
@@ -25,8 +25,9 @@
|
|
#endif
|
|
|
|
#define _GNU_SOURCE
|
|
-#include <linux/if.h>
|
|
+#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
+#include <linux/if.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include "util.h"
|
|
@@ -35,6 +36,10 @@
|
|
#include "rtnl.h"
|
|
#include "private.h"
|
|
|
|
+#if defined HAVE_DECL_RTA_PREF && !HAVE_DECL_RTA_PREF
|
|
+#define RTA_PREF 20
|
|
+#endif
|
|
+
|
|
static size_t rta_add_u8(void *rta_buf, unsigned short type, uint8_t value)
|
|
{
|
|
struct rtattr *rta = rta_buf;
|
|
--
|
|
2.26.0
|
|
|