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
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From 6cb8af1ff3951e47def7a16db39289dc9d9c61fe Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
|
|
Date: Tue, 23 Jun 2020 16:09:02 -0700
|
|
Subject: libxtables: compiler warning fixes for NO_SHARED_LIBS
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Fixes two issues with NO_SHARED_LIBS:
|
|
- #include <dlfcn.h> is ifdef'ed out and thus dlclose()
|
|
triggers an undeclared function compiler warning
|
|
- dlreg_add() is unused and thus triggers an unused
|
|
function warning
|
|
|
|
Test: builds without warnings
|
|
Signed-off-by: Maciej Żenczykowski <maze@google.com>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
[Retrieved from:
|
|
https://git.netfilter.org/iptables/commit/libxtables/xtables.c?id=6cb8af1ff3951e47def7a16db39289dc9d9c61fe]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
libxtables/xtables.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/libxtables/xtables.c b/libxtables/xtables.c
|
|
index 7fe42580..8907ba20 100644
|
|
--- a/libxtables/xtables.c
|
|
+++ b/libxtables/xtables.c
|
|
@@ -206,6 +206,7 @@ struct xtables_target *xtables_targets;
|
|
static bool xtables_fully_register_pending_match(struct xtables_match *me);
|
|
static bool xtables_fully_register_pending_target(struct xtables_target *me);
|
|
|
|
+#ifndef NO_SHARED_LIBS
|
|
/* registry for loaded shared objects to close later */
|
|
struct dlreg {
|
|
struct dlreg *next;
|
|
@@ -237,6 +238,7 @@ static void dlreg_free(void)
|
|
dlreg = next;
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
void xtables_init(void)
|
|
{
|
|
@@ -267,7 +269,9 @@ void xtables_init(void)
|
|
|
|
void xtables_fini(void)
|
|
{
|
|
+#ifndef NO_SHARED_LIBS
|
|
dlreg_free();
|
|
+#endif
|
|
}
|
|
|
|
void xtables_set_nfproto(uint8_t nfproto)
|
|
--
|
|
cgit v1.2.3
|
|
|