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
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 6f20cd366ea73b8b9cf49568e9b95cd79922daed Mon Sep 17 00:00:00 2001
|
|
From: Tobias Klauser <tklauser@distanz.ch>
|
|
Date: Wed, 19 Aug 2020 13:13:34 +0200
|
|
Subject: [PATCH] mausezahn: move variable definitions from llist.h to llist.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/6f20cd366ea73b8b9cf49568e9b95cd79922daed]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
staging/llist.c | 2 ++
|
|
staging/llist.h | 4 ++--
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/staging/llist.c b/staging/llist.c
|
|
index d729e465..9ef2d1a2 100644
|
|
--- a/staging/llist.c
|
|
+++ b/staging/llist.c
|
|
@@ -40,6 +40,8 @@
|
|
*
|
|
*/
|
|
|
|
+struct mz_ll *packet_sequences;
|
|
+struct mz_ll *cli_seq; // currently edited packet sequence used by CLI
|
|
|
|
// Create new list element - may be the first one (list==NULL)
|
|
//
|
|
diff --git a/staging/llist.h b/staging/llist.h
|
|
index 49a87c7d..d9e59b86 100644
|
|
--- a/staging/llist.h
|
|
+++ b/staging/llist.h
|
|
@@ -49,8 +49,8 @@ struct mz_ll {
|
|
void *data; // points to your data
|
|
};
|
|
|
|
-struct mz_ll *packet_sequences;
|
|
-struct mz_ll *cli_seq; // currently edited packet sequence used by CLI
|
|
+extern struct mz_ll *packet_sequences;
|
|
+extern struct mz_ll *cli_seq; // currently edited packet sequence used by CLI
|
|
|
|
// prototypes
|
|
struct mz_ll * mz_ll_create_new_element(struct mz_ll *list);
|