<div dir="auto"><div>Please ignore. I need to fix the commit message<br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, 16 Feb 2020, 09:07 Alex Kiernan, <<a href="mailto:alex.kiernan@gmail.com">alex.kiernan@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Drop all systemd-boot patches and use MESON_CROSS_... configuration<br>
instead to pick up EFI cc and objcopy. For EFI ld, we can use the<br>
command line efi-ld option, but have to ensure it's something which can<br>
be exec'd directly.<br>
<br>
Commits from v244-stable:<br>
<br>
c4280c342bbf Revert "Support Plugable UD-PRO8 dock"<br>
bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device<br>
77c04ce5c270 hwdb: update to v245-rc1<br>
b4eb8848240c Fix typo in function name<br>
e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it<br>
83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages<br>
5926f9f1723f polkit: use structured initialization<br>
0697d0d972c8 polkit: on async pk requests, re-validate action/details<br>
2589995acdb2 polkit: reuse some common bus message appending code<br>
5b2442d5c3ec bus-polkit: rename return error parameter to ret_error<br>
0a19ff7004e4 shared: split out polkit stuff from bus-util.c → bus-polkit.c<br>
1325dfb5778d test: adapt to the new capsh format<br>
3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11<br>
3034855a5b62 presets: "disable" all passive targets by default<br>
c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value<br>
6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease<br>
0ed6cda28dff network: fix implicit type conversion warning by GCC-10<br>
f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf<br>
ddc5dca8a73b sd-boot: fix typo<br>
2bbbe9ae41ab test: Synchronize journal before reading from it<br>
072485d661d7 sd-bus: fix introspection bug in signal parameter names<br>
80af3cf5e36b efi: fix build.<br>
d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs<br>
e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument<br>
82dd4caf014c Documentation update for x-systemd.{before,after}<br>
a60459764d9d man: fix typo in systemd.netdev Xfrm example<br>
fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance<br>
af0e630693fa resolved: drop DNSSEC root key that is not valid anymore<br>
ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string<br>
536ef6d72bc6 test: add test for <a href="https://github.com/systemd/systemd/issues/14560" rel="noreferrer noreferrer" target="_blank">https://github.com/systemd/systemd/issues/14560</a><br>
b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default<br>
a1561a08f2d5 pkgconf: add full generator paths<br>
e5f2d11489ec tree-wide: we forgot to destroy some bus errors<br>
ea67fd42067b mount: make checks on perpetual mount units more lax<br>
2f23c648bce4 core: never allow perpetual units to be masked<br>
9ba11dffb09a typo: "May modify to" -> "May modify"<br>
84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode<br>
4c2d72b53091 sysctl: downgrade message when we have no permission<br>
c001a285a3a2 Clarify journald.conf MaxLevelStore documentation<br>
45d52c7615fd logind: refuse overriding idle hint on tty sessions<br>
b1a0be45b4ee cgroup: update only siblings that got realized once<br>
e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted"<br>
d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596)<br>
cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse<br>
1320aa92dc0a core: fix re-realization of cgroup siblings<br>
14164ec6bc77 core: propagate service state to socket in more load states<br>
c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH<br>
26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently<br>
377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions<br>
7d5060d53994 man: fix option name<br>
98c03090274a Support Plugable UD-PRO8 dock<br>
e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat<br>
7057fe863007 man: fix documentation of IBM VIO device naming<br>
f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD<br>
1faf5dde4d4a boot: fix osrel parser<br>
65d247af1786 udev: do not use exact match of file permission<br>
6da978f89b48 network: lower the log-level of harmless message<br>
5d8a614f926c hwdb: ignore keys added in kernel 5.5<br>
8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb<br>
b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths<br>
945f3a231f6f systemd-analyze: fixed typo in documentation<br>
2c8ae283b0ee test-condition: fix group check condition<br>
6b48479f4582 umount: show correct error message<br>
faba5b2ba8c9 Revert "Drop dbus activation stub service"<br>
3dd98f1998f9 man: add section about user manager units<br>
1c80a8ced006 man: add remote-*.targets to the bootup sequence<br>
9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW<br>
561923291383 [man] note which UID ranges will get user journals<br>
588a23ef2684 [man] fix URL<br>
0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists<br>
93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute=<br>
a8ad020ea0ba shared/dropin: fix assert for invalid drop-in<br>
946cdba156dd initrd: make udev cleanup service confict trigger and settle too<br>
c0a8a92e6027 man: we support growing xfs too these days<br>
608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not<br>
cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw<br>
73435b219553 systemctl: show what verbs support --dry-run in the help page<br>
dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout<br>
0757ad565573 shared/install: log syntax error for invalid DefaultInstance=<br>
d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values<br>
<br>
Signed-off-by: Alex Kiernan <<a href="mailto:alex.kiernan@gmail.com" target="_blank" rel="noreferrer">alex.kiernan@gmail.com</a>><br>
---<br>
<br>
Changes in v5:<br>
- use multiple cross-file support to inject the necessary binaries into<br>
meson<br>
<br>
Changes in v4:<br>
- add missed commit to join EFI ldflags after stripping command<br>
<br>
Changes in v3:<br>
- use MESON_CROSS_... for systemd-boot<br>
<br>
Changes in v2:<br>
- fix SRC_URI now v244.3 tag exists on v244-stable<br>
<br>
...<a href="http://md-boot_244.1.bb" rel="noreferrer noreferrer" target="_blank">md-boot_244.1.bb</a> => <a href="http://systemd-boot_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.3.bb</a>} | 26 +++----<br>
...<a href="http://md-conf_244.1.bb" rel="noreferrer noreferrer" target="_blank">md-conf_244.1.bb</a> => <a href="http://systemd-conf_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-conf_244.3.bb</a>} | 0<br>
meta/recipes-core/systemd/systemd.inc | 2 +-<br>
...c-and-efi_ld-correctly-when-cross-co.patch | 62 ---------------<br>
...on-print-EFI-CC-configuration-nicely.patch | 33 --------<br>
...meson-use-an-array-option-for-efi-cc.patch | 77 -------------------<br>
...fi-objcopy-option-to-specify-objcopy.patch | 48 ------------<br>
.../{<a href="http://systemd_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.1.bb</a> => <a href="http://systemd_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.3.bb</a>} | 0<br>
8 files changed, 14 insertions(+), 234 deletions(-)<br>
rename meta/recipes-core/systemd/{<a href="http://systemd-boot_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.1.bb</a> => <a href="http://systemd-boot_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.3.bb</a>} (71%)<br>
rename meta/recipes-core/systemd/{<a href="http://systemd-conf_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd-conf_244.1.bb</a> => <a href="http://systemd-conf_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-conf_244.3.bb</a>} (100%)<br>
delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch<br>
delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch<br>
delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch<br>
delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch<br>
rename meta/recipes-core/systemd/{<a href="http://systemd_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.1.bb</a> => <a href="http://systemd_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.3.bb</a>} (100%)<br>
<br>
diff --git a/meta/recipes-core/systemd/<a href="http://systemd-boot_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.1.bb</a> b/meta/recipes-core/systemd/<a href="http://systemd-boot_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.3.bb</a><br>
similarity index 71%<br>
rename from meta/recipes-core/systemd/<a href="http://systemd-boot_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.1.bb</a><br>
rename to meta/recipes-core/systemd/<a href="http://systemd-boot_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.3.bb</a><br>
index 515abc289bef..f92c63981043 100644<br>
--- a/meta/recipes-core/systemd/<a href="http://systemd-boot_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.1.bb</a><br>
+++ b/meta/recipes-core/systemd/<a href="http://systemd-boot_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-boot_244.3.bb</a><br>
@@ -5,27 +5,27 @@ require conf/image-uefi.conf<br>
<br>
DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"<br>
<br>
-# NOTE: These three patches are in theory not needed, but we haven't<br>
-# figured out how to correctly pass efi-cc parameter if it's an array.<br>
-SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \<br>
- file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \<br>
- file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \<br>
- file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \<br>
- "<br>
-<br>
inherit meson pkgconfig gettext<br>
inherit deploy<br>
<br>
-EFI_CC ?= "${CC}"<br>
+LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} "<br>
+<br>
+do_write_config[vardeps] += "CC OBJCOPY"<br>
+do_write_config_append() {<br>
+ cat >${WORKDIR}/meson-${PN}.cross <<EOF<br>
+[binaries]<br>
+efi_cc = ${@meson_array('CC', d)}<br>
+objcopy = ${@meson_array('OBJCOPY', d)}<br>
+EOF<br>
+}<br>
+<br>
EXTRA_OEMESON += "-Defi=true \<br>
-Dgnu-efi=true \<br>
-Defi-includedir=${STAGING_INCDIR}/efi \<br>
- -Defi-ldsdir=${STAGING_LIBDIR} \<br>
-Defi-libdir=${STAGING_LIBDIR} \<br>
+ -Defi-ld=${@ d.getVar('LD').split()[0]} \<br>
-Dman=false \<br>
- -Defi-cc='${EFI_CC}' \<br>
- -Defi-ld='${LD}' \<br>
- -Defi-objcopy='${OBJCOPY}' \<br>
+ --cross-file ${WORKDIR}/meson-${PN}.cross \<br>
"<br>
<br>
# install to the image as boot*.efi if its the EFI_PROVIDER,<br>
diff --git a/meta/recipes-core/systemd/<a href="http://systemd-conf_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd-conf_244.1.bb</a> b/meta/recipes-core/systemd/<a href="http://systemd-conf_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-conf_244.3.bb</a><br>
similarity index 100%<br>
rename from meta/recipes-core/systemd/<a href="http://systemd-conf_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd-conf_244.1.bb</a><br>
rename to meta/recipes-core/systemd/<a href="http://systemd-conf_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd-conf_244.3.bb</a><br>
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc<br>
index 8c05a96ecc4f..e73b397b5d64 100644<br>
--- a/meta/recipes-core/systemd/systemd.inc<br>
+++ b/meta/recipes-core/systemd/systemd.inc<br>
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"<br>
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \<br>
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"<br>
<br>
-SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66"<br>
+SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6"<br>
SRCBRANCH = "v244-stable"<br>
SRC_URI = "git://<a href="http://github.com/systemd/systemd-stable.git;protocol=git;branch=$%7BSRCBRANCH%7D" rel="noreferrer noreferrer" target="_blank">github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}</a>"<br>
<br>
diff --git a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch<br>
deleted file mode 100644<br>
index e2e19ba06810..000000000000<br>
--- a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch<br>
+++ /dev/null<br>
@@ -1,62 +0,0 @@<br>
-From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001<br>
-From: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" target="_blank" rel="noreferrer">Qi.Chen@windriver.com</a>><br>
-Date: Tue, 27 Feb 2018 21:42:23 -0800<br>
-Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling<br>
-<br>
-When cross-compiling, efi_cc and efi_ld may take the form of<br>
-'xxx-gcc --sysroot=xxx', and this would cause run_command and<br>
-the alike fail.<br>
-<br>
-Fix to split them to make commands run correctly.<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" target="_blank" rel="noreferrer">Qi.Chen@windriver.com</a>><br>
----<br>
- src/boot/efi/meson.build | 16 +++++++++++++---<br>
- 1 file changed, 13 insertions(+), 3 deletions(-)<br>
-<br>
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build<br>
-index 992a3ba4c..9f9ec4911 100644<br>
---- a/src/boot/efi/meson.build<br>
-+++ b/src/boot/efi/meson.build<br>
-@@ -157,7 +157,7 @@ if have_gnu_efi<br>
- o_file = custom_target(file + '.o',<br>
- input : file,<br>
- output : file + '.o',<br>
-- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@']<br>
-+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@']<br>
- + compile_args,<br>
- depend_files : efi_headers)<br>
- if (common_sources + systemd_boot_sources).contains(file)<br>
-@@ -168,7 +168,17 @@ if have_gnu_efi<br>
- endif<br>
- endforeach<br>
- <br>
-- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip()<br>
-+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name'<br>
-+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0]<br>
-+ find_libgcc_args = []<br>
-+ cmd_args_all = find_libgcc_cmd_all.split()<br>
-+ foreach arg : cmd_args_all<br>
-+ if arg != find_libgcc_cmd<br>
-+ find_libgcc_args += arg<br>
-+ endif<br>
-+ endforeach<br>
-+<br>
-+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip()<br>
- systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(EFI_MACHINE_TYPE_NAME)<br>
- stub_efi_name = 'linux@0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME)<br>
- no_undefined_symbols = find_program('no-undefined-symbols.sh')<br>
-@@ -179,7 +189,7 @@ if have_gnu_efi<br>
- tuple[0],<br>
- input : tuple[2],<br>
- output : tuple[0],<br>
-- command : [efi_ld, '-o', '@OUTPUT@'] +<br>
-+ command : efi_ld.split() + ['-o', '@OUTPUT@'] +<br>
- efi_ldflags + tuple[2] +<br>
- ['-lefi', '-lgnuefi', libgcc_file_name])<br>
- <br>
--- <br>
-2.13.0<br>
-<br>
diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch<br>
deleted file mode 100644<br>
index ed14e25bce66..000000000000<br>
--- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch<br>
+++ /dev/null<br>
@@ -1,33 +0,0 @@<br>
-From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001<br>
-From: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" target="_blank" rel="noreferrer">Qi.Chen@windriver.com</a>><br>
-Date: Tue, 26 Feb 2019 14:27:49 +0800<br>
-Subject: [PATCH] Revert "meson: print EFI CC configuration nicely"<br>
-<br>
-This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293.<br>
-<br>
-This patch is here because we haven't figured out how to pass<br>
-parameter to efi-cc if it's an array in systemd-boot recipe.<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" target="_blank" rel="noreferrer">Qi.Chen@windriver.com</a>><br>
----<br>
- meson.build | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/meson.build b/meson.build<br>
-index 70fb218..30df834 100644<br>
---- a/meson.build<br>
-+++ b/meson.build<br>
-@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1<br>
- if have_gnu_efi<br>
- status += [<br>
- 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME),<br>
-- 'EFI CC @0@'.format(' '.join(efi_cc)),<br>
-+ 'EFI CC @0@'.format(efi_cc),<br>
- 'EFI lib directory: @0@'.format(efi_libdir),<br>
- 'EFI lds directory: @0@'.format(efi_ldsdir),<br>
- 'EFI include directory: @0@'.format(efi_incdir)]<br>
--- <br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch<br>
deleted file mode 100644<br>
index 0d2ebf62bd1f..000000000000<br>
--- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch<br>
+++ /dev/null<br>
@@ -1,77 +0,0 @@<br>
-From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001<br>
-From: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" target="_blank" rel="noreferrer">Qi.Chen@windriver.com</a>><br>
-Date: Tue, 26 Feb 2019 14:17:25 +0800<br>
-Subject: [PATCH] Revert "meson: use an array option for efi-cc"<br>
-<br>
-This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e.<br>
-<br>
-This patch is here because we haven't figured out how to pass<br>
-parameter to efi-cc if it's an array in systemd-boot recipe.<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" target="_blank" rel="noreferrer">Qi.Chen@windriver.com</a>><br>
----<br>
- meson_options.txt | 2 +-<br>
- src/boot/efi/meson.build | 11 ++++++-----<br>
- 2 files changed, 7 insertions(+), 6 deletions(-)<br>
-<br>
-diff --git a/meson_options.txt b/meson_options.txt<br>
-index 044bb79..3d28bfd 100644<br>
---- a/meson_options.txt<br>
-+++ b/meson_options.txt<br>
-@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'],<br>
- <br>
- option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'],<br>
- description : 'gnu-efi support for sd-boot')<br>
--option('efi-cc', type : 'array',<br>
-+option('efi-cc', type : 'string',<br>
- description : 'the compiler to use for EFI modules')<br>
- option('efi-ld', type : 'string',<br>
- description : 'the linker to use for EFI modules')<br>
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build<br>
-index 2140151..d8db3a1 100644<br>
---- a/src/boot/efi/meson.build<br>
-+++ b/src/boot/efi/meson.build<br>
-@@ -34,8 +34,8 @@ stub_sources = '''<br>
- <br>
- if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'<br>
- efi_cc = get_option('efi-cc')<br>
-- if efi_cc.length() == 0<br>
-- efi_cc = cc.cmd_array()<br>
-+ if efi_cc == ''<br>
-+ efi_cc = ' '.join(cc.cmd_array())<br>
- endif<br>
- efi_ld = get_option('efi-ld')<br>
- if efi_ld == ''<br>
-@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'<br>
- <br>
- efi_libdir = get_option('efi-libdir')<br>
- if efi_libdir == ''<br>
-- ret = run_command(efi_cc + ['-print-multi-os-directory'])<br>
-+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc)<br>
-+ ret = run_command('sh', '-c', cmd)<br>
- if ret.returncode() == 0<br>
- path = join_paths('/usr/lib', ret.stdout().strip())<br>
- ret = run_command('realpath', '-e', path)<br>
-@@ -152,7 +153,7 @@ if have_gnu_efi<br>
- o_file = custom_target(file + '.o',<br>
- input : file,<br>
- output : file + '.o',<br>
-- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@']<br>
-+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@']<br>
- + compile_args,<br>
- depend_files : efi_headers)<br>
- if (common_sources + systemd_boot_sources).contains(file)<br>
-@@ -163,7 +164,7 @@ if have_gnu_efi<br>
- endif<br>
- endforeach<br>
- <br>
-- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip()<br>
-+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip()<br>
- systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(EFI_MACHINE_TYPE_NAME)<br>
- stub_efi_name = 'linux@0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME)<br>
- no_undefined_symbols = find_program('no-undefined-symbols.sh')<br>
--- <br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch<br>
deleted file mode 100644<br>
index 7d764b4115eb..000000000000<br>
--- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch<br>
+++ /dev/null<br>
@@ -1,48 +0,0 @@<br>
-From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank" rel="noreferrer">raj.khem@gmail.com</a>><br>
-Date: Tue, 6 Aug 2019 03:10:20 +0000<br>
-Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy<br>
-<br>
-This helps in cross compiling for x86 target on a aarch64 host e.g.<br>
-Fixes<br>
-TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target<br>
-<br>
-Upstream-Status: Pending<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank" rel="noreferrer">raj.khem@gmail.com</a>><br>
----<br>
- meson_options.txt | 2 ++<br>
- src/boot/efi/meson.build | 5 ++++-<br>
- 2 files changed, 6 insertions(+), 1 deletion(-)<br>
-<br>
-diff --git a/meson_options.txt b/meson_options.txt<br>
-index d4ec37dda2..dc1c96e112 100644<br>
---- a/meson_options.txt<br>
-+++ b/meson_options.txt<br>
-@@ -296,6 +296,8 @@ option('efi-cc', type : 'array',<br>
- description : 'the compiler to use for EFI modules')<br>
- option('efi-ld', type : 'string',<br>
- description : 'the linker to use for EFI modules')<br>
-+option('efi-objcopy', type : 'string',<br>
-+ description : 'the objcopy to use for EFI')<br>
- option('efi-libdir', type : 'string',<br>
- description : 'path to the EFI lib directory')<br>
- option('efi-ldsdir', type : 'string',<br>
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build<br>
-index 0ae3191635..5a7137bc84 100644<br>
---- a/src/boot/efi/meson.build<br>
-+++ b/src/boot/efi/meson.build<br>
-@@ -88,7 +88,10 @@ if have_gnu_efi<br>
- output : 'efi_config.h',<br>
- configuration : efi_conf)<br>
- <br>
-- objcopy = find_program('objcopy')<br>
-+ objcopy = get_option('efi-objcopy')<br>
-+ if objcopy == ''<br>
-+ objcopy = find_program('objcopy', required: true)<br>
-+ endif<br>
- <br>
- efi_ldsdir = get_option('efi-ldsdir')<br>
- arch_lds = 'elf_@0@_efi.lds'.format(gnu_efi_path_arch)<br>
--- <br>
-2.17.1<br>
-<br>
diff --git a/meta/recipes-core/systemd/<a href="http://systemd_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.1.bb</a> b/meta/recipes-core/systemd/<a href="http://systemd_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.3.bb</a><br>
similarity index 100%<br>
rename from meta/recipes-core/systemd/<a href="http://systemd_244.1.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.1.bb</a><br>
rename to meta/recipes-core/systemd/<a href="http://systemd_244.3.bb" rel="noreferrer noreferrer" target="_blank">systemd_244.3.bb</a><br>
-- <br>
2.17.1<br>
<br>
</blockquote></div></div></div>