From d207fdfc575cd757afd2a88a47ae98c249174ced Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 12 Sep 2024 11:06:46 +0200 Subject: [PATCH] Revert "systemd-boot: meson: Fix build with --optimization=plain" The patch was officially included in systemd v252, we now use v255.4. This reverts commit c5c0c7c966e3f449c1b3565675e289867bf02323. https://onedigi.atlassian.net/browse/DEL-9011 Signed-off-by: Gabriel Valcazar --- ...son-Fix-build-with-optimizatio-plain.patch | 28 ------------------- .../systemd/systemd-boot_250.5.bbappend | 5 ---- 2 files changed, 33 deletions(-) delete mode 100644 meta-digi-dey/recipes-core/systemd/systemd-boot/0001-meson-Fix-build-with-optimizatio-plain.patch delete mode 100644 meta-digi-dey/recipes-core/systemd/systemd-boot_250.5.bbappend diff --git a/meta-digi-dey/recipes-core/systemd/systemd-boot/0001-meson-Fix-build-with-optimizatio-plain.patch b/meta-digi-dey/recipes-core/systemd/systemd-boot/0001-meson-Fix-build-with-optimizatio-plain.patch deleted file mode 100644 index 158586d0d..000000000 --- a/meta-digi-dey/recipes-core/systemd/systemd-boot/0001-meson-Fix-build-with-optimizatio-plain.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Janssen -Date: Sun, 9 Oct 2022 17:16:12 +0200 -Subject: [PATCH] meson: Fix build with --optimization=plain - -Note that -O0 is deliberately filtered out as we have to compile with at -least -O1 due to #24202. - -Fixes: #24323 -(cherry picked from commit 7aa4762ce274a1c9a59902b972fa4fdee1b22715) -(cherry picked from commit 23d66a03dec8640e8f8603686c6d0a739084a823) ---- - src/boot/efi/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 22432e2cba..ae3f53a044 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -203,7 +203,7 @@ endif - if get_option('debug') and get_option('mode') == 'developer' - efi_cflags += ['-ggdb', '-DEFI_DEBUG'] - endif --if get_option('optimization') != '0' -+if get_option('optimization') in ['1', '2', '3', 's', 'g'] - efi_cflags += ['-O' + get_option('optimization')] - endif - if get_option('b_ndebug') == 'true' or ( --- diff --git a/meta-digi-dey/recipes-core/systemd/systemd-boot_250.5.bbappend b/meta-digi-dey/recipes-core/systemd/systemd-boot_250.5.bbappend deleted file mode 100644 index 455e22310..000000000 --- a/meta-digi-dey/recipes-core/systemd/systemd-boot_250.5.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2024, Digi International Inc. - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI += "file://0001-meson-Fix-build-with-optimizatio-plain.patch"