Author: plinnell
Date: Mon Nov 14 22:00:25 2011
New Revision: 1201926
URL: http://svn.apache.org/viewvc?rev=1201926&view=rev
Log:
BIGTOP-253 update the Debian bits, to get them building
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/series
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.dirs
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-pipes.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-source.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/series
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/series?rev=1201926&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/series
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/series
Mon Nov 14 22:00:25 2011
@@ -0,0 +1,7 @@
+HADOOP-7787.patch
+HADOOP-7801.patch
+HDFS-2543.patch
+MAPREDUCE-3372.patch
+HADOOP-7802.patch
+HDFS-2544.patch
+MAPREDUCE-3373.patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install
Mon Nov 14 22:00:25 2011
@@ -1,3 +1,3 @@
#DOCS#
-/usr/share/doc/hadoop-doc
+#/usr/share/doc/hadoop-doc
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.dirs
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.dirs?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.dirs
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.dirs
Mon Nov 14 22:00:25 2011
@@ -1 +1,2 @@
/usr/lib/hadoop/contrib/fuse-dfs
+/usr/bin/
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.install?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-fuse.install
Mon Nov 14 22:00:25 2011
@@ -1,4 +1,4 @@
/etc/default/hadoop-fuse
-/usr/bin/hadoop-fuse-dfs
-/usr/lib/hadoop/bin/fuse_dfs
-/usr/lib/hadoop/contrib/fuse-dfs
+#/usr/bin/hadoop-fuse-dfs
+#/usr/lib/hadoop/bin/fuse_dfs
+#/usr/lib/hadoop/contrib/fuse-dfs
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-pipes.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-pipes.install?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-pipes.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-pipes.install
Mon Nov 14 22:00:25 2011
@@ -1,3 +1,3 @@
-/usr/lib/libhadooputils.a
-/usr/lib/libhadooppipes.a
-/usr/include/hadoop
\ No newline at end of file
+#/usr/lib/libhadooputils.a
+#/usr/lib/libhadooppipes.a
+#/usr/include/hadoop
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
Mon Nov 14 22:00:25 2011
@@ -1,2 +1,2 @@
/usr/lib/hadoop/sbin
-/usr/lib/hadoop/bin/jsvc*
+#/usr/lib/hadoop/bin/jsvc*
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-source.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-source.install?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-source.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-source.install
Mon Nov 14 22:00:25 2011
@@ -1 +1 @@
-/usr/src/hadoop
+#/usr/src/hadoop
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
Mon Nov 14 22:00:25 2011
@@ -3,4 +3,4 @@
/etc/hadoop/conf.empty
/etc/default/hadoop
/etc/security/limits.d/hadoop.nofiles.conf
-/usr/share/doc/hadoop
+#/usr/share/doc/hadoop
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
Mon Nov 14 22:00:25 2011
@@ -1,4 +1,4 @@
-/usr/include/hdfs*
-/usr/lib/libhdfs.la
-/usr/lib/libhdfs.so
-/usr/share/doc/libhdfs-devel
+#/usr/include/hdfs*
+#/usr/lib/libhdfs.la
+#/usr/lib/libhdfs.so
+#/usr/share/doc/libhdfs-devel
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1201926&r1=1201925&r2=1201926&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
Mon Nov 14 22:00:25 2011
@@ -39,6 +39,14 @@ endif
build: build-stamp
build-stamp:
dh_testdir
+ patch -p0 < ./debian/HADOOP-7787.patch
+ patch -p0 < ./debian/HADOOP-7801.patch
+ patch -p0 < ./debian/HDFS-2543.patch
+ patch -p0 < ./debian/MAPREDUCE-3372.patch
+ patch -p0 < ./debian/HADOOP-7802.patch
+ patch -p0 < ./debian/HDFS-2544.patch
+ patch -p0 < ./debian/MAPREDUCE-3373.patch
+
env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \
bash debian/do-component-build -Divy.home=`pwd`/debian/.ivy
touch $@
@@ -57,12 +65,13 @@ install: build
dh_installdirs
bash debian/install_hadoop.sh \
+ --prefix=debian/tmp/ \
--distro-dir=debian \
--build-dir=${hadoop_build_path} \
- --src-dir=debian/tmp/usr/src/hadoop \
- --lib-dir=debian/tmp/usr/lib/hadoop \
- --etc-dir=debian/tmp/etc/hadoop \
- --prefix=debian/tmp \
+ --system-lib-dir=debian/tmp/usr/lib/ \
+ --system-libexec-dir=debian/tmp/usr/libexec/ \
+ --yarn-etc-dir=debian/tmp/etc/yarn \
+ --system-include-dir=debian/tmp/usr/include \
--doc-dir=debian/tmp/usr/share/doc/hadoop-doc \
--example-dir=debian/tmp/usr/share/doc/hadoop/examples \
--native-build-string=${native_dir} \
@@ -95,7 +104,7 @@ install-indep: namenode secondarynamenod
rm -Rf debian/hadoop/usr/lib/hadoop/sbin
rm -Rf debian/hadoop/usr/lib/hadoop/bin/fuse_dfs
- rm -Rf debian/hadoop/usr/bin/hadoop-fuse-dfs
+# rm -Rf debian/hadoop/usr/bin/hadoop-fuse-dfs
rm -Rf debian/hadoop/usr/lib/hadoop/contrib/fuse-dfs
rm -Rf debian/hadoop/usr/lib/hadoop/hdfs/contrib/fuse-dfs
@@ -117,9 +126,9 @@ install-arch:
binary-common:
dh_testdir
dh_testroot
- dh_installchangelogs CHANGES.txt -phadoop
- dh_installdocs
- sh debian/append_licenses.sh
+ #dh_installchangelogs CHANGES.txt -phadoop
+# dh_installdocs ## PL this line and the above/below are only temp
+# #sh debian/append_licenses.sh
# dh_installexamples
# dh_installmenu
# dh_installdebconf
