6 files changed, 3 insertions, 70 deletions

diff --git a/meta/recipes-core/systemd/systemd-boot-native_256.bb b/meta/recipes-core/systemd/systemd-boot-native_256.4.bb
index 73db59b14e..73db59b14e 100644
--- a/meta/recipes-core/systemd/systemd-boot-native_256.bb
+++ b/meta/recipes-core/systemd/systemd-boot-native_256.4.bb
diff --git a/meta/recipes-core/systemd/systemd-boot_256.bb b/meta/recipes-core/systemd/systemd-boot_256.4.bb
index dd06b6218b..9a6d8e9d6e 100644
--- a/meta/recipes-core/systemd/systemd-boot_256.bb
+++ b/meta/recipes-core/systemd/systemd-boot_256.4.bb
@@ -1,8 +1,6 @@
 require systemd.inc
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
-SRC_URI += "file://0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch"
-
 require conf/image-uefi.conf
 
 DEPENDS = "intltool-native libcap util-linux gperf-native python3-jinja2-native python3-pyelftools-native"
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 6906ff969b..63f024baa9 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -15,8 +15,8 @@ LICENSE:libsystemd = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "5c79cdec10a547a866764a66e1e14898112a00cd"
-SRCBRANCH = "main"
-SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "566210c272820ca6655800ce0d27b6ebc0aedc4c"
+SRCBRANCH = "v256-stable"
+SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch b/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch
deleted file mode 100644
index 6f02ea2f43..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9df06062cebd0390d33de9694e9cb1c9fa7b8697 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Wed, 3 Jul 2024 23:18:41 -0700
-Subject: [PATCH] src/boot/efi/meson.build: ensure VERSION_TAG exists in case
- of cross build
-
-The GIT_VERSION is changed to use VERSION_TAG, but in case of cross build
-for src/boot/efi, it's not set, causing build error because the compiler cannot
-know it's a macro thus treating it as some variable and error out.
-
-Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/33612]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- src/boot/efi/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
-index 7a60b0ec7e..99d108d6e8 100644
---- a/src/boot/efi/meson.build
-+++ b/src/boot/efi/meson.build
-@@ -65,6 +65,7 @@ endforeach
- 
- if meson.is_cross_build() and get_option('sbat-distro') == 'auto'
-         warning('Auto detection of SBAT information not supported when cross-building, disabling SBAT.')
-+        efi_conf.set_quoted('VERSION_TAG', version_tag)
- elif get_option('sbat-distro') != ''
-         efi_conf.set_quoted('SBAT_PROJECT', meson.project_name())
-         efi_conf.set_quoted('PROJECT_VERSION', meson.project_version().split('~')[0])
--- 
-2.45.1
-
diff --git a/meta/recipes-core/systemd/systemd/0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch b/meta/recipes-core/systemd/systemd/0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch
deleted file mode 100644
index 08b70bf66d..0000000000
--- a/meta/recipes-core/systemd/systemd/0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bbceb4b339231124a0b004531b4b6838539432e6 Mon Sep 17 00:00:00 2001
-From: Johannes Schneider <johannes.schneider@leica-geosystems.com>
-Date: Thu, 20 Jun 2024 12:32:18 +0200
-Subject: [PATCH 03/27] meson: bpf: propagate 'sysroot' for cross compilation
-
-During cross-compilation of systemd, the compiler used to build the bpf's needs
-to be pointed at the correct include searchpath. Which can be done by passing
-the corresponding directory in through the cflags; for example in yocto/bitbake
-this would work: CFLAGS += "--sysroot=${STAGING_DIR_TARGET}"
-
-Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/33427]
-Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index ea4e12aa1c..52723bef09 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1739,6 +1739,7 @@ if conf.get('BPF_FRAMEWORK') == 1
-                 '-ffile-prefix-map=',
-                 '-fdebug-prefix-map=',
-                 '-fmacro-prefix-map=',
-+                '--sysroot=',
-         ]
- 
-         foreach opt : c_args
--- 
-2.45.1
-
diff --git a/meta/recipes-core/systemd/systemd_256.bb b/meta/recipes-core/systemd/systemd_256.4.bb
index 6e3985b94f..ee656c81e5 100644
--- a/meta/recipes-core/systemd/systemd_256.bb
+++ b/meta/recipes-core/systemd/systemd_256.4.bb
@@ -28,8 +28,6 @@ SRC_URI += " \
            file://systemd-pager.sh \
            file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
            file://0002-implment-systemd-sysv-install-for-OE.patch \
-           file://0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch \
-           file://0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch \
            "
 
 # patches needed by musl