buildroot upgrade
jkt: Also, refactor that custom Unix group handling in buildroot to make
it unconditional. Fewer options, less work.
jkt: Also rebase systemd patch (now at lldp-json-250.4)
Change-Id: Icd8c22b8a2e6e9d0e3346a103bcfbcd78aecabac
Co-authored-by: Jan Kundrát <jan.kundrat@cesnet.cz>
diff --git a/board/czechlight/common/patches/systemd/0002-network-Add-varlink-server.patch b/board/czechlight/common/patches/systemd/0002-network-Add-varlink-server.patch
index de6b7db..6302127 100644
--- a/board/czechlight/common/patches/systemd/0002-network-Add-varlink-server.patch
+++ b/board/czechlight/common/patches/systemd/0002-network-Add-varlink-server.patch
@@ -1,4 +1,4 @@
-From a99f62ee2c89b3631a23426eedfa477aa9d8dbd9 Mon Sep 17 00:00:00 2001
+From 210ae903e7f5e4813feaea9bbac1f03fa3be42cc Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@users.noreply.github.com>
Date: Tue, 24 Aug 2021 14:59:40 +0200
Subject: [PATCH 2/9] network: Add varlink server
@@ -16,20 +16,20 @@
create mode 100644 src/network/networkd-varlink.h
diff --git a/src/network/meson.build b/src/network/meson.build
-index 5857439c5a..430dadbf05 100644
+index 48d185195c..d93e815fdf 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
-@@ -137,6 +137,8 @@ sources = files('''
- networkd-sysctl.h
- networkd-util.c
- networkd-util.h
-+ networkd-varlink.c
-+ networkd-varlink.h
- networkd-wifi.c
- networkd-wifi.h
- tc/cake.c
+@@ -137,6 +137,8 @@ sources = files(
+ 'networkd-sysctl.h',
+ 'networkd-util.c',
+ 'networkd-util.h',
++ 'networkd-varlink.c',
++ 'networkd-varlink.h',
+ 'networkd-wifi.c',
+ 'networkd-wifi.h',
+ 'tc/cake.c',
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
-index 7e89366ae8..9f6a2553f6 100644
+index 9d790224cc..5e4c5e38b4 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -41,6 +41,7 @@
@@ -40,7 +40,7 @@
#include "networkd-wifi.h"
#include "ordered-set.h"
#include "path-lookup.h"
-@@ -543,6 +544,8 @@ Manager* manager_free(Manager *m) {
+@@ -544,6 +545,8 @@ Manager* manager_free(Manager *m) {
m->fw_ctx = fw_ctx_free(m->fw_ctx);
@@ -49,7 +49,7 @@
return mfree(m);
}
-@@ -552,6 +555,10 @@ int manager_start(Manager *m) {
+@@ -553,6 +556,10 @@ int manager_start(Manager *m) {
assert(m);
@@ -135,5 +135,5 @@
+int manager_varlink_init(Manager *m);
+void manager_varlink_done(Manager *m);
--
-2.34.1
+2.35.1