Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel generate-config.pl: Allow whitespace in values #66538

Merged
merged 1 commit into from
Aug 14, 2019

Conversation

singron
Copy link
Contributor

@singron singron commented Aug 12, 2019

Motivation for this change

In particular, this allows setting CONFIG_CMDLINE to a value with
multiple space-seperated parameters. Other variables also take free-form
strings and might similarly benefit.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @dezgeg

Sorry, something went wrong.

In particular, this allows setting CONFIG_CMDLINE to a value with
multiple space-seperated parameters. Other variables also take free-form
strings and might similarly benefit.
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 labels Aug 12, 2019
@@ -28,7 +28,7 @@
while (<ANSWERS>) {
chomp;
s/#.*//;
if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(\S+)\s*$/) {
if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(.*\S)\s*$/) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still need the \S then ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the terminating \S, the .* will match trailing whitespace. The original pattern ignored leading and trailing whitespace and I didn't want to change that behavior.

@teto
Copy link
Member

teto commented Aug 14, 2019

would be cool to have a test for it. Maybe also change the branch to merge to to staging as this PR triggers many rebuilds.

@Mic92
Copy link
Member

Mic92 commented Aug 14, 2019

A test for that might be a bit overkill.

@Mic92 Mic92 merged commit 4f835fb into NixOS:master Aug 14, 2019
@Mic92
Copy link
Member

Mic92 commented Aug 14, 2019

Since most of the packages built here are kernel modules, I will merge this right away to master.

@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants