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

blobfuse: 1.0.2 -> 1.3.7, separately build cpplite #122976

Merged
merged 1 commit into from May 19, 2021

Conversation

polygon
Copy link
Contributor

@polygon polygon commented May 14, 2021

Motivation for this change
  • Build was broken due to missing <stdexcept> include, fix available in newer upstream release
  • Bumped version from 1.0.2 -> 1.3.7
  • Build scripts have changed, cpplite (azure-storage-lite) is now built in a separate CMake run
  • Upstream uses build.sh to manually copy resulting static libraries from cpplite build for blobfuse build, I put cpplite in a separate derivation and have the main blobfuse derivation depend on it
  • Upstream build would not install libazure-storage-adls.a during cpplite build, instead relying on manual copying in build.sh script
  • Added a patch to install libazure-storage-adls.a during cpplite build, so it is properly picked up during blobfuse build

The resulting binary works, but since I am not an Azure user, I could not test for actual functionality.

ZHF: #122042

@jonringer

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 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.

@dotlambda
Copy link
Member

@ofborg eval

@r-rmcgibbo
Copy link

Result of nixpkgs-review pr 122976 at 3716dce6 run on x86_64-linux 1

1 package built successfully:
  • blobfuse
1 suggestion:
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/filesystems/blobfuse/default.nix:20:17:

       |
    20 |     patches = [ ./install-adls.patch ];
       |                 ^
    

@jonringer
Copy link
Contributor

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

git rebase -i is a powerful command which achieves this, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

* Bump version to most recent 1.3.7 release
* Build scripts have changed, cpplite (azure-storage-lite) is now
  built separately
* Upstream they use build.sh to copy resulting static libraries to
  locations for blobfuse build, I put cpplite in a separate build
* adls library from cpplite was not installed and hence, not found
  by main blockfuse build, added a patch to install adls library, too
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 122976 run on x86_64-linux 1

2 packages built:
  • blobfuse
  • tests.trivial

@jonringer jonringer merged commit b73f621 into NixOS:master May 19, 2021
@polygon polygon deleted the blobfuse branch May 19, 2021 22:32
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.

None yet

4 participants