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: 9507dfbe8201
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d227d81c9a6f
Choose a head ref
  • 6 commits
  • 7 files changed
  • 1 contributor

Commits on Jun 21, 2020

  1. nixos/deviceTree: fix description

    hardware.deviceTree.base points to a path, not a package (and also if of
    types.path)
    
    It defaults to ${config.boot.kernelPackages.kernel}/dtbs.
    flokli committed Jun 21, 2020
    Copy the full SHA
    4342468 View commit details
    Browse the repository at this point in the history
  2. nixos/generic-extlinux-compatible: introduce boot.loader.generic-extl…

    …inux-compatible.populateCmd
    
    This option exposes the builder command used to populate an image,
    honoring all options except the -c <path-to-default-configuration>
    argument.
    
    Useful to have for sdImage.populateRootCommands.
    
    Special care needs to be taken w.r.t cross - the populate command runs
    on the host platform, the activation script on the build platform (so
    the builders differ)
    flokli committed Jun 21, 2020
    Copy the full SHA
    54129e7 View commit details
    Browse the repository at this point in the history
  3. nixos/sd-image-*: use boot.loader.generic-extlinux-compatible.populat…

    …eCmd
    
    While getting rid of the separate extlinux-conf-builder import, this now
    also honors boot.loader.timeout in the initial sd card image if
    specified.
    flokli committed Jun 21, 2020
    Copy the full SHA
    afa6277 View commit details
    Browse the repository at this point in the history
  4. extlinux-conf-builder.sh: allow a custom FDT to be specified

    Some bootloaders might not properly detect the model.
    If the specific model is known by configuration, provide a way to
    explicitly point to a specific dtb in the extlinux.conf.
    flokli committed Jun 21, 2020
    Copy the full SHA
    bd8137a View commit details
    Browse the repository at this point in the history
  5. hardware.deviceTree: add name

    This can be used to explicitly specify a specific dtb file, relative to
    the dtb base.
    
    Update the generic-extlinux-compatible module to make use of this option.
    flokli committed Jun 21, 2020
    Copy the full SHA
    387f3b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2020

  1. Merge pull request #91195 from flokli/extlinux-conf-builder-dtbname

    extlinux-conf-builder: expose and use base builder command, allow a custom FDT to be specified
    flokli committed Jun 23, 2020
    Copy the full SHA
    d227d81 View commit details
    Browse the repository at this point in the history