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.

Sign up for GitHub

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

Jump to bottom

jool: 4.0.5 -> 4.0.9 #89754

Merged
merged 1 commit into from Jun 22, 2020
Merged

jool: 4.0.5 -> 4.0.9 #89754

merged 1 commit into from Jun 22, 2020

Conversation

hax404
Copy link
Contributor

@hax404 hax404 commented Jun 7, 2020

Motivation for this change

Version update. Fixes the build error:

building
make: Entering directory '/build/source/src/mod'
make -C siit
make[1]: Entering directory '/build/source/src/mod/siit'
make -C /nix/store/zkv2csjnlrx352hv9v5i7kflfamryhrr-linux-5.4.44-dev/lib/modules/5.4.44/build M=$PWD JOOL_FLAGS=""
make[2]: Entering directory '/nix/store/zkv2csjnlrx352hv9v5i7kflfamryhrr-linux-5.4.44-dev/lib/modules/5.4.44/build'
  AR      /build/source/src/mod/siit/built-in.a
  CC [M]  /build/source/src/mod/siit/../common/rfc7915/4to6.o
/build/source/src/mod/siit/../common/rfc7915/4to6.c: In function 'ttp46_alloc_skb':
/build/source/src/mod/siit/../common/rfc7915/4to6.c:68:2: error: implicit declaration of function 'nf_reset' [-Werror=implicit-function-declaration]
   68 |  nf_reset(out);
      |  ^~~~~~~~
created 4875 symlinks in user environment
cc1: some warnings being treated as errors
make[4]: *** [/nix/store/zkv2csjnlrx352hv9v5i7kflfamryhrr-linux-5.4.44-dev/lib/modules/5.4.44/source/scripts/Makefile.build:266: /build/source/src/mod/siit/../common/rfc7915/4to6.o] Error 1
make[3]: *** [/nix/store/zkv2csjnlrx352hv9v5i7kflfamryhrr-linux-5.4.44-dev/lib/modules/5.4.44/source/Makefile:1703: /build/source/src/mod/siit] Error 2
make[2]: *** [/nix/store/zkv2csjnlrx352hv9v5i7kflfamryhrr-linux-5.4.44-dev/lib/modules/5.4.44/source/Makefile:179: sub-make] Error 2
make[2]: Leaving directory '/nix/store/zkv2csjnlrx352hv9v5i7kflfamryhrr-linux-5.4.44-dev/lib/modules/5.4.44/build'
make[1]: *** [Makefile:5: all] Error 2
make[1]: Leaving directory '/build/source/src/mod/siit'
make: *** [Makefile:8: siit] Error 2
make: Leaving directory '/build/source/src/mod'
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
      • tested with Kernel 5.4.44 and 5.6.16 (boot.kernelPackages = pkgs.linuxPackages_latest;)
      • Test environment is a nixos-container which did ping and mtr to 64:ff9b::8.8.8.8
      • Only the NAT64 mode was tested.
    • 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 nixpkgs-review --run "nixpkgs-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.

@hax404 hax404 mentioned this pull request Jun 7, 2020
Merged
10 tasks
@mweinelt
Copy link
Member

mweinelt commented Jun 7, 2020

Result of nixpkgs-review pr 89754 1

2 packages marked as broken and skipped:
- linuxPackages_hardkernel_4_14.jool
- linuxPackages_hardkernel_latest.jool
16 packages built:
- jool-cli
- linuxPackages-libre.jool
- linuxPackages.jool (linuxPackages_5_4.jool)
- linuxPackages_4_14.jool
- linuxPackages_4_19.jool
- linuxPackages_4_4.jool
- linuxPackages_4_9.jool
- linuxPackages_5_6.jool (linuxPackages_latest.jool)
- linuxPackages_hardened.jool
- linuxPackages_latest-libre.jool
- linuxPackages_latest_hardened.jool
- linuxPackages_latest_xen_dom0.jool
- linuxPackages_latest_xen_dom0_hardened.jool
- linuxPackages_testing_bcachefs.jool
- linuxPackages_xen_dom0.jool
- linuxPackages_xen_dom0_hardened.jool

@hax404
Copy link
Contributor Author

hax404 commented Jun 9, 2020

Also works with Linux Kernel 5.7.1 from commit 19b2efb

@hax404 hax404 requested a review from fpletz June 12, 2020 15:36
@worldofpeace
Copy link
Contributor

@ofborg build linuxPackages_latest.jool linuxPackages.jool

@worldofpeace worldofpeace merged commit 8e46011 into NixOS:master Jun 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz Awaiting requested review from fpletz

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hax404 @mweinelt @worldofpeace