diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 15:50:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 15:50:48 -0400 |
| commit | 93010a5bde39a26d51751edee9276c4c514f7bf4 (patch) | |
| tree | e52a5b8f37d2f2d7d24c21ff3dc55e3c9c4f7305 | |
| parent | d3e52cd56c638be8fd8fa332a25107a3ecc2346d (diff) | |
move/fixup backport
| -rwxr-xr-x | tools/notsd-fixup | 6 | ||||
| -rwxr-xr-x | tools/notsd-move | 3 |
2 files changed, 8 insertions, 1 deletions
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..30f63d354f 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -359,7 +359,7 @@ move_files() ( src/login/*.rules \ src/login/*.rules.in \ src/login/org.* - mv -T src/login/systemd-user.m4 src/systemd-logind/systemd-user.pam.m4 + mv -T src/login/systemd-user.m4 src/pam_systemd/systemd-user.pam.m4 rmdir src/login # src/timedate => src/... @@ -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 \ |