refresh the following patches: systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch systemd/0006-Include-netinet-if_ether.h.patch
Signed-off-by: Wang Mingyu <[email protected]> --- ...md-boot_247.3.bb => systemd-boot_247.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...se-ROOTPREFIX-without-suffixed-slash.patch | 9 ++++-- .../0006-Include-netinet-if_ether.h.patch | 28 ++++++++++--------- .../{systemd_247.3.bb => systemd_247.4.bb} | 0 5 files changed, 23 insertions(+), 16 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_247.3.bb => systemd-boot_247.4.bb} (100%) rename meta/recipes-core/systemd/{systemd_247.3.bb => systemd_247.4.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_247.3.bb b/meta/recipes-core/systemd/systemd-boot_247.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_247.3.bb rename to 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" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "551dd873b0bdfb9e7e47431b2933c8b910228f0c" +SRCREV = "069525e84a67375e27429cb490e8d28af78e673a" SRCBRANCH = "v247-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" 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 <[email protected]> src/core/systemd.pc.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index b5cc8f9..21dbf30 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} - tmpfiles_dir=/usr/lib/tmpfiles.d + tmpfiles_dir=${prefix}/lib/tmpfiles.d tmpfilesdir=${tmpfiles_dir} -sysusers_dir=${rootprefix}/lib/sysusers.d @@ -34,4 +36,7 @@ Signed-off-by: Khem Raj <[email protected]> +modules_load_dir=${prefix}/lib/modules-load.d modulesloaddir=${modules_load_dir} - catalog_dir=/usr/lib/systemd/catalog + catalog_dir=${prefix}/lib/systemd/catalog +-- +2.25.1 + 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 <[email protected]> src/network/netdev/netdev-gperf.gperf | 1 + src/network/netdev/netdev.c | 1 + src/network/networkd-brvlan.c | 1 + - src/network/networkd-dhcp-common.c | 1 + + src/network/networkd-dhcp-common.c | 4 +++- + src/network/networkd-dhcp-server.c | 4 ++-- src/network/networkd-dhcp4.c | 2 +- src/network/networkd-dhcp6.c | 2 +- src/network/networkd-link.c | 2 +- src/network/networkd-network.c | 1 + + src/network/networkd-route.c | 5 ++++- src/network/test-network-tables.c | 1 + src/shared/ethtool-util.c | 1 + src/shared/ethtool-util.h | 1 + src/udev/net/link-config.c | 1 + src/udev/udev-builtin-net_setup_link.c | 1 + - 19 files changed, 18 insertions(+), 4 deletions(-) + 21 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index 30ac526fc9..126077e13c 100644 +index 66f87c4b95..de1264ae46 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -5,7 +5,6 @@ @@ -158,7 +160,7 @@ index e53c73c30c..9bf0771b84 100644 #include <stdbool.h> diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index c338c775a7..ab35d65c53 100644 +index 9f58121350..554d006cb8 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -1,7 +1,8 @@ @@ -171,7 +173,7 @@ index c338c775a7..ab35d65c53 100644 #include "dhcp-internal.h" #include "dhcp6-internal.h" -@@ -10,6 +10,7 @@ +@@ -10,6 +11,7 @@ #include "networkd-dhcp-common.h" #include "networkd-link.h" #include "networkd-manager.h" @@ -195,7 +197,7 @@ index cf279c640d..bae541029b 100644 #include "sd-dhcp-server.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 02d33841b6..a30d8dd82c 100644 +index f3c1e5f609..e4ef6eca63 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,9 +1,9 @@ @@ -210,7 +212,7 @@ index 02d33841b6..a30d8dd82c 100644 #include "escape.h" #include "alloc-util.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index d4d4182ee5..635d08f7d5 100644 +index 5c077c1ec8..fa98042aa5 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ @@ -225,7 +227,7 @@ index d4d4182ee5..635d08f7d5 100644 #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index ced18de425..07b43770de 100644 +index 3bfe636691..e0c68c8ad3 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ @@ -250,7 +252,7 @@ index 3254641461..f0ada419fd 100644 #include <netinet/in.h> #include <linux/netdevice.h> diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c -index 10f30c1a7e..579885726c 100644 +index 0ed89584ef..e7e157c201 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1,7 +1,10 @@ @@ -311,16 +313,16 @@ index d12fd0e299..636806dc23 100644 #include <netinet/ether.h> #include <unistd.h> diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index cb12b943fe..5a28c8b563 100644 +index 87e1fb133e..13876029d0 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> - #include "device-util.h" #include "alloc-util.h" - #include "link-config.h" + #include "device-util.h" + #include "errno-util.h" -- -2.27.0 +2.25.1 diff --git a/meta/recipes-core/systemd/systemd_247.3.bb b/meta/recipes-core/systemd/systemd_247.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_247.3.bb rename to meta/recipes-core/systemd/systemd_247.4.bb -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149627): https://lists.openembedded.org/g/openembedded-core/message/149627 Mute This Topic: https://lists.openembedded.org/mt/81424894/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
