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: 5cbe85dbd8e2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 97c0e5d8a887
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 19, 2020

  1. linux: fix generate-config's handling of "no-choice" options 

    Prior to this change, the script could potentially get confused by
"menus" containing only one valid option. Thus, with

CPU_BIG_ENDIAN = no;
CPU_LITTLE_ENDIAN = yes;
ARM64_PA_BITS_48 = yes;

the endianness would be set incorrectly:

GOT: Physical address space size
GOT: > 1. 48-bit (ARM64_PA_BITS_48)
GOT: choice[1]: 1
GOT: Endianness
GOT:   1. Build big-endian kernel (CPU_BIG_ENDIAN)
GOT: > 2. Build little-endian kernel (CPU_LITTLE_ENDIAN)
CHOICE: 1-2?, ANSWER: 1

This commit fixes this error by forgetting previous menu choices if a
line that follows a menu option is neither another menu option nor the
prompt for choosing one of the options.
    @lheckemann
    lheckemann committed Dec 19, 2020
    Copy the full SHA
    16c0697 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2021

  1. Merge pull request #107181 from lheckemann/generate-config-fix 

    linux: fix generate-config's handling of "no-choice" options
    @lheckemann
    lheckemann committed Jan 12, 2021
    Copy the full SHA
    97c0e5d View commit details
    Browse the repository at this point in the history