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

wireless-regdb: 2023.09.01 -> 2024.01.23 #286012

Merged
merged 1 commit into from
Feb 3, 2024

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Feb 3, 2024

Changes: https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git/log/

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested a review from fpletz February 3, 2024 09:52
@fpletz fpletz changed the title wireless-regdb": 2023.09.01 -> 2024.01.23 wireless-regdb: 2023.09.01 -> 2024.01.23 Feb 3, 2024
@fpletz fpletz merged commit abe3cbb into NixOS:master Feb 3, 2024
28 checks passed
@trofi trofi deleted the wireless-regdb-update branch February 3, 2024 15:46
@mweinelt
Copy link
Member

mweinelt commented Feb 6, 2024

Bisect thinks this change broke the check phase of crda. #286715

abe3cbb1c1e25b28e608cf79a9b62103db5d92dd is the first bad commit
commit abe3cbb1c1e25b28e608cf79a9b62103db5d92dd
Author: Sergei Trofimovich <slyich@gmail.com>
Date:   Sat Feb 3 15:40:35 2024 +0000

    wireless-regdb: 2023.09.01 -> 2024.01.23 (#286012)

 pkgs/data/misc/wireless-regdb/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
crda> Running phase: checkPhase
crda> check flags: -j64 SHELL=/nix/store/cjbyb45nxiqidj95c4k1mh65azn1x896-bash-5.2-p21/bin/bash PREFIX=\$\(out\) SBINDIR=\$\(out\)/bin/ UDEV_RULE_DIR=\$\(out\)/lib/udev/rules.d/ REG_BIN=/nix/store/qx9xcsda4ypxfkg1x3s3ra1v6p38k6a5-wireless-regdb-2024.01.23/lib/crda/regulatory.bin VERBOSE=y verify
crda>   CHK  /nix/store/qx9xcsda4ypxfkg1x3s3ra1v6p38k6a5-wireless-regdb-2024.01.23/lib/crda/regulatory.bin
crda> Database signature verification failed.
crda> Invalid or empty regulatory file, note: a binary regulatory file should be used.
crda> make: *** [Makefile:161: verify] Error 234

trofi added a commit to trofi/nixpkgs that referenced this pull request Feb 6, 2024
This reverts commit abe3cbb.

Reported by Martin Weinelt at NixOS#286012 (comment)

The change caused `crda` test failure as:

    crda> Running phase: checkPhase
    crda> check flags: -j64 SHELL=/nix/store/cjbyb45nxiqidj95c4k1mh65azn1x896-bash-5.2-p21/bin/bash PREFIX=\$\(out\) SBINDIR=\$\(out\)/bin/ UDEV_RULE_DIR=\$\(out\)/lib/udev/rules.d/ REG_BIN=/nix/store/qx9xcsda4ypxfkg1x3s3ra1v6p38k6a5-wireless-regdb-2024.01.23/lib/crda/regulatory.bin VERBOSE=y verify
    crda>   CHK  /nix/store/qx9xcsda4ypxfkg1x3s3ra1v6p38k6a5-wireless-regdb-2024.01.23/lib/crda/regulatory.bin
    crda> Database signature verification failed.
    crda> Invalid or empty regulatory file, note: a binary regulatory file should be used.
    crda> make: *** [Makefile:161: verify] Error 234

Let's revert until it's sorted upstream.
@trofi
Copy link
Contributor Author

trofi commented Feb 6, 2024

Yeah, let's revert until keys are sorted out. Proposed the revert as #286726

trofi added a commit to trofi/nixpkgs that referenced this pull request Feb 6, 2024
This will make it easier to catch bugs like
NixOS#286012 (comment) in
future.
@trofi trofi mentioned this pull request Feb 6, 2024
13 tasks
@trofi
Copy link
Contributor Author

trofi commented Feb 6, 2024

Sent the report upstream about new missing pubkey in crda side: https://lore.kernel.org/linux-wireless/ZcIXGjzrZrXPCBcp@nz.home/

While at it proposed the addition of crda to testsuite to have a better chance to catch it next time:

fpletz added a commit that referenced this pull request Feb 6, 2024
wireless-regdb: revert "2023.09.01 -> 2024.01.23 (#286012)"
@trofi
Copy link
Contributor Author

trofi commented Feb 6, 2024

Upstream responded that crda is not needed for kernels 4.16 and above (nixpkgs does not ship so old kernels).

Proposed a crda removal and wireless-regdb update as:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants