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: 7aa42d3ed45e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: cae18d135f80
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 13, 2021

  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.

(cherry picked from commit 16c0697)
    @lheckemann @erictapen
    lheckemann authored and erictapen committed Jan 13, 2021
    Copy the full SHA
    cae18d1 View commit details
    Browse the repository at this point in the history