diff options
author | Matthieu Coudron <mattator@gmail.com> | 2018-01-29 03:50:18 +0900 |
---|---|---|
committer | Matthieu Coudron <mattator@gmail.com> | 2018-02-07 10:07:13 +0900 |
commit | f620b1b693ec25af1aadcb0508710dc22e92453a (patch) | |
tree | 9b5260147aed77ad4e3696e1b0c400fbe95734fc /pkgs/os-specific/linux/kernel/update.sh | |
parent | d80057f245e65e5ef07ec7e488941ac3d4fc3ee3 (diff) |
kernel: buildLinux replaces import ./generic.nix
- defined buildLinux as generic.nix instead of manual-config.nix. This makes kernel derivations a tad more similar to your typical derivations. - moved $buildRoot to within the source folder, this way it doesn't have to be created before the unpackPhase and make it easier to work on kernel source without running the unpackPhase
Diffstat (limited to 'pkgs/os-specific/linux/kernel/update.sh')
-rwxr-xr-x | pkgs/os-specific/linux/kernel/update.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index d9db7f9f916cf..878c3c14fe473 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -50,13 +50,13 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do # Rewrite the expression sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#import ./generic.nix (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE fi - sed -i "\#import ./generic.nix (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE git commit -m "kernel: $OLDVER -> $V" >/dev/null 2>&1 - + echo "Updated $OLDVER -> $V" done |