adv_cmds archive actually contains BSDmakefile, not BSDMakefile. While
that probably doesn't matter in default installations, it does matter
for case-sensitive filesystems.
The update is basically just one additional commit, which was an
upstream cherry-pick pushed at NixOS/systemd#3 and it fixes
systemd-detect-virt with VirtualBox so that services with
ConditionVirtualization set to "oracle" will work properly.
I've tested this with the "virtualbox" NixOS VM test, which was failing
since the update to version 228.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This reverts commit 79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.
The commit was from an upstream commit anyway and has since been applied
to mainline.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Regression introduced by 03a3a905b9c547f5ac687f341fb8f1ce636f2959.
Our default config includes all modules and since torvalds/linux@47ca6ec
this results in a regression due to in a circular dependency between
libcfs and LNet:
depmod: ERROR: Found 2 modules in dependency cycles!
depmod: ERROR: Cycle detected: lnet -> libcfs -> lnet
The discussion regarding this in the LKML is here:
https://lkml.org/lkml/2015/11/2/388
So this adds a patch which is not yet included in mainline and has been
submitted to the LKML at:
https://lkml.org/lkml/2015/11/6/987
Built successfully via "nix-build -A linux-testing".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This reverts commit 2441e002e26d60e62306ae03a2c0d42fe156f129. The
motivation for removing them was not very convincing. Also, we need
3.14 on some Hydra build machines.
Regression introduced by 050bebb8c47051b8d7de3dfee5807f11c9baff69.
It's essentially an upgrade to CMake 3.4.0, which breaks the build
because it seems that in CMake 3.3.x, the check_include_files() command
was implicitly included (haven't found out about why exactly).
So we're now just adding an import for CheckIncludeFiles in addition to
CheckIncludeFile, so that we have both commands (the plural and the
singular variant) available.
My original goal was to use brndnmtthws/conky@3a574ba, but this breaks
the build as well, because check_include_files doesn't accept additional
compile flags.
However, this is needed if building with wireless support, because
including iwlib.h needs -D_GNU_SOURCE set and check_include_files
doesn't do that.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
