From 4932616b69b957e3a876541a579b79cb3f83306f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 May 2021 20:58:10 -0700 Subject: sdbus-c++-libsystemd: Avoid hard dependency on rsync Signed-off-by: Khem Raj (cherry picked from commit dcb8ab6169bd93440137bbd4703171987ecd3a15) [Fixup for hardknott context] Signed-off-by: Armin Kuster --- .../7c5fd25119a495009ea62f79e5daec34cc464628.patch | 53 ++++++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 7 +-- 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file mode 100644 index 0000000000..ae449791f1 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch @@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +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 +--- + 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-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index c52024130e..59d6f352c8 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -12,9 +12,10 @@ DEPENDS += "gperf-native gettext-native util-linux libcap" SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" SRCBRANCH = "v243-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" - -SRC_URI += "file://static-libsystemd-pkgconfig.patch" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ + file://static-libsystemd-pkgconfig.patch \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + " # patches needed by musl SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" -- cgit 1.2.3-korg