summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd-boot_247.4.bb (renamed from meta/recipes-core/systemd/systemd-boot_247.3.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch9
-rw-r--r--meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch28
-rw-r--r--meta/recipes-core/systemd/systemd_247.4.bb (renamed from meta/recipes-core/systemd/systemd_247.3.bb)0
5 files changed, 23 insertions, 16 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_247.3.bb b/meta/recipes-core/systemd/systemd-boot_247.4.bb
index 249e620f4e..249e620f4e 100644
--- a/meta/recipes-core/systemd/systemd-boot_247.3.bb
+++ b/meta/recipes-core/systemd/systemd-boot_247.4.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index ccff8c8b9e..098bca98f1 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" 15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
16 16
17SRCREV = "551dd873b0bdfb9e7e47431b2933c8b910228f0c" 17SRCREV = "069525e84a67375e27429cb490e8d28af78e673a"
18SRCBRANCH = "v247-stable" 18SRCBRANCH = "v247-stable"
19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" 19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
20 20
diff --git a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch b/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch
index e49e06672e..752824688f 100644
--- a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch
+++ b/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch
@@ -12,10 +12,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 src/core/systemd.pc.in | 8 ++++---- 12 src/core/systemd.pc.in | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-) 13 1 file changed, 4 insertions(+), 4 deletions(-)
14 14
15diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
16index b5cc8f9..21dbf30 100644
15--- a/src/core/systemd.pc.in 17--- a/src/core/systemd.pc.in
16+++ b/src/core/systemd.pc.in 18+++ b/src/core/systemd.pc.in
17@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} 19@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir}
18 tmpfiles_dir=/usr/lib/tmpfiles.d 20 tmpfiles_dir=${prefix}/lib/tmpfiles.d
19 tmpfilesdir=${tmpfiles_dir} 21 tmpfilesdir=${tmpfiles_dir}
20 22
21-sysusers_dir=${rootprefix}/lib/sysusers.d 23-sysusers_dir=${rootprefix}/lib/sysusers.d
@@ -34,4 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
34+modules_load_dir=${prefix}/lib/modules-load.d 36+modules_load_dir=${prefix}/lib/modules-load.d
35 modulesloaddir=${modules_load_dir} 37 modulesloaddir=${modules_load_dir}
36 38
37 catalog_dir=/usr/lib/systemd/catalog 39 catalog_dir=${prefix}/lib/systemd/catalog
40--
412.25.1
42
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
index b689cf1297..a978558b42 100644
--- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
+++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
@@ -41,20 +41,22 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
41 src/network/netdev/netdev-gperf.gperf | 1 + 41 src/network/netdev/netdev-gperf.gperf | 1 +
42 src/network/netdev/netdev.c | 1 + 42 src/network/netdev/netdev.c | 1 +
43 src/network/networkd-brvlan.c | 1 + 43 src/network/networkd-brvlan.c | 1 +
44 src/network/networkd-dhcp-common.c | 1 + 44 src/network/networkd-dhcp-common.c | 4 +++-
45 src/network/networkd-dhcp-server.c | 4 ++--
45 src/network/networkd-dhcp4.c | 2 +- 46 src/network/networkd-dhcp4.c | 2 +-
46 src/network/networkd-dhcp6.c | 2 +- 47 src/network/networkd-dhcp6.c | 2 +-
47 src/network/networkd-link.c | 2 +- 48 src/network/networkd-link.c | 2 +-
48 src/network/networkd-network.c | 1 + 49 src/network/networkd-network.c | 1 +
50 src/network/networkd-route.c | 5 ++++-
49 src/network/test-network-tables.c | 1 + 51 src/network/test-network-tables.c | 1 +
50 src/shared/ethtool-util.c | 1 + 52 src/shared/ethtool-util.c | 1 +
51 src/shared/ethtool-util.h | 1 + 53 src/shared/ethtool-util.h | 1 +
52 src/udev/net/link-config.c | 1 + 54 src/udev/net/link-config.c | 1 +
53 src/udev/udev-builtin-net_setup_link.c | 1 + 55 src/udev/udev-builtin-net_setup_link.c | 1 +
54 19 files changed, 18 insertions(+), 4 deletions(-) 56 21 files changed, 26 insertions(+), 8 deletions(-)
55 57
56diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c 58diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
57index 30ac526fc9..126077e13c 100644 59index 66f87c4b95..de1264ae46 100644
58--- a/src/libsystemd-network/sd-dhcp6-client.c 60--- a/src/libsystemd-network/sd-dhcp6-client.c
59+++ b/src/libsystemd-network/sd-dhcp6-client.c 61+++ b/src/libsystemd-network/sd-dhcp6-client.c
60@@ -5,7 +5,6 @@ 62@@ -5,7 +5,6 @@
@@ -158,7 +160,7 @@ index e53c73c30c..9bf0771b84 100644
158 #include <stdbool.h> 160 #include <stdbool.h>
159 161
160diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c 162diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
161index c338c775a7..ab35d65c53 100644 163index 9f58121350..554d006cb8 100644
162--- a/src/network/networkd-dhcp-common.c 164--- a/src/network/networkd-dhcp-common.c
163+++ b/src/network/networkd-dhcp-common.c 165+++ b/src/network/networkd-dhcp-common.c
164@@ -1,7 +1,8 @@ 166@@ -1,7 +1,8 @@
@@ -171,7 +173,7 @@ index c338c775a7..ab35d65c53 100644
171 173
172 #include "dhcp-internal.h" 174 #include "dhcp-internal.h"
173 #include "dhcp6-internal.h" 175 #include "dhcp6-internal.h"
174@@ -10,6 +10,7 @@ 176@@ -10,6 +11,7 @@
175 #include "networkd-dhcp-common.h" 177 #include "networkd-dhcp-common.h"
176 #include "networkd-link.h" 178 #include "networkd-link.h"
177 #include "networkd-manager.h" 179 #include "networkd-manager.h"
@@ -195,7 +197,7 @@ index cf279c640d..bae541029b 100644
195 #include "sd-dhcp-server.h" 197 #include "sd-dhcp-server.h"
196 198
197diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c 199diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
198index 02d33841b6..a30d8dd82c 100644 200index f3c1e5f609..e4ef6eca63 100644
199--- a/src/network/networkd-dhcp4.c 201--- a/src/network/networkd-dhcp4.c
200+++ b/src/network/networkd-dhcp4.c 202+++ b/src/network/networkd-dhcp4.c
201@@ -1,9 +1,9 @@ 203@@ -1,9 +1,9 @@
@@ -210,7 +212,7 @@ index 02d33841b6..a30d8dd82c 100644
210 #include "escape.h" 212 #include "escape.h"
211 #include "alloc-util.h" 213 #include "alloc-util.h"
212diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c 214diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
213index d4d4182ee5..635d08f7d5 100644 215index 5c077c1ec8..fa98042aa5 100644
214--- a/src/network/networkd-dhcp6.c 216--- a/src/network/networkd-dhcp6.c
215+++ b/src/network/networkd-dhcp6.c 217+++ b/src/network/networkd-dhcp6.c
216@@ -3,9 +3,9 @@ 218@@ -3,9 +3,9 @@
@@ -225,7 +227,7 @@ index d4d4182ee5..635d08f7d5 100644
225 #include "sd-dhcp6-client.h" 227 #include "sd-dhcp6-client.h"
226 228
227diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c 229diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
228index ced18de425..07b43770de 100644 230index 3bfe636691..e0c68c8ad3 100644
229--- a/src/network/networkd-link.c 231--- a/src/network/networkd-link.c
230+++ b/src/network/networkd-link.c 232+++ b/src/network/networkd-link.c
231@@ -1,8 +1,8 @@ 233@@ -1,8 +1,8 @@
@@ -250,7 +252,7 @@ index 3254641461..f0ada419fd 100644
250 #include <netinet/in.h> 252 #include <netinet/in.h>
251 #include <linux/netdevice.h> 253 #include <linux/netdevice.h>
252diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c 254diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
253index 10f30c1a7e..579885726c 100644 255index 0ed89584ef..e7e157c201 100644
254--- a/src/network/networkd-route.c 256--- a/src/network/networkd-route.c
255+++ b/src/network/networkd-route.c 257+++ b/src/network/networkd-route.c
256@@ -1,7 +1,10 @@ 258@@ -1,7 +1,10 @@
@@ -311,16 +313,16 @@ index d12fd0e299..636806dc23 100644
311 #include <netinet/ether.h> 313 #include <netinet/ether.h>
312 #include <unistd.h> 314 #include <unistd.h>
313diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c 315diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
314index cb12b943fe..5a28c8b563 100644 316index 87e1fb133e..13876029d0 100644
315--- a/src/udev/udev-builtin-net_setup_link.c 317--- a/src/udev/udev-builtin-net_setup_link.c
316+++ b/src/udev/udev-builtin-net_setup_link.c 318+++ b/src/udev/udev-builtin-net_setup_link.c
317@@ -1,5 +1,6 @@ 319@@ -1,5 +1,6 @@
318 /* SPDX-License-Identifier: LGPL-2.1-or-later */ 320 /* SPDX-License-Identifier: LGPL-2.1-or-later */
319 321
320+#include <netinet/if_ether.h> 322+#include <netinet/if_ether.h>
321 #include "device-util.h"
322 #include "alloc-util.h" 323 #include "alloc-util.h"
323 #include "link-config.h" 324 #include "device-util.h"
325 #include "errno-util.h"
324-- 326--
3252.27.0 3272.25.1
326 328
diff --git a/meta/recipes-core/systemd/systemd_247.3.bb b/meta/recipes-core/systemd/systemd_247.4.bb
index cd67e65abe..cd67e65abe 100644
--- a/meta/recipes-core/systemd/systemd_247.3.bb
+++ b/meta/recipes-core/systemd/systemd_247.4.bb