← Back to branch summary

~hadoop-ubuntu/ubuntu/trusty/hadoop/trunk

« back to all changes in this revision

Viewing changes to debian/patches/HDFS-2842.patch

  • Committer: James Page
  • Date: 2012-04-11 07:58:30 UTC
  • Revision ID: james.page@canonical.com-20120411075830-bgzkp04fy8fbtj1g
* New upstream release.
* New upstream candidate release:
  - d/control: Added libsnappy-dev to Build-Deps.
  - d/rules: Generate java JNI bindings for snappy.
  - Refresh patches.
* Sort out dependencies for hadoop-native
  - libzip1 -> zlib1g
  - Drop liblzo2-2
  - Added libsnappy1
* Links libsnappy.so into hadoop-native install so that
  Java can actually load the required .so.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/HDFS-2842.patch
1
 
Index: hadoop-0.20.205.0/src/contrib/fuse-dfs/src/Makefile.am
 
1
Index: hadoop/src/contrib/fuse-dfs/src/Makefile.am
2
2
===================================================================
3
 
--- hadoop-0.20.205.0.orig/src/contrib/fuse-dfs/src/Makefile.am 2011-10-07 08:19:02.000000000 +0200
4
 
+++ hadoop-0.20.205.0/src/contrib/fuse-dfs/src/Makefile.am      2012-01-16 12:19:52.824921928 +0100
 
3
--- hadoop.orig/src/contrib/fuse-dfs/src/Makefile.am    2012-03-20 17:19:05.536098130 +0000
 
4
+++ hadoop/src/contrib/fuse-dfs/src/Makefile.am 2012-03-20 17:19:19.452143345 +0000
5
5
@@ -16,5 +16,5 @@
6
6
 bin_PROGRAMS = fuse_dfs
7
7
 fuse_dfs_SOURCES = fuse_dfs.c fuse_options.c fuse_trash.c fuse_stat_struct.c fuse_users.c fuse_init.c fuse_connect.c fuse_impls_access.c fuse_impls_chmod.c  fuse_impls_chown.c  fuse_impls_create.c  fuse_impls_flush.c fuse_impls_getattr.c  fuse_impls_mkdir.c  fuse_impls_mknod.c  fuse_impls_open.c fuse_impls_read.c fuse_impls_release.c fuse_impls_readdir.c fuse_impls_rename.c fuse_impls_rmdir.c fuse_impls_statfs.c fuse_impls_symlink.c fuse_impls_truncate.c fuse_impls_utimens.c  fuse_impls_unlink.c fuse_impls_write.c