* Updated reiserfsprogs to 3.6.21. Also install fsck.reiserfs and

mkfs.reiserfs symlinks.  The former is important to keep mountall
  happy.

svn path=/nixpkgs/trunk/; revision=22511
This commit is contained in:
Eelco Dolstra 2010-07-07 14:23:30 +00:00
parent 84b56ade89
commit f928e6ad5a
4 changed files with 14 additions and 59 deletions

View file

@ -1,18 +1,24 @@
args: with args;
{ stdenv, fetchurl, libuuid }:
stdenv.mkDerivation {
name = "reiserfsprogs-3.6.19-patched";
stdenv.mkDerivation rec {
name = "reiserfsprogs-3.6.21";
src = fetchurl {
url = http://chichkin_i.zelnet.ru/namesys/reiserfsprogs-3.6.19.tar.gz;
sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0";
url = "http://www.kernel.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2";
sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam";
};
patches = [./headers-fix.patch ./verbose-flag-ignore-for-compatibility.patch ];
buildInputs = [ libuuid ];
postInstall =
''
ln -s reiserfsck $out/sbin/fsck.reiserfs
ln -s mkreiserfs $out/sbin/mkfs.reiserfs
'';
meta = {
homepage = http://www.namesys.com/;
description = "Reiserfs utilities";
description = "ReiserFS utilities";
license = "GPL-2";
};
}

View file

@ -1,19 +0,0 @@
diff -pruN 1:3.6.19-4/include/reiserfs_fs.h 1:3.6.19-4ubuntu2/include/reiserfs_fs.h
--- 1:3.6.19-4/include/reiserfs_fs.h 2004-09-16 08:49:05.000000000 +0100
+++ 1:3.6.19-4ubuntu2/include/reiserfs_fs.h 2006-12-14 18:08:28.000000000 +0000
@@ -38,15 +38,10 @@
# define extern_inline
#endif
-#include <asm/unaligned.h>
-
#ifndef get_unaligned
-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
- defined(__PPC) || defined(powerpc) || defined(__powerpc__)
# define get_unaligned(ptr) (*(ptr))
# define put_unaligned(val,ptr) ((void)(*(ptr) = (val)))
#endif
-#endif
#define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field))
#define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)

View file

@ -1,32 +0,0 @@
diff --git a/fsck/main.c b/fsck/main.c
index ab3342a..79a0473 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -37,6 +37,7 @@ fsck_progress ("Usage: %s [mode] [options] " \
" -z | --adjust-size\t\tfix file sizes to real size\n" \
" -q | --quiet\t\t\tno speed info\n" \
" -y | --yes\t\t\tno confirmations\n" \
+" -v \t\t ignore -v option for compatibility to fsck.* tools\n" \
" -V\t\t\t\tprints version and exits\n" \
" -a and -p\t\t\tsome light-weight auto checks for bootup\n" \
" -f and -r\t\t\tignored\n" \
@@ -131,7 +132,7 @@ static char * parse_options (struct fsck_data * data, int argc, char * argv [])
};
int option_index;
- c = getopt_long (argc, argv, "iql:nb:Szd:R:h:j:gafVrpyt:B:",
+ c = getopt_long (argc, argv, "iql:nb:Szd:R:h:j:gafVrpyvt:B:",
options, &option_index);
if (c == -1)
break;
@@ -158,6 +159,10 @@ static char * parse_options (struct fsck_data * data, int argc, char * argv [])
data->options |= OPT_YES;
break;
+ case 'v': /* --quiet */
+ reiserfs_warning(stdout, "\nignoring -v option for compatibility\n");
+ break;
+
case 'l': /* --logfile */
data->log_file_name = optarg;
/*asprintf (&data->log_file_name, "%s", optarg);*/

View file

@ -1555,7 +1555,7 @@ let
};
reiserfsprogs = import ../tools/filesystems/reiserfsprogs {
inherit fetchurl stdenv;
inherit fetchurl stdenv libuuid;
};
relfs = composedArgsAndFun (import ../tools/filesystems/relfs) {