On Wed, May 5, 2021 at 8:19 AM Alexander Kanavin <[email protected]> wrote:
>
> Signed-off-by: Alexander Kanavin <[email protected]>
> ---
> ...d25119a495009ea62f79e5daec34cc464628.patch | 53 +++++++++++++++++++
> meta/recipes-core/systemd/systemd.inc | 4 +-
> 2 files changed, 56 insertions(+), 1 deletion(-)
> create mode 100644
> meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch
>
> diff --git
> a/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch
>
> b/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch
> new file mode 100644
> index 0000000000..ae449791f1
> --- /dev/null
> +++
> b/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch
> @@ -0,0 +1,53 @@
> +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]>
> +Date: Mon, 12 Apr 2021 14:03:32 +0200
> +Subject: [PATCH] meson: do not fail if rsync is not installed with meson
> + 0.57.2
> +
> +https://github.com/mesonbuild/meson/issues/8641
> +
> +Our CI started to fail. Even if the change is reverted in meson,
> +we need a quick workaround here.
> +
> +Upstream-Status: Backport
> +Signed-off-by: Alexander Kanavin <[email protected]>
> +---
> + man/meson.build | 25 ++++++++++++++-----------
> + 1 file changed, 14 insertions(+), 11 deletions(-)
> +
> +diff --git a/man/meson.build b/man/meson.build
> +index 3cae8446cda..f9c4b83dc81 100644
> +--- a/man/meson.build
> ++++ b/man/meson.build
> +@@ -184,17 +184,20 @@ html = custom_target(
> + depends : html_pages,
> + command : ['echo'])
> +
> +-run_target(
> +- 'doc-sync',
> +- depends : man_pages + html_pages,
> +- command : ['rsync', '-rlv',
> +- '--delete-excluded',
> +- '--include=man',
> +- '--include=*.html',
> +- '--exclude=*',
> +- '--omit-dir-times',
> +- meson.current_build_dir(),
> +- get_option('www-target')])
> ++rsync = find_program('rsync', required : false)
> ++if rsync.found()
> ++ run_target(
> ++ 'doc-sync',
> ++ depends : man_pages + html_pages,
> ++ command : [rsync, '-rlv',
> ++ '--delete-excluded',
> ++ '--include=man',
> ++ '--include=*.html',
> ++ '--exclude=*',
> ++ '--omit-dir-times',
> ++ meson.current_build_dir(),
> ++ get_option('www-target')])
> ++endif
> +
> + ############################################################
> +
> diff --git a/meta/recipes-core/systemd/systemd.inc
> b/meta/recipes-core/systemd/systemd.inc
> index 7d3b3064ba..3a919fd82b 100644
> --- a/meta/recipes-core/systemd/systemd.inc
> +++ b/meta/recipes-core/systemd/systemd.inc
> @@ -16,6 +16,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
>
> SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5"
> SRCBRANCH = "v247-stable"
> -SRC_URI =
> "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
> +SRC_URI =
> "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}
> \
> + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \
> +"
the patch should be added in systemd_247.6.bb
>
> S = "${WORKDIR}/git"
> --
> 2.31.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#151333):
https://lists.openembedded.org/g/openembedded-core/message/151333
Mute This Topic: https://lists.openembedded.org/mt/82607023/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
