Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 8c2aaf37fde0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 51d2eed83b47
Choose a head ref
  • 5 commits
  • 8 files changed
  • 2 contributors

Commits on Jan 28, 2019

  1. linux: ability to merge structured configs 

    This should make the composability of kernel configurations more straigthforward.

- now distinguish freeform options from tristate ones
- will look for a structured config in kernelPatches too
one can now access the structuredConfig from a kernel via linux_test.configfile.structuredConfig
in order to reinject it into another kernel, no need to rewrite the config from scratch

The following merge strategies are used in case of conflict:
-- freeform items must be equal or they conflict (mergeEqualOption)
-- for tristate (y/m/n) entries, I use the mergeAnswer strategy which takes the best available value, "best" being defined by the user (by default "y" > "m" > "n", e.g. if one entry is both marked "y" and "n", "y" wins)
-- if one item is both marked optional/mandatory, mandatory wins (mergeFalseByDefault)
    @teto
    teto committed Jan 28, 2019
    Copy the full SHA
    3bb7b3f View commit details
    Browse the repository at this point in the history

  2. linux: convert hardened-config to a structured one

    @teto
    teto committed Jan 28, 2019
    Copy the full SHA
    7aacbdb View commit details
    Browse the repository at this point in the history

  3. linux: added tests for the config

    @teto
    teto committed Jan 28, 2019
    1
    Copy the full SHA
    461cb3f View commit details
    Browse the repository at this point in the history

  4. linux: fix after rebase

    @teto
    teto committed Jan 28, 2019
    Copy the full SHA
    045e133 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #42838 from teto/kernel_autoconf 

    [RFC] add ability to merge structured configs
    @infinisil
    infinisil committed Jan 28, 2019
    Copy the full SHA
    51d2eed View commit details
    Browse the repository at this point in the history