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
70 lines
2.0 KiB
Diff
70 lines
2.0 KiB
Diff
From 3178ceb8c7e0a94ed29bbd1e277f03bb0d5a3d44 Mon Sep 17 00:00:00 2001
|
|
From: Tobias Klauser <tklauser@distanz.ch>
|
|
Date: Wed, 19 Aug 2020 12:58:51 +0200
|
|
Subject: [PATCH] mausezahn: move variable definitions from mops.h to mops.c
|
|
|
|
Move variable definitions to avoid "multiple definition of symbol"
|
|
linker errors with gcc-10.
|
|
|
|
Updates #216
|
|
|
|
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
[Retrieved from:
|
|
https://github.com/netsniff-ng/netsniff-ng/commit/3178ceb8c7e0a94ed29bbd1e277f03bb0d5a3d44]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
staging/mops.c | 5 ++++-
|
|
staging/mops.h | 8 ++++----
|
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/staging/mops.c b/staging/mops.c
|
|
index 599d317f..fc00e29a 100644
|
|
--- a/staging/mops.c
|
|
+++ b/staging/mops.c
|
|
@@ -46,8 +46,11 @@
|
|
#include "mz.h"
|
|
#include "mops.h"
|
|
|
|
+unsigned int min_frame_s;
|
|
+unsigned int max_frame_s;
|
|
|
|
-
|
|
+struct automops * amp_head;
|
|
+struct mops *mp_head; // This global will point to the head of the mops list
|
|
|
|
// Creates first element, aka "head" element
|
|
// This element can also be used! See mops_alloc_packet!
|
|
diff --git a/staging/mops.h b/staging/mops.h
|
|
index 96953e66..cf19f098 100644
|
|
--- a/staging/mops.h
|
|
+++ b/staging/mops.h
|
|
@@ -114,8 +114,8 @@
|
|
// These are initialized with the definitions MIN_MOPS_FRAME_SIZE and
|
|
// MAX_MOPS_FRAME_SIZE above but can be overridden by the user (without
|
|
// extending these limits)
|
|
-unsigned int min_frame_s;
|
|
-unsigned int max_frame_s;
|
|
+extern unsigned int min_frame_s;
|
|
+extern unsigned int max_frame_s;
|
|
|
|
struct mops_counter
|
|
{
|
|
@@ -246,7 +246,7 @@ struct automops {
|
|
};
|
|
|
|
|
|
-struct automops * amp_head;
|
|
+extern struct automops * amp_head;
|
|
|
|
|
|
struct mops
|
|
@@ -688,7 +688,7 @@ struct mops_ext_syslog //TODO
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
-struct mops *mp_head; // This global will point to the head of the mops list
|
|
+extern struct mops *mp_head; // This global will point to the head of the mops list
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
// MOPS Prototypes:
|