mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
sdbus-c++-libsystemd: Avoid hard dependency on rsync
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+53
@@ -0,0 +1,53 @@
|
|||||||
|
From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||||
|
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 <alex.kanavin@gmail.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
|
############################################################
|
||||||
|
|
||||||
@@ -12,9 +12,10 @@ DEPENDS += "gperf-native gettext-native util-linux libcap"
|
|||||||
|
|
||||||
SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a"
|
SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a"
|
||||||
SRCBRANCH = "v243-stable"
|
SRCBRANCH = "v243-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://static-libsystemd-pkgconfig.patch \
|
||||||
SRC_URI += "file://static-libsystemd-pkgconfig.patch"
|
file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \
|
||||||
|
"
|
||||||
|
|
||||||
# patches needed by musl
|
# patches needed by musl
|
||||||
SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}"
|
SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}"
|
||||||
|
|||||||
Reference in New Issue
Block a user