You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/10/18 21:30:04 UTC
svn commit: r1185814 - in
/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src:
common/hadoop/patch deb/hadoop/rules rpm/hadoop/SPECS/hadoop.spec
Author: rvs
Date: Tue Oct 18 19:30:04 2011
New Revision: 1185814
URL: http://svn.apache.org/viewvc?rev=1185814&view=rev
Log:
cleaning up the patching process
Removed:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/patch
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules?rev=1185814&r1=1185813&r2=1185814&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules Tue Oct 18 19:30:04 2011
@@ -39,7 +39,7 @@ endif
build: build-stamp
build-stamp:
dh_testdir
- patch -p0 < debian/patch
+# patch -p0 < debian/patch
env HADOOP_VERSION=${hadoop_version} \
sh debian/do-component-build -Divy.home=`pwd`/debian/.ivy
touch $@
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1185814&r1=1185813&r2=1185814&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Tue Oct 18 19:30:04 2011
@@ -107,7 +107,7 @@ Source5: hadoop-init.tmpl.suse
Source6: hadoop.1
Source7: hadoop-fuse-dfs.1
Source8: hadoop-fuse.default
-Patch0: patch
+# Patch0: patch
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
@@ -294,7 +294,7 @@ before continuing operation.
%prep
%setup -n apache-hadoop-common-c606b00
-%patch0 -p0
+# %patch0 -p0
%build
# This assumes that you installed Java JDK 6 and set JAVA_HOME