shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-28 21:47:38 +03:00
Code

Merge pull request #18365 from DaanDeMeyer/update-man-rules-mkosi

Browse Source 
Fix update-man-rules usage with mkosi
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-01-25 14:05:56 +01:00 committed by GitHub
commit 172e8cf505
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
man/meson.build
View File

@ -217,16 +217,14 @@ endif
############################################################ ############################################################
if git.found() custom_target(
custom_target( 'update-man-rules',
'update-man-rules', output : 'update-man-rules',
output : 'update-man-rules', command : ['sh', '-c',
command : ['sh', '-c', 'cd @0@ && '.format(meson.build_root()) +
'cd @0@ && '.format(meson.build_root()) + 'python3 @0@/tools/update-man-rules.py $(find @0@ -wholename "*/man/*.xml") >t && '.format(project_source_root) +
'python3 @0@/tools/update-man-rules.py $(git ls-files ":/man/*.xml") >t && '.format(project_source_root) + 'mv t @0@/rules/meson.build'.format(meson.current_source_dir())],
'mv t @0@/rules/meson.build'.format(meson.current_source_dir())], depend_files : custom_entities_ent)
depend_files : custom_entities_ent)
endif
############################################################ ############################################################

2
mkosi.build
View File

@ -97,7 +97,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
fi fi
cd "$BUILDDIR" cd "$BUILDDIR"
ninja ninja "$@"
if [ "$WITH_TESTS" = 1 ] ; then if [ "$WITH_TESTS" = 1 ] ; then
for id in 1 2 3; do for id in 1 2 3; do
getent group $id > /dev/null || groupadd -g $id testgroup$id getent group $id > /dev/null || groupadd -g $id testgroup$id