Merge pull request #69741 from eadwu/linux_rpi/fix-overrides

linux_rpi: fix overrides
This commit is contained in:
Matthew Bauer 2019-11-07 17:09:32 -05:00 committed by GitHub
commit 0aaab30d2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -33,7 +33,7 @@ lib.overrideDerivation (buildLinux (args // {
platforms = with lib.platforms; [ arm aarch64 ]; platforms = with lib.platforms; [ arm aarch64 ];
hydraPlatforms = [ "aarch64-linux" ]; hydraPlatforms = [ "aarch64-linux" ];
}; };
})) (oldAttrs: { } // (args.argsOverride or {}))) (oldAttrs: {
postConfigure = '' postConfigure = ''
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion. # The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'