diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/git-prune | 2 | ||||
| -rw-r--r-- | tools/make-man-rules.py | 8 | ||||
| -rwxr-xr-x | tools/notsd-fixup | 6 | ||||
| -rwxr-xr-x | tools/notsd-move | 1 | ||||
| -rwxr-xr-x | tools/test-header.sh | 2 |
5 files changed, 14 insertions, 5 deletions
diff --git a/tools/git-prune b/tools/git-prune new file mode 100755 index 0000000000..d5a36dd4ee --- /dev/null +++ b/tools/git-prune @@ -0,0 +1,2 @@ +#!/bin/sh +git tag|grep '^elogind/v[0-9]*$'|xargs -n1 git tag -d diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py index 5e61917d60..0b73ab04f7 100644 --- a/tools/make-man-rules.py +++ b/tools/make-man-rules.py @@ -24,16 +24,16 @@ import os.path from xml_helper import * SECTION = '''\ -MANPAGES += \\ +sdman.MANPAGES += \\ {manpages} -MANPAGES_ALIAS += \\ +sdman.MANPAGES_ALIAS += \\ {aliases} {rules} {htmlrules} ''' CONDITIONAL = '''\ -if {conditional} +ifneq ($({conditional}),) ''' \ + SECTION + \ '''\ @@ -54,7 +54,7 @@ HEADER = '''\ HTML_ALIAS_RULE = '''\ {}.html: {}.html - $(html-alias) + $(sdman.html-alias) ''' FOOTER = '''\ diff --git a/tools/notsd-fixup b/tools/notsd-fixup index 71b3bf4dfa..820d2fec17 100755 --- a/tools/notsd-fixup +++ b/tools/notsd-fixup @@ -15,6 +15,12 @@ main() { find "$@" -type f -name Makefile -print0 | xargs -r0 sh -c "$0--makefiles \"\$@\" || exit 255" -- + # GNUmakefiles + find "$@" -type l -name GNUmakefile -delete + # It's OK for the top-level one to fail + find "$@" -type f -name Makefile -printf '%h\0' | + xargs -r0 -I {} ln -s -t {} GNUmakefile + # C includes rm -rf -- "$0"--includes.cache find "$@" \( -name '*.h' -o -name '*.c' -o -name '*.gperf' -o -name '*.gperf.m4' \) -type f -print0 | diff --git a/tools/notsd-move b/tools/notsd-move index 3d3205262f..ad638a2e63 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -663,6 +663,7 @@ move_files() ( src/libcore \ src/systemctl \ src/systemd \ + src/systemd-cgroups-agent \ src/systemd-shutdown grp src/grp-system/grp-utils \ src/systemd-analyze \ diff --git a/tools/test-header.sh b/tools/test-header.sh index b11285af7d..d63177bde0 100755 --- a/tools/test-header.sh +++ b/tools/test-header.sh @@ -1,2 +1,2 @@ #!/bin/bash -gcc -c -o /dev/null -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/libmount $(find src -type d |sed 's|^|-I&|') -include ./config.h -include "$(realpath -- "$1")" test-header.c +gcc -c -o /dev/null -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/libmount $(find src -type d |sed 's|^|-I&|') -include ./config.h -include "$(realpath -- "$1")" "$(dirname -- "$0")"/test-header.c |