Author: rvs
Date: Wed Aug 31 22:43:01 2011
New Revision: 1163854
URL: http://svn.apache.org/viewvc?rev=1163854&view=rev
Log:
BIGTOP-32. Hadoop fuse package should include a file with defaults
Added:
incubator/bigtop/trunk/src/pkg/common/hadoop/hadoop-fuse.default
Modified:
incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop-fuse.install
incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.dirs
incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.install
incubator/bigtop/trunk/src/pkg/deb/hadoop/rules
incubator/bigtop/trunk/src/pkg/rpm/hadoop/SPECS/hadoop.spec
Added: incubator/bigtop/trunk/src/pkg/common/hadoop/hadoop-fuse.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/common/hadoop/hadoop-fuse.default?rev=1163854&view=auto
==============================================================================
--- incubator/bigtop/trunk/src/pkg/common/hadoop/hadoop-fuse.default (added)
+++ incubator/bigtop/trunk/src/pkg/common/hadoop/hadoop-fuse.default Wed Aug 31
22:43:01 2011
@@ -0,0 +1 @@
+export LIBHDFS_OPTS="-Xms128m -Xmx512m"
Modified: incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop-fuse.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop-fuse.install?rev=1163854&r1=1163853&r2=1163854&view=diff
==============================================================================
--- incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop-fuse.install (original)
+++ incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop-fuse.install Wed Aug 31
22:43:01 2011
@@ -1,3 +1,4 @@
+/etc/default/hadoop-fuse
/usr/bin/hadoop-fuse-dfs
/usr/lib/hadoop/bin/fuse_dfs
/usr/lib/hadoop/contrib/fuse-dfs
Modified: incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.dirs
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.dirs?rev=1163854&r1=1163853&r2=1163854&view=diff
==============================================================================
--- incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.dirs (original)
+++ incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.dirs Wed Aug 31 22:43:01
2011
@@ -4,5 +4,4 @@
/var/run/hadoop
/var/lib/hadoop
/var/lib/hadoop/cache/hadoop
-/etc/default
/usr/share/doc/hadoop
Modified: incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.install?rev=1163854&r1=1163853&r2=1163854&view=diff
==============================================================================
--- incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.install (original)
+++ incubator/bigtop/trunk/src/pkg/deb/hadoop/hadoop.install Wed Aug 31
22:43:01 2011
@@ -1,5 +1,5 @@
/usr/bin
/usr/lib/hadoop
/etc/hadoop/conf.empty
-/etc/default
+/etc/default/hadoop
/usr/share/doc/hadoop
Modified: incubator/bigtop/trunk/src/pkg/deb/hadoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/deb/hadoop/rules?rev=1163854&r1=1163853&r2=1163854&view=diff
==============================================================================
--- incubator/bigtop/trunk/src/pkg/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/src/pkg/deb/hadoop/rules Wed Aug 31 22:43:01 2011
@@ -96,6 +96,8 @@ install-indep:
sh -x debian/install_init_scripts.sh
install-arch:
+ mkdir -p debian/tmp/etc/default
+ cp debian/hadoop-fuse.default debian/tmp/etc/default/hadoop-fuse
dh_install --sourcedir=debian/tmp -s
# Must not depend on anything. This is to be called by
Modified: incubator/bigtop/trunk/src/pkg/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/rpm/hadoop/SPECS/hadoop.spec?rev=1163854&r1=1163853&r2=1163854&view=diff
==============================================================================
--- incubator/bigtop/trunk/src/pkg/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/trunk/src/pkg/rpm/hadoop/SPECS/hadoop.spec Wed Aug 31
22:43:01 2011
@@ -104,6 +104,7 @@ Source2: hadoop-init.tmpl
Source3: hadoop-init.tmpl.suse
Source4: hadoop.1
Source5: hadoop-fuse-dfs.1
+Source6: hadoop-fuse.default
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
Requires: textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service
@@ -370,6 +371,7 @@ do
done
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default
%__cp $RPM_SOURCE_DIR/hadoop.default $RPM_BUILD_ROOT/etc/default/hadoop
+%__cp $RPM_SOURCE_DIR/hadoop-fuse.default
$RPM_BUILD_ROOT/etc/default/hadoop-fuse
# /var/lib/hadoop/cache
@@ -484,6 +486,7 @@ fi
#%defattr(-,root,root)
#%attr(0755,root,root) %{bin_hadoop}/hadoop-fuse-dfs
#%attr(0755,root,root) %{man_hadoop}/man1/hadoop-fuse-dfs.1.gz
+/etc/default/hadoop-fuse
%files pipes
%defattr(-,root,root)
