> -----Original Message----- > From: [email protected] <openembedded- > [email protected]> On Behalf Of wangmy > Sent: den 16 november 2021 02:29 > To: [email protected] > Cc: Wang Mingyu <[email protected]> > Subject: [OE-core] [PATCH v2] systemd-boot: upgrade 249.5 -> 249.6
Please change the subject to: systemd, systemd-boot: upgrade 249.5 -> 249.6 //Peter > > 0001-meson-use-partial_dependency-to-get-include-director.patch > removed since it is included in 249.6 > > Signed-off-by: Wang Mingyu <[email protected]> > --- > ...md-boot_249.5.bb => systemd-boot_249.6.bb} | 0 > meta/recipes-core/systemd/systemd.inc | 2 +- > ...l_dependency-to-get-include-director.patch | 46 ------------------- > .../{systemd_249.5.bb => systemd_249.6.bb} | 1 - > 4 files changed, 1 insertion(+), 48 deletions(-) > rename meta/recipes-core/systemd/{systemd-boot_249.5.bb => systemd- > boot_249.6.bb} (100%) > delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-use- > partial_dependency-to-get-include-director.patch > rename meta/recipes-core/systemd/{systemd_249.5.bb => systemd_249.6.bb} > (99%) > > diff --git a/meta/recipes-core/systemd/systemd-boot_249.5.bb > b/meta/recipes-core/systemd/systemd-boot_249.6.bb > similarity index 100% > rename from meta/recipes-core/systemd/systemd-boot_249.5.bb > rename to meta/recipes-core/systemd/systemd-boot_249.6.bb > diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes- > core/systemd/systemd.inc > index 4e4cdd2e2f..f3ce32efc2 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 = "00b0393e65252bf631670604f58b844780b08c50" > +SRCREV = "deda69dad784f9c4367533555ff4d7bf6308c0ff" > SRCBRANCH = "v249-stable" > SRC_URI = "git://github.com/systemd/systemd- > stable.git;protocol=https;branch=${SRCBRANCH} \ > " > diff --git a/meta/recipes-core/systemd/systemd/0001-meson-use- > partial_dependency-to-get-include-director.patch b/meta/recipes- > core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include- > director.patch > deleted file mode 100644 > index 51ee5d8623..0000000000 > --- a/meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency- > to-get-include-director.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From 260e871fda979f040c94d2011545e8122bed68ca Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <[email protected]> > -Date: Mon, 18 Oct 2021 10:13:07 +0200 > -Subject: [PATCH] meson: use partial_dependency() to get include directory > - > -Getting the variable directly from pkg-config is prone to host > -contamination when building in sysroots as the > -compiler starts looking for the headers on the host in addition to > -the sysroot. > - > -Upstream-Status: Submitted > [https://github.com/systemd/systemd/pull/21027] > -Signed-off-by: Alexander Kanavin <[email protected]> > ---- > - meson.build | 9 ++++----- > - 1 file changed, 4 insertions(+), 5 deletions(-) > - > -diff --git a/meson.build b/meson.build > -index df53c6156d..38fb37dd75 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -2618,18 +2618,17 @@ endif > - > - if conf.get('ENABLE_LOCALED') == 1 > - if conf.get('HAVE_XKBCOMMON') == 1 > -- # logind will load libxkbcommon.so dynamically on its > own > -- deps = [libdl] > -- extra_includes = > [libxkbcommon.get_pkgconfig_variable('includedir')] > -+ # logind will load libxkbcommon.so dynamically on its > own, but we still > -+ # need to specify where the headers are > -+ deps = [libdl, > libxkbcommon.partial_dependency(compile_args: true)] > - else > - deps = [] > -- extra_includes = [] > - endif > - > - executable( > - 'systemd-localed', > - systemd_localed_sources, > -- include_directories : includes + extra_includes, > -+ include_directories : includes, > - link_with : [libshared], > - dependencies : deps, > - install_rpath : rootlibexecdir, > --- > -2.20.1 > - > diff --git a/meta/recipes-core/systemd/systemd_249.5.bb b/meta/recipes- > core/systemd/systemd_249.6.bb > similarity index 99% > rename from meta/recipes-core/systemd/systemd_249.5.bb > rename to meta/recipes-core/systemd/systemd_249.6.bb > index 8bdc0ca028..242a53d22a 100644 > --- a/meta/recipes-core/systemd/systemd_249.5.bb > +++ b/meta/recipes-core/systemd/systemd_249.6.bb > @@ -25,7 +25,6 @@ SRC_URI += "file://touchscreen.rules \ > file://0003-implment-systemd-sysv-install-for-OE.patch \ > file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed- > slash.patch \ > file://0001-test-parse-argument-Include-signal.h.patch \ > - file://0001-meson-use-partial_dependency-to-get-include- > director.patch \ > " > > # patches needed by musl > -- > 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158342): https://lists.openembedded.org/g/openembedded-core/message/158342 Mute This Topic: https://lists.openembedded.org/mt/87085411/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
