summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-20Merge branch 'notsystemd/postmove' into tmp/postmovenotsystemd/postmoveLuke Shumaker
2017-05-20./tools/notsd-moveLuke Shumaker
2017-05-20nspawn: add missing -E to getopt_long (#4860)notsystemd/premoveWim de With
(cherry picked from commit 2e1f244efd2dfc1a60d032bef3d88b9ba6e0444b)
2017-05-20Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-20./tools/notsd-moveLuke Shumaker
2017-05-20place machine-id-setup.{c,h} in systemd-machine-id-setupLuke Shumaker
2017-05-12Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-12./tools/notsd-moveLuke Shumaker
2017-05-12add src/manpages/MakefileLuke Shumaker
2017-05-10Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-10./tools/notsd-moveLuke Shumaker
2017-05-10location of import-pubring.gpgLuke Shumaker
2017-05-10Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-10./tools/notsd-moveLuke Shumaker
2017-05-10fix typoLuke Shumaker
2017-05-10Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-10./tools/notsd-moveLuke Shumaker
2017-05-10makefile: have systemd-remote.tmpfiles be in correct makefileLuke Shumaker
2017-05-10Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-10./tools/notsd-moveLuke Shumaker
2017-05-10fixLuke Shumaker
2017-05-10Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-10./tools/notsd-moveLuke Shumaker
2017-05-10move/fixup backportLuke Shumaker
2017-05-10Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-10./tools/notsd-moveLuke Shumaker
2017-05-10sparse: avoid clash with __bitwise and __force from 4.10 linux/types.h (#5061)Lubomir Rintel
It also used __bitwise and __force. It seems easier to rename our versions since they are local to this one single header. Also, undefine them afteerwards, so that we don't pollute the preprocessor macro namespace. (cherry picked from commit dc66f33a16596c2886a24da12e56ec096214e124)
2017-05-06Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2017-05-06./tools/notsd-moveLuke Shumaker
2017-05-06Merge branch 'systemd/parabola' into notsystemd/premoveLuke Shumaker
2017-05-06Merge tag 'systemd/v232-8.parabola2' into systemd/parabolaHEADsystemd/parabolaLuke Shumaker
2017-05-06Merge tag 'systemd/v232-6.parabola1'systemd/v232-8.parabola2Luke Shumaker
2017-05-06build-sys: add check for gperf lookup function signature (#5055)Mike Gilbert
gperf-3.1 generates lookup functions that take a size_t length parameter instead of unsigned int. Test for this at configure time. Fixes: https://github.com/systemd/systemd/issues/5039
2016-12-17Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-12-17./tools/notsd-moveLuke Shumaker
2016-12-17update notsd-moveLuke Shumaker
2016-12-17Merge branch 'systemd/parabola' into notsystemd/premoveLuke Shumaker
# Conflicts: # Makefile.amp
2016-12-17Merge commit '0064dcc0fc1c6519d54c5a104990c1db94f19ddf' into notsystemd/premoveLuke Shumaker
# Conflicts: # system-preset/90-systemd.preset
2016-12-17Merge commit '58a6dd15582c038a25bd7059435833943e2e4617' into notsystemd/premoveLuke Shumaker
# Conflicts: # Makefile.am # src/boot/bootctl.c # system-preset/90-systemd.preset
2016-12-17Merge tag 'systemd/v232-6.parabola1' into systemd/parabolaLuke Shumaker
2016-12-17# Rename "Linux Boot Manager" -> "Systemd Boot Manager"systemd/v232-6.parabola1Luke Shumaker
sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c
2016-12-17FSDG: man/: Use FSDG operating systems as examples.Luke Shumaker
2016-12-17FSDG: systemd-resolved: Default to hostname "gnu-linux" instead of "linux"Luke Shumaker
2016-12-17FSDG: os-release: Default ID to "gnu-linux" instead of "linux".Luke Shumaker
As far as I can tell, no code in this repository actually uses the ID field, so this is just a man page change.
2016-12-17FSDG: os-release: Default to NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-12-17FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-12-17FSDG: man/: Refer to the operating system as GNU/Linux.Luke Shumaker
This is not a blind replacement of "Linux" with "GNU/Linux". In some cases, "Linux" is (correctly) used to refer to just the kernel. In others, it is in a string for which code must also be adjusted; these instances are not included in this commit.
2016-12-17Merge tag 'systemd/v232-4'systemd/v232-6Luke Shumaker
2016-12-17nspawn: don't hide --bind=/tmp/* mountsDave Reisner
This is a v232-applicable version of upstream c9fd987279a462e.
2016-12-17build-sys: check for lz4 in the old and new numbering scheme (#4717)Zbigniew Jędrzejewski-Szmek
lz4 upstream decided to switch to an incompatible numbering scheme (1.7.3 follows 131, to match the so version). PKG_CHECK_MODULES does not allow two version matches for the same package, so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for "new" numbers (anything below 10 is assume to be new), once for the "old" numbers (anything above >= 125). This assumes that the "new" versioning will not get to 10 to quickly. I think that's a safe assumption, lz4 is a mature project. Fixed #4690.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 08:33:23 +0000