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: b2bf4d8327b7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1b78b2d18d33
Choose a head ref
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 27, 2017

  1. glusterfs: Remove no longer needed subsitutions of DESTDIR. 

    They were made unnecessary in commit d07154b, which added
`makeFlags = "DESTDIR=$(out)";`.
    @nh2 @qknight
    nh2 authored and qknight committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    8c0620f View commit details
    Browse the repository at this point in the history

  2. glusterfs: Use github instead of download.gluster.org to obtain source. 

    This is because the source tarball available on
  https://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.1/glusterfs-3.10.1.tar.gz
has different contents than the v3.10.1 tag;
for example, it lacks the file `xlators/features/ganesha/src/Makefile.am`,
which the tag has.
This is because GluserFS's release process removes some unused files.

This made impossible to apply patches written by or for upstream, as those
are written against what's in upstream's git.

As a nice side effect, we no longer have to hardcode the "3.10" in the
`3.10/${version}` part of the URL.
    @nh2 @qknight
    nh2 authored and qknight committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    fef914c View commit details
    Browse the repository at this point in the history

  3. glusterfs: Make commands that gluster calls work. Fixes #25620. 

    Done by setting PATH and PYTHONPATH appropriately.

Adds the following patches:

* One that removes hardcodes to /sbin, /usr/bin, etc.
  from gluster, so that programs like `lvm` and `xfs_info` can be
  called at runtime; see https://bugzilla.redhat.com/show_bug.cgi?id=1450546.
* One that fixes unsubstituted autoconf macros in paths (a problem
  in the 3.10 release); see https://bugzilla.redhat.com/show_bug.cgi?id=1450588.
* One that removes uses of the `find_library()` Python function that does
  not behave as expected in Python < 3.6 (and would not behave correctly
  even on 3.6 in nixpkgs due to #25763);
  see https://bugzilla.redhat.com/show_bug.cgi?id=1450593.

I think that all of these patches should be upstreamed.

Also adds tests to check that none of the Python based utilities
throw import errors, calling `--help` or equivalent on them.
    @nh2 @qknight
    nh2 authored and qknight committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    c061e50 View commit details
    Browse the repository at this point in the history

  4. glusterfs: Enable parallel building. 

    I checked for determinism with `nix-build --option build-repeat 10`.
    @nh2 @qknight
    nh2 authored and qknight committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    2982a65 View commit details
    Browse the repository at this point in the history

  5. glusterfs: Upgrade to 3.10.2

    @nh2 @qknight
    nh2 authored and qknight committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    395bd92 View commit details
    Browse the repository at this point in the history

  6. glusterfs: do not set setuid in install 

    related to #26600
    @Mic92 @qknight
    Mic92 authored and qknight committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    1b78b2d View commit details
    Browse the repository at this point in the history