diff options
| author | Shea Levy <shea@shealevy.com> | 2011-09-28 21:59:07 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-09-28 21:59:07 +0000 |
| commit | ed38cc3545a028bb4e019084cb26012e801cf017 (patch) | |
| tree | 59e7f20696a0c8e5ddb1280885962b45626140ab /pkgs/os-specific/linux | |
| parent | 4add420a480265b7185896ca0aadb394d1da383c (diff) | |
| download | nixlib-ed38cc3545a028bb4e019084cb26012e801cf017.tar nixlib-ed38cc3545a028bb4e019084cb26012e801cf017.tar.gz nixlib-ed38cc3545a028bb4e019084cb26012e801cf017.tar.bz2 nixlib-ed38cc3545a028bb4e019084cb26012e801cf017.tar.lz nixlib-ed38cc3545a028bb4e019084cb26012e801cf017.tar.xz nixlib-ed38cc3545a028bb4e019084cb26012e801cf017.tar.zst nixlib-ed38cc3545a028bb4e019084cb26012e801cf017.zip | |
aufs3-util
svn path=/nixpkgs/trunk/; revision=29535
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/aufs3-util/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/aufs3/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 2 |
3 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/aufs3-util/default.nix b/pkgs/os-specific/linux/aufs3-util/default.nix new file mode 100644 index 000000000000..00c3e99c4577 --- /dev/null +++ b/pkgs/os-specific/linux/aufs3-util/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, kernel, aufs3 }: + +stdenv.mkDerivation { + name = "aufs3-util-${aufs3.patch.version}"; + + src = fetchgit { + url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git; + rev = aufs3.patch.utilRev; + sha256 = aufs3.patch.utilHash; + }; + + buildInputs = [ aufs3 ]; + + makeFlags = + [ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build" + "Install=install" + "DESTDIR=$(out)" + ]; + + postInstall = + '' + mv $out/usr/* $out + rmdir $out/usr + + cp aufs.shlib $out/lib/ + + substituteInPlace $out/bin/aubrsync \ + --replace /sbin/mount $out/sbin/mount \ + --replace /usr/lib/aufs.shlib $out/lib/aufs.shlib + ''; + + meta = { + description = "Utilities for AUFS3"; + homepage = http://aufs.sourceforge.net/; + maintainers = [ stdenv.lib.maintainers.eelco + stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs3/default.nix index a47dd9cb445c..bf73e6510f7f 100644 --- a/pkgs/os-specific/linux/aufs3/default.nix +++ b/pkgs/os-specific/linux/aufs3/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { cp -v usr/include/linux/aufs_type.h $out/include/linux ''; + passthru = { inherit patch; }; meta = { description = "Another Unionfs implementation for Linux (third generation)"; homepage = http://aufs.sourceforge.net/; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 79e02753f32c..32a29af148e5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -293,6 +293,8 @@ rec { aufs3_0 = rec { name = "aufs3.0"; version = "3.0"; + utilRev = "a08d17d433567c7c2586c5fc2625a714b20fe155"; + utilHash = "4772c1c6a36da7bbd448057c227a9cd1856ccf72748765cf85421ab0c4e34535"; patch = makeAufs3StandalonePatch { inherit version; rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4"; |