Skip to content

lvm2: 2.02.177 -> 2.03.01 #51756

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

Merged
7c6f434c merged 2 commits into from
Dec 10, 2018
Merged

lvm2: 2.02.177 -> 2.03.01 #51756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c047c26
lvm2: 2.02.177 -> 2.03.01
markuskowa Dec 8, 2018
aed8699
grub: add patch for XFS sparse inode feature
markuskowa Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pkgs/os-specific/linux/lvm2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid
, thin-provisioning-tools, enable_dmeventd ? false }:
{ stdenv, fetchgit, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid
, thin-provisioning-tools, libaio
, enable_dmeventd ? false }:

let
version = "2.02.177";
version = "2.03.01";
in

stdenv.mkDerivation {
name = "lvm2-${version}";

src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
sha256 = "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0";
src = fetchgit {
url = "git://sourceware.org/git/lvm2.git";
rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "0jlaswf1srdxiqpgpp97j950ddjds8z0kr4pbwmal2za2blrgvbl";
};

configureFlags = [
Expand All @@ -27,7 +29,7 @@ stdenv.mkDerivation {
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ udev libuuid thin-provisioning-tools ];
buildInputs = [ udev libuuid thin-provisioning-tools libaio ];

preConfigure =
''
Expand Down
13 changes: 11 additions & 2 deletions pkgs/tools/misc/grub/2.0x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, flex, bison, python
{ stdenv, fetchurl, fetchpatch, flex, bison, python
, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
, fuse # only needed for grub-mount
, zfs ? null
Expand Down Expand Up @@ -82,7 +82,16 @@ stdenv.mkDerivation rec {
unset CPP # setting CPP intereferes with dependency calculation
'';

patches = [ ./fix-bash-completion.patch ];
patches = [
./fix-bash-completion.patch
# This patch makes grub compatible with the XFS sparse inode
# feature introduced by xfsprogs-4.16.
# to be removed in grub-2.03
(fetchpatch {
url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff;
sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0";
})
];

configureFlags = [ "--enable-grub-mount" ] # dep of os-prober
++ optional zfsSupport "--enable-libzfs"
Expand Down