Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Rework to mimic a Linux package in terms of file system layout.

  • Loading branch information...
commit 87a51fcdd1c52df09359d7b941bdb43d1c91611a 1 parent 4e29cf4
Filip Hajny mamash authored
102 hadoop/Makefile
@@ -2,7 +2,7 @@
2 2 #
3 3
4 4 DISTNAME= hadoop-1.0.4
5   -#PKGREVISION= 1
  5 +PKGREVISION= 1
6 6 CATEGORIES= devel
7 7 MASTER_SITES= ${MASTER_SITE_APACHE:=hadoop/common/${DISTNAME}/}
8 8
@@ -13,72 +13,72 @@ LICENSE= apache-2.0
13 13
14 14 PKG_DESTDIR_SUPPORT= user-destdir
15 15
16   -USE_LANGUAGES= c c++
17   -USE_LIBTOOL= yes
18   -USE_TOOLS+= gmake autoconf automake pax tar
  16 +USE_LANGUAGES= c c++
  17 +USE_LIBTOOL= yes
  18 +USE_TOOLS+= gmake autoconf automake pax tar
19 19
20 20 .include "../../joyent/hadoop/Makefile.common"
21 21
  22 +BUILD_DEFS+= VARBASE HADOOP_USER HADOOP_GROUP HADOOP_DIR HADOOP_LOGDIR
  23 +
  24 +HADOOP_USER?= hadoop
  25 +HADOOP_GROUP?= hadoop
  26 +HADOOP_DIR?= ${VARBASE}/hadoop
  27 +HADOOP_LOGDIR?= ${VARBASE}/log/hadoop
  28 +
  29 +PKG_GROUPS+= ${HADOOP_USER}
  30 +PKG_USERS+= ${HADOOP_USER}:${HADOOP_GROUP}
  31 +PKG_GECOS.${HADOOP_USER}= Hadoop user
  32 +
  33 +OWN_DIRS_PERMS+= ${HADOOP_DIR} ${HADOOP_USER} ${HADOOP_GROUP} 750
  34 +OWN_DIRS_PERMS+= ${HADOOP_LOGDIR} ${HADOOP_USER} ${HADOOP_GROUP} 750
  35 +
22 36 CHECK_PORTABILITY_SKIP+= src/contrib/streaming/src/test/system/scripts/StreamMapper.sh
23   -REPLACE_BASH+= bin/hadoop bin/rcc bin/*.sh contrib/hdfsproxy/bin/* \
24   - contrib/hod/bin/checknodes
25   -
26   -MAKE_ARGS= -Dbuild.classes=${WRKSRC}/hadoop-core-${PKGVERSION_NOREV}.jar \
27   - -Dversion=${PKGVERSION_NOREV} -Dcompile.native=true \
28   - -Dcompile.c++=true -Dmake.cmd=${GMAKE} -Dlibhdfs=1 \
29   - -Dlibrecordio=true -Dskip.record-parser=true
30   -# This should be used, but doesn't work yet due to some OpenSSL error in c++ examples
31   -# BUILD_TARGETS= bin-package
32   -
33   -BUILD_TARGETS= compile-core-classes jar compile-core-native compile-c++ compile-c++-libhdfs \
34   - compile-c++-pipes compile-c++-utils
35   -DEFAULTS= src/core/core-default.xml src/hdfs/hdfs-default.xml \
36   - src/mapred/mapred-default.xml hadoop-examples-1.0.4.jar
37   -DIST= bin contrib \
38   - hadoop-ant-${PKGVERSION_NOREV}.jar hadoop-examples-${PKGVERSION_NOREV}.jar \
39   - hadoop-test-${PKGVERSION_NOREV}.jar \
40   - hadoop-tools-${PKGVERSION_NOREV}.jar lib webapps
41   -BUILT= hadoop-client-${PKGVERSION_NOREV}.jar hadoop-core-${PKGVERSION_NOREV}.jar \
42   - hadoop-minicluster-${PKGVERSION_NOREV}.jar
43   -CONF= capacity-scheduler.xml configuration.xsl core-site.xml hadoop-env.sh \
44   - hadoop-metrics2.properties hadoop-policy.xml hdfs-site.xml log4j.properties \
45   - mapred-queue-acls.xml mapred-site.xml taskcontroller.cfg
46   -
47   -.for f in ${CONF}
48   -CONF_FILES+= share/examples/hadoop/${f} ${PKG_SYSCONFDIR}/${f}
49   -.endfor
  37 +REPLACE_BASH+= bin/hadoop bin/rcc bin/*.sh src/contrib/hdfsproxy/bin/* \
  38 + src/contrib/hod/bin/checknodes sbin/* src/packages/*.sh
  39 +
  40 +MAKE_ARGS= -Dversion=${PKGVERSION_NOREV} -Dmake.cmd=${GMAKE:Q} \
  41 + -Dcompile.native=true -Dcompile.c++=true -Dlibhdfs=1 -Dlibrecordio=true \
  42 + -Dskip.record-parser=true
  43 +
  44 +BUILD_TARGETS= bin-package
50 45
51 46 CPPFLAGS= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
52 47
53   -SUBST_CLASSES+= java
  48 +SUBST_CLASSES+= java
54 49 SUBST_STAGE.java= pre-build
55   -SUBST_FILES.java= bin/hadoop bin/hadoop-config.sh conf/hadoop-env.sh
  50 +SUBST_FILES.java= bin/hadoop bin/hadoop-config.sh conf/hadoop-env.sh \
  51 + src/core/core-default.xml src/mapred/mapred-default.xml \
  52 + src/mapred/org/apache/hadoop/mapred/TaskRunner.java
56 53 SUBST_MESSAGE.java= Fixing Java args
57   -SUBST_VARS.java= JAVA_ARCH_FLAG PKG_SYSCONFDIR
  54 +SUBST_VARS.java= HADOOP_DIR HADOOP_LOGDIR JAVA_ARCH_FLAG PKG_JAVA_HOME \
  55 + PKG_SYSCONFDIR
  56 +
  57 +CONFIG_FILES= capacity-scheduler.xml configuration.xsl core-site.xml \
  58 + fair-scheduler.xml hadoop-env.sh hadoop-metrics2.properties \
  59 + hadoop-policy.xml hdfs-site.xml log4j.properties mapred-queue-acls.xml \
  60 + mapred-site.xml masters slaves taskcontroller.cfg
  61 +
  62 +.for f in ${CONFIG_FILES}
  63 +CONF_FILES+= share/examples/hadoop/${f} ${PKG_SYSCONFDIR}/${f}
  64 +.endfor
58 65
59 66 post-extract:
60   - ${RM} -rf ${WRKSRC}/lib/native/Linux* ${WRKSRC}/bin/task-controller
61   - ${RM} ${WRKSRC}/hadoop-core-${PKGVERSION_NOREV}.jar
62   - cd ${WRKSRC} && ${CHMOD} -R g-w *
  67 + set -e; cd ${WRKSRC} && ( \
  68 + ${CHMOD} -R g-w *; ${MKDIR} build/classes; \
  69 + ${RM} -rf bin/task-controller hadoop-core-*.jar lib/native \
  70 + )
63 71
64   -post-build:
65   - cd ${WRKSRC} && ${RM} bin/hadoop.orig bin/hadoop-config.sh.orig conf/hadoop-env.sh.orig
66   - cd ${WRKSRC} && ant FreeBSD-dist
67   - (cd ${WRKSRC}/build/c++ && ${TAR} -cf - ${HADOOP_ARCH}/lib ${HADOOP_ARCH}/include) | \
68   - (cd ${WRKSRC}/c++ && ${TAR} -xf -)
  72 +pre-build:
  73 + cd ${WRKSRC} && ${RM} bin/*.orig conf/hadoop-env.sh.orig
69 74
70 75 do-install:
71   - ${MKDIR} ${DESTDIR}${HADOOP_HOME}
72   - cd ${WRKSRC} && ${PAX} -rw -p e ${DIST} ${DESTDIR}${HADOOP_HOME}/
73   - cd ${WRKSRC}/build && ${PAX} -rw -p e ${BUILT} ${DESTDIR}${HADOOP_HOME}/
74   - cd ${WRKSRC}/c++/${HADOOP_ARCH} && ${PAX} -rw -p e include lib ${DESTDIR}${PREFIX}
75   - ${MKDIR} ${DESTDIR}${PREFIX}/share/examples/hadoop
76   -.for f in ${DEFAULTS}
77   - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/hadoop
78   -.endfor
79   - cd ${WRKSRC}/conf && ${PAX} -rw -p e * ${DESTDIR}${PREFIX}/share/examples/hadoop
  76 + cd ${WRKSRC}/build/${PKGNAME_NOREV} && ${PAX} -rw -p e * ${DESTDIR}${PREFIX}/
80 77
  78 +# Not used yet
81 79 #.include "../../devel/snappy/buildlink3.mk"
82 80 .include "../../devel/zlib/buildlink3.mk"
83 81 .include "../../security/openssl/buildlink3.mk"
  82 +# Used by librecordio, doesn't seem to build
  83 +#.include "../../textproc/xerces-c/buildlink3.mk"
84 84 .include "../../mk/bsd.pkg.mk"
6 hadoop/Makefile.common
@@ -16,12 +16,12 @@ HADOOP_ARCH= ${OPSYS}-amd64-64
16 16 HADOOP_ARCH= ${OPSYS}-x86-32
17 17 .endif
18 18 PLIST_SUBST+= HADOOP_ARCH=${HADOOP_ARCH}
19   -
20   -HADOOP_HOME?= ${PREFIX}/hadoop
  19 +PLIST_SUBST+= PKGVERSION_NOREV=${PKGVERSION_NOREV}
21 20
22 21 MAKE_ENV+= ANT_OPTS=-d${ABI}
23 22
24 23 do-build:
25   - cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ant ${BUILD_TARGETS} ${MAKE_ARGS}
  24 + cd ${WRKSRC} && \
  25 + ${PKGSRC_SETENV} ${MAKE_ENV} ant ${BUILD_TARGETS} ${MAKE_ARGS}
26 26
27 27 .include "../../mk/java-vm.mk"
472 hadoop/PLIST
... ... @@ -1,245 +1,48 @@
1 1 @comment $NetBSD$
2   -hadoop/bin/hadoop
3   -hadoop/bin/hadoop-config.sh
4   -hadoop/bin/hadoop-daemon.sh
5   -hadoop/bin/hadoop-daemons.sh
6   -hadoop/bin/rcc
7   -hadoop/bin/slaves.sh
8   -hadoop/bin/start-all.sh
9   -hadoop/bin/start-balancer.sh
10   -hadoop/bin/start-dfs.sh
11   -hadoop/bin/start-jobhistoryserver.sh
12   -hadoop/bin/start-mapred.sh
13   -hadoop/bin/stop-all.sh
14   -hadoop/bin/stop-balancer.sh
15   -hadoop/bin/stop-dfs.sh
16   -hadoop/bin/stop-jobhistoryserver.sh
17   -hadoop/bin/stop-mapred.sh
18   -hadoop/contrib/datajoin/hadoop-datajoin-${PKGVERSION}.jar
19   -hadoop/contrib/failmon/hadoop-failmon-${PKGVERSION}.jar
20   -hadoop/contrib/gridmix/hadoop-gridmix-${PKGVERSION}.jar
21   -hadoop/contrib/hdfsproxy/README
22   -hadoop/contrib/hdfsproxy/bin/hdfsproxy
23   -hadoop/contrib/hdfsproxy/bin/hdfsproxy-config.sh
24   -hadoop/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
25   -hadoop/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh
26   -hadoop/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
27   -hadoop/contrib/hdfsproxy/bin/start-hdfsproxy.sh
28   -hadoop/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
29   -hadoop/contrib/hdfsproxy/build.xml
30   -hadoop/contrib/hdfsproxy/conf/configuration.xsl
31   -hadoop/contrib/hdfsproxy/conf/hdfsproxy-default.xml
32   -hadoop/contrib/hdfsproxy/conf/hdfsproxy-env.sh
33   -hadoop/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template
34   -hadoop/contrib/hdfsproxy/conf/hdfsproxy-hosts
35   -hadoop/contrib/hdfsproxy/conf/log4j.properties
36   -hadoop/contrib/hdfsproxy/conf/ssl-server.xml
37   -hadoop/contrib/hdfsproxy/conf/tomcat-forward-web.xml
38   -hadoop/contrib/hdfsproxy/conf/tomcat-web.xml
39   -hadoop/contrib/hdfsproxy/conf/user-certs.xml
40   -hadoop/contrib/hdfsproxy/conf/user-permissions.xml
41   -hadoop/contrib/hdfsproxy/hdfsproxy-2.0.jar
42   -hadoop/contrib/hod/CHANGES.txt
43   -hadoop/contrib/hod/README
44   -hadoop/contrib/hod/bin/VERSION
45   -hadoop/contrib/hod/bin/checknodes
46   -hadoop/contrib/hod/bin/hod
47   -hadoop/contrib/hod/bin/hodcleanup
48   -hadoop/contrib/hod/bin/hodring
49   -hadoop/contrib/hod/bin/ringmaster
50   -hadoop/contrib/hod/bin/verify-account
51   -hadoop/contrib/hod/build.xml
52   -hadoop/contrib/hod/conf/hodrc
53   -hadoop/contrib/hod/config.txt
54   -hadoop/contrib/hod/getting_started.txt
55   -hadoop/contrib/hod/hodlib/AllocationManagers/__init__.py
56   -hadoop/contrib/hod/hodlib/AllocationManagers/goldAllocationManager.py
57   -hadoop/contrib/hod/hodlib/Common/__init__.py
58   -hadoop/contrib/hod/hodlib/Common/allocationManagerUtil.py
59   -hadoop/contrib/hod/hodlib/Common/desc.py
60   -hadoop/contrib/hod/hodlib/Common/descGenerator.py
61   -hadoop/contrib/hod/hodlib/Common/hodsvc.py
62   -hadoop/contrib/hod/hodlib/Common/logger.py
63   -hadoop/contrib/hod/hodlib/Common/miniHTMLParser.py
64   -hadoop/contrib/hod/hodlib/Common/nodepoolutil.py
65   -hadoop/contrib/hod/hodlib/Common/setup.py
66   -hadoop/contrib/hod/hodlib/Common/socketServers.py
67   -hadoop/contrib/hod/hodlib/Common/tcp.py
68   -hadoop/contrib/hod/hodlib/Common/threads.py
69   -hadoop/contrib/hod/hodlib/Common/types.py
70   -hadoop/contrib/hod/hodlib/Common/util.py
71   -hadoop/contrib/hod/hodlib/Common/xmlrpc.py
72   -hadoop/contrib/hod/hodlib/GridServices/__init__.py
73   -hadoop/contrib/hod/hodlib/GridServices/hdfs.py
74   -hadoop/contrib/hod/hodlib/GridServices/mapred.py
75   -hadoop/contrib/hod/hodlib/GridServices/service.py
76   -hadoop/contrib/hod/hodlib/Hod/__init__.py
77   -hadoop/contrib/hod/hodlib/Hod/hadoop.py
78   -hadoop/contrib/hod/hodlib/Hod/hod.py
79   -hadoop/contrib/hod/hodlib/Hod/nodePool.py
80   -hadoop/contrib/hod/hodlib/HodRing/__init__.py
81   -hadoop/contrib/hod/hodlib/HodRing/hodRing.py
82   -hadoop/contrib/hod/hodlib/NodePools/__init__.py
83   -hadoop/contrib/hod/hodlib/NodePools/torque.py
84   -hadoop/contrib/hod/hodlib/RingMaster/__init__.py
85   -hadoop/contrib/hod/hodlib/RingMaster/idleJobTracker.py
86   -hadoop/contrib/hod/hodlib/RingMaster/ringMaster.py
87   -hadoop/contrib/hod/hodlib/Schedulers/__init__.py
88   -hadoop/contrib/hod/hodlib/Schedulers/torque.py
89   -hadoop/contrib/hod/hodlib/ServiceProxy/__init__.py
90   -hadoop/contrib/hod/hodlib/ServiceProxy/serviceProxy.py
91   -hadoop/contrib/hod/hodlib/ServiceRegistry/__init__.py
92   -hadoop/contrib/hod/hodlib/ServiceRegistry/serviceRegistry.py
93   -hadoop/contrib/hod/hodlib/__init__.py
94   -hadoop/contrib/hod/ivy.xml
95   -hadoop/contrib/hod/ivy/libraries.properties
96   -hadoop/contrib/hod/support/checklimits.sh
97   -hadoop/contrib/hod/support/logcondense.py
98   -hadoop/contrib/hod/testing/__init__.py
99   -hadoop/contrib/hod/testing/helper.py
100   -hadoop/contrib/hod/testing/lib.py
101   -hadoop/contrib/hod/testing/main.py
102   -hadoop/contrib/hod/testing/testHadoop.py
103   -hadoop/contrib/hod/testing/testHod.py
104   -hadoop/contrib/hod/testing/testHodCleanup.py
105   -hadoop/contrib/hod/testing/testHodRing.py
106   -hadoop/contrib/hod/testing/testModule.py
107   -hadoop/contrib/hod/testing/testRingmasterRPCs.py
108   -hadoop/contrib/hod/testing/testThreads.py
109   -hadoop/contrib/hod/testing/testTypes.py
110   -hadoop/contrib/hod/testing/testUtil.py
111   -hadoop/contrib/hod/testing/testXmlrpc.py
112   -hadoop/contrib/index/hadoop-index-${PKGVERSION}.jar
113   -hadoop/contrib/streaming/hadoop-streaming-${PKGVERSION}.jar
114   -hadoop/contrib/vaidya/bin/vaidya.sh
115   -hadoop/contrib/vaidya/conf/postex_diagnosis_tests.xml
116   -hadoop/contrib/vaidya/hadoop-vaidya-${PKGVERSION}.jar
117   -hadoop/hadoop-ant-${PKGVERSION}.jar
118   -hadoop/hadoop-client-${PKGVERSION}.jar
119   -hadoop/hadoop-core-${PKGVERSION}.jar
120   -hadoop/hadoop-examples-${PKGVERSION}.jar
121   -hadoop/hadoop-minicluster-${PKGVERSION}.jar
122   -hadoop/hadoop-test-${PKGVERSION}.jar
123   -hadoop/hadoop-tools-${PKGVERSION}.jar
124   -hadoop/lib/asm-3.2.jar
125   -hadoop/lib/aspectjrt-1.6.5.jar
126   -hadoop/lib/aspectjtools-1.6.5.jar
127   -hadoop/lib/commons-beanutils-1.7.0.jar
128   -hadoop/lib/commons-beanutils-core-1.8.0.jar
129   -hadoop/lib/commons-cli-1.2.jar
130   -hadoop/lib/commons-codec-1.4.jar
131   -hadoop/lib/commons-collections-3.2.1.jar
132   -hadoop/lib/commons-configuration-1.6.jar
133   -hadoop/lib/commons-daemon-1.0.1.jar
134   -hadoop/lib/commons-digester-1.8.jar
135   -hadoop/lib/commons-el-1.0.jar
136   -hadoop/lib/commons-httpclient-3.0.1.jar
137   -hadoop/lib/commons-io-2.1.jar
138   -hadoop/lib/commons-lang-2.4.jar
139   -hadoop/lib/commons-logging-1.1.1.jar
140   -hadoop/lib/commons-logging-api-1.0.4.jar
141   -hadoop/lib/commons-math-2.1.jar
142   -hadoop/lib/commons-net-1.4.1.jar
143   -hadoop/lib/core-3.1.1.jar
144   -hadoop/lib/hadoop-capacity-scheduler-${PKGVERSION}.jar
145   -hadoop/lib/hadoop-fairscheduler-${PKGVERSION}.jar
146   -hadoop/lib/hadoop-thriftfs-${PKGVERSION}.jar
147   -hadoop/lib/hsqldb-1.8.0.10.LICENSE.txt
148   -hadoop/lib/hsqldb-1.8.0.10.jar
149   -hadoop/lib/jackson-core-asl-1.8.8.jar
150   -hadoop/lib/jackson-mapper-asl-1.8.8.jar
151   -hadoop/lib/jasper-compiler-5.5.12.jar
152   -hadoop/lib/jasper-runtime-5.5.12.jar
153   -hadoop/lib/jdeb-0.8.jar
154   -hadoop/lib/jdiff/hadoop_0.17.0.xml
155   -hadoop/lib/jdiff/hadoop_0.18.1.xml
156   -hadoop/lib/jdiff/hadoop_0.18.2.xml
157   -hadoop/lib/jdiff/hadoop_0.18.3.xml
158   -hadoop/lib/jdiff/hadoop_0.19.0.xml
159   -hadoop/lib/jdiff/hadoop_0.19.1.xml
160   -hadoop/lib/jdiff/hadoop_0.19.2.xml
161   -hadoop/lib/jdiff/hadoop_0.20.1.xml
162   -hadoop/lib/jdiff/hadoop_0.20.205.0.xml
163   -hadoop/lib/jdiff/hadoop_1.0.0.xml
164   -hadoop/lib/jdiff/hadoop_1.0.1.xml
165   -hadoop/lib/jdiff/hadoop_1.0.2.xml
166   -hadoop/lib/jdiff/hadoop_1.0.3.xml
167   -hadoop/lib/jdiff/hadoop_${PKGVERSION}.xml
168   -hadoop/lib/jersey-core-1.8.jar
169   -hadoop/lib/jersey-json-1.8.jar
170   -hadoop/lib/jersey-server-1.8.jar
171   -hadoop/lib/jets3t-0.6.1.jar
172   -hadoop/lib/jetty-6.1.26.jar
173   -hadoop/lib/jetty-util-6.1.26.jar
174   -hadoop/lib/jsch-0.1.42.jar
175   -hadoop/lib/jsp-2.1/jsp-2.1.jar
176   -hadoop/lib/jsp-2.1/jsp-api-2.1.jar
177   -hadoop/lib/junit-4.5.jar
178   -hadoop/lib/kfs-0.2.2.jar
179   -hadoop/lib/kfs-0.2.LICENSE.txt
180   -hadoop/lib/log4j-1.2.15.jar
181   -hadoop/lib/mockito-all-1.8.5.jar
182   -hadoop/lib/native/${HADOOP_ARCH}/libhadoop.la
183   -hadoop/lib/oro-2.0.8.jar
184   -hadoop/lib/servlet-api-2.5-20081211.jar
185   -hadoop/lib/slf4j-api-1.4.3.jar
186   -hadoop/lib/slf4j-log4j12-1.4.3.jar
187   -hadoop/lib/xmlenc-0.52.jar
188   -hadoop/webapps/datanode/WEB-INF/web.xml
189   -hadoop/webapps/hdfs/WEB-INF/web.xml
190   -hadoop/webapps/hdfs/index.html
191   -hadoop/webapps/history/WEB-INF/web.xml
192   -hadoop/webapps/job/WEB-INF/web.xml
193   -hadoop/webapps/job/analysejobhistory.jsp
194   -hadoop/webapps/job/gethistory.jsp
195   -hadoop/webapps/job/index.html
196   -hadoop/webapps/job/job_authorization_error.jsp
197   -hadoop/webapps/job/jobblacklistedtrackers.jsp
198   -hadoop/webapps/job/jobconf.jsp
199   -hadoop/webapps/job/jobconf_history.jsp
200   -hadoop/webapps/job/jobdetails.jsp
201   -hadoop/webapps/job/jobdetailshistory.jsp
202   -hadoop/webapps/job/jobfailures.jsp
203   -hadoop/webapps/job/jobhistory.jsp
204   -hadoop/webapps/job/jobhistoryhome.jsp
205   -hadoop/webapps/job/jobqueue_details.jsp
206   -hadoop/webapps/job/jobtasks.jsp
207   -hadoop/webapps/job/jobtaskshistory.jsp
208   -hadoop/webapps/job/jobtracker.jsp
209   -hadoop/webapps/job/legacyjobhistory.jsp
210   -hadoop/webapps/job/loadhistory.jsp
211   -hadoop/webapps/job/machines.jsp
212   -hadoop/webapps/job/taskdetails.jsp
213   -hadoop/webapps/job/taskdetailshistory.jsp
214   -hadoop/webapps/job/taskstats.jsp
215   -hadoop/webapps/job/taskstatshistory.jsp
216   -hadoop/webapps/static/hadoop-logo.jpg
217   -hadoop/webapps/static/hadoop.css
218   -hadoop/webapps/static/jobconf.xsl
219   -hadoop/webapps/static/jobtracker.js
220   -hadoop/webapps/static/sorttable.js
221   -hadoop/webapps/task/WEB-INF/web.xml
222   -hadoop/webapps/task/index.html
  2 +bin/hadoop
223 3 include/hadoop/Pipes.hh
224 4 include/hadoop/SerialUtils.hh
225 5 include/hadoop/StringUtils.hh
226 6 include/hadoop/TemplateFactory.hh
  7 +lib/libhadoop.la
227 8 lib/libhadooppipes.a
228 9 lib/libhadooputils.a
229 10 lib/libhdfs.la
  11 +libexec/hadoop-config.sh
  12 +sbin/hadoop-create-user.sh
  13 +sbin/hadoop-daemon.sh
  14 +sbin/hadoop-daemons.sh
  15 +sbin/hadoop-setup-applications.sh
  16 +sbin/hadoop-setup-conf.sh
  17 +sbin/hadoop-setup-hdfs.sh
  18 +sbin/hadoop-setup-single-node.sh
  19 +sbin/hadoop-validate-setup.sh
  20 +sbin/rcc
  21 +sbin/slaves.sh
  22 +sbin/start-all.sh
  23 +sbin/start-balancer.sh
  24 +sbin/start-dfs.sh
  25 +sbin/start-jobhistoryserver.sh
  26 +sbin/start-mapred.sh
  27 +sbin/stop-all.sh
  28 +sbin/stop-balancer.sh
  29 +sbin/stop-dfs.sh
  30 +sbin/stop-jobhistoryserver.sh
  31 +sbin/stop-mapred.sh
  32 +sbin/update-hadoop-env.sh
  33 +share/doc/hadoop/CHANGES.txt
  34 +share/doc/hadoop/LICENSE.txt
  35 +share/doc/hadoop/NOTICE.txt
  36 +share/doc/hadoop/README.txt
230 37 share/examples/hadoop/capacity-scheduler.xml
231 38 share/examples/hadoop/configuration.xsl
232   -share/examples/hadoop/core-default.xml
233 39 share/examples/hadoop/core-site.xml
234 40 share/examples/hadoop/fair-scheduler.xml
235 41 share/examples/hadoop/hadoop-env.sh
236   -share/examples/hadoop/hadoop-examples-${PKGVERSION}.jar
237 42 share/examples/hadoop/hadoop-metrics2.properties
238 43 share/examples/hadoop/hadoop-policy.xml
239   -share/examples/hadoop/hdfs-default.xml
240 44 share/examples/hadoop/hdfs-site.xml
241 45 share/examples/hadoop/log4j.properties
242   -share/examples/hadoop/mapred-default.xml
243 46 share/examples/hadoop/mapred-queue-acls.xml
244 47 share/examples/hadoop/mapred-site.xml
245 48 share/examples/hadoop/masters
@@ -247,5 +50,220 @@ share/examples/hadoop/slaves
247 50 share/examples/hadoop/ssl-client.xml.example
248 51 share/examples/hadoop/ssl-server.xml.example
249 52 share/examples/hadoop/taskcontroller.cfg
250   -@pkgdir hadoop/webapps/secondary/WEB-INF
251   -@pkgdir hadoop/contrib/hdfsproxy/logs
  53 +share/hadoop/contrib/datajoin/hadoop-datajoin-${PKGVERSION_NOREV}.jar
  54 +share/hadoop/contrib/failmon/hadoop-failmon-${PKGVERSION_NOREV}.jar
  55 +share/hadoop/contrib/gridmix/hadoop-gridmix-${PKGVERSION_NOREV}.jar
  56 +share/hadoop/contrib/hdfsproxy/README
  57 +share/hadoop/contrib/hdfsproxy/bin/hdfsproxy
  58 +share/hadoop/contrib/hdfsproxy/bin/hdfsproxy-config.sh
  59 +share/hadoop/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
  60 +share/hadoop/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh
  61 +share/hadoop/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
  62 +share/hadoop/contrib/hdfsproxy/bin/start-hdfsproxy.sh
  63 +share/hadoop/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
  64 +share/hadoop/contrib/hdfsproxy/build.xml
  65 +share/hadoop/contrib/hdfsproxy/conf/configuration.xsl
  66 +share/hadoop/contrib/hdfsproxy/conf/hdfsproxy-default.xml
  67 +share/hadoop/contrib/hdfsproxy/conf/hdfsproxy-env.sh
  68 +share/hadoop/contrib/hdfsproxy/conf/hdfsproxy-hosts
  69 +share/hadoop/contrib/hdfsproxy/conf/log4j.properties
  70 +share/hadoop/contrib/hdfsproxy/conf/ssl-server.xml
  71 +share/hadoop/contrib/hdfsproxy/conf/tomcat-forward-web.xml
  72 +share/hadoop/contrib/hdfsproxy/conf/tomcat-web.xml
  73 +share/hadoop/contrib/hdfsproxy/conf/user-certs.xml
  74 +share/hadoop/contrib/hdfsproxy/conf/user-permissions.xml
  75 +share/hadoop/contrib/hdfsproxy/hdfsproxy-2.0.jar
  76 +share/hadoop/contrib/hod/CHANGES.txt
  77 +share/hadoop/contrib/hod/README
  78 +share/hadoop/contrib/hod/bin/VERSION
  79 +share/hadoop/contrib/hod/bin/checknodes
  80 +share/hadoop/contrib/hod/bin/hod
  81 +share/hadoop/contrib/hod/bin/hodcleanup
  82 +share/hadoop/contrib/hod/bin/hodring
  83 +share/hadoop/contrib/hod/bin/ringmaster
  84 +share/hadoop/contrib/hod/bin/verify-account
  85 +share/hadoop/contrib/hod/build.xml
  86 +share/hadoop/contrib/hod/conf/hodrc
  87 +share/hadoop/contrib/hod/config.txt
  88 +share/hadoop/contrib/hod/getting_started.txt
  89 +share/hadoop/contrib/hod/hodlib/AllocationManagers/__init__.py
  90 +share/hadoop/contrib/hod/hodlib/AllocationManagers/goldAllocationManager.py
  91 +share/hadoop/contrib/hod/hodlib/Common/__init__.py
  92 +share/hadoop/contrib/hod/hodlib/Common/allocationManagerUtil.py
  93 +share/hadoop/contrib/hod/hodlib/Common/desc.py
  94 +share/hadoop/contrib/hod/hodlib/Common/descGenerator.py
  95 +share/hadoop/contrib/hod/hodlib/Common/hodsvc.py
  96 +share/hadoop/contrib/hod/hodlib/Common/logger.py
  97 +share/hadoop/contrib/hod/hodlib/Common/miniHTMLParser.py
  98 +share/hadoop/contrib/hod/hodlib/Common/nodepoolutil.py
  99 +share/hadoop/contrib/hod/hodlib/Common/setup.py
  100 +share/hadoop/contrib/hod/hodlib/Common/socketServers.py
  101 +share/hadoop/contrib/hod/hodlib/Common/tcp.py
  102 +share/hadoop/contrib/hod/hodlib/Common/threads.py
  103 +share/hadoop/contrib/hod/hodlib/Common/types.py
  104 +share/hadoop/contrib/hod/hodlib/Common/util.py
  105 +share/hadoop/contrib/hod/hodlib/Common/xmlrpc.py
  106 +share/hadoop/contrib/hod/hodlib/GridServices/__init__.py
  107 +share/hadoop/contrib/hod/hodlib/GridServices/hdfs.py
  108 +share/hadoop/contrib/hod/hodlib/GridServices/mapred.py
  109 +share/hadoop/contrib/hod/hodlib/GridServices/service.py
  110 +share/hadoop/contrib/hod/hodlib/Hod/__init__.py
  111 +share/hadoop/contrib/hod/hodlib/Hod/hadoop.py
  112 +share/hadoop/contrib/hod/hodlib/Hod/hod.py
  113 +share/hadoop/contrib/hod/hodlib/Hod/nodePool.py
  114 +share/hadoop/contrib/hod/hodlib/HodRing/__init__.py
  115 +share/hadoop/contrib/hod/hodlib/HodRing/hodRing.py
  116 +share/hadoop/contrib/hod/hodlib/NodePools/__init__.py
  117 +share/hadoop/contrib/hod/hodlib/NodePools/torque.py
  118 +share/hadoop/contrib/hod/hodlib/RingMaster/__init__.py
  119 +share/hadoop/contrib/hod/hodlib/RingMaster/idleJobTracker.py
  120 +share/hadoop/contrib/hod/hodlib/RingMaster/ringMaster.py
  121 +share/hadoop/contrib/hod/hodlib/Schedulers/__init__.py
  122 +share/hadoop/contrib/hod/hodlib/Schedulers/torque.py
  123 +share/hadoop/contrib/hod/hodlib/ServiceProxy/__init__.py
  124 +share/hadoop/contrib/hod/hodlib/ServiceProxy/serviceProxy.py
  125 +share/hadoop/contrib/hod/hodlib/ServiceRegistry/__init__.py
  126 +share/hadoop/contrib/hod/hodlib/ServiceRegistry/serviceRegistry.py
  127 +share/hadoop/contrib/hod/hodlib/__init__.py
  128 +share/hadoop/contrib/hod/ivy.xml
  129 +share/hadoop/contrib/hod/ivy/libraries.properties
  130 +share/hadoop/contrib/hod/support/checklimits.sh
  131 +share/hadoop/contrib/hod/support/logcondense.py
  132 +share/hadoop/contrib/hod/testing/__init__.py
  133 +share/hadoop/contrib/hod/testing/helper.py
  134 +share/hadoop/contrib/hod/testing/lib.py
  135 +share/hadoop/contrib/hod/testing/main.py
  136 +share/hadoop/contrib/hod/testing/testHadoop.py
  137 +share/hadoop/contrib/hod/testing/testHod.py
  138 +share/hadoop/contrib/hod/testing/testHodCleanup.py
  139 +share/hadoop/contrib/hod/testing/testHodRing.py
  140 +share/hadoop/contrib/hod/testing/testModule.py
  141 +share/hadoop/contrib/hod/testing/testRingmasterRPCs.py
  142 +share/hadoop/contrib/hod/testing/testThreads.py
  143 +share/hadoop/contrib/hod/testing/testTypes.py
  144 +share/hadoop/contrib/hod/testing/testUtil.py
  145 +share/hadoop/contrib/hod/testing/testXmlrpc.py
  146 +share/hadoop/contrib/index/hadoop-index-${PKGVERSION_NOREV}.jar
  147 +share/hadoop/contrib/streaming/hadoop-streaming-${PKGVERSION_NOREV}.jar
  148 +share/hadoop/contrib/vaidya/bin/vaidya.sh
  149 +share/hadoop/contrib/vaidya/conf/postex_diagnosis_tests.xml
  150 +share/hadoop/contrib/vaidya/hadoop-vaidya-${PKGVERSION_NOREV}.jar
  151 +share/hadoop/hadoop-ant-${PKGVERSION_NOREV}.jar
  152 +share/hadoop/hadoop-client-${PKGVERSION_NOREV}.jar
  153 +share/hadoop/hadoop-core-${PKGVERSION_NOREV}.jar
  154 +share/hadoop/hadoop-examples-${PKGVERSION_NOREV}.jar
  155 +share/hadoop/hadoop-minicluster-${PKGVERSION_NOREV}.jar
  156 +share/hadoop/hadoop-test-${PKGVERSION_NOREV}.jar
  157 +share/hadoop/hadoop-tools-${PKGVERSION_NOREV}.jar
  158 +share/hadoop/lib/asm-3.2.jar
  159 +share/hadoop/lib/aspectjrt-1.6.5.jar
  160 +share/hadoop/lib/aspectjtools-1.6.5.jar
  161 +share/hadoop/lib/commons-beanutils-1.7.0.jar
  162 +share/hadoop/lib/commons-beanutils-core-1.8.0.jar
  163 +share/hadoop/lib/commons-cli-1.2.jar
  164 +share/hadoop/lib/commons-codec-1.4.jar
  165 +share/hadoop/lib/commons-collections-3.2.1.jar
  166 +share/hadoop/lib/commons-configuration-1.6.jar
  167 +share/hadoop/lib/commons-daemon-1.0.1.jar
  168 +share/hadoop/lib/commons-digester-1.8.jar
  169 +share/hadoop/lib/commons-el-1.0.jar
  170 +share/hadoop/lib/commons-httpclient-3.0.1.jar
  171 +share/hadoop/lib/commons-io-2.1.jar
  172 +share/hadoop/lib/commons-lang-2.4.jar
  173 +share/hadoop/lib/commons-logging-1.1.1.jar
  174 +share/hadoop/lib/commons-logging-api-${PKGVERSION_NOREV}.jar
  175 +share/hadoop/lib/commons-math-2.1.jar
  176 +share/hadoop/lib/commons-net-1.4.1.jar
  177 +share/hadoop/lib/core-3.1.1.jar
  178 +share/hadoop/lib/hadoop-capacity-scheduler-${PKGVERSION_NOREV}.jar
  179 +share/hadoop/lib/hadoop-fairscheduler-${PKGVERSION_NOREV}.jar
  180 +share/hadoop/lib/hadoop-thriftfs-${PKGVERSION_NOREV}.jar
  181 +share/hadoop/lib/hsqldb-1.8.0.10.LICENSE.txt
  182 +share/hadoop/lib/hsqldb-1.8.0.10.jar
  183 +share/hadoop/lib/jackson-core-asl-1.8.8.jar
  184 +share/hadoop/lib/jackson-mapper-asl-1.8.8.jar
  185 +share/hadoop/lib/jasper-compiler-5.5.12.jar
  186 +share/hadoop/lib/jasper-runtime-5.5.12.jar
  187 +share/hadoop/lib/jdeb-0.8.jar
  188 +share/hadoop/lib/jdiff/hadoop_0.17.0.xml
  189 +share/hadoop/lib/jdiff/hadoop_0.18.1.xml
  190 +share/hadoop/lib/jdiff/hadoop_0.18.2.xml
  191 +share/hadoop/lib/jdiff/hadoop_0.18.3.xml
  192 +share/hadoop/lib/jdiff/hadoop_0.19.0.xml
  193 +share/hadoop/lib/jdiff/hadoop_0.19.1.xml
  194 +share/hadoop/lib/jdiff/hadoop_0.19.2.xml
  195 +share/hadoop/lib/jdiff/hadoop_0.20.1.xml
  196 +share/hadoop/lib/jdiff/hadoop_0.20.205.0.xml
  197 +share/hadoop/lib/jdiff/hadoop_1.0.0.xml
  198 +share/hadoop/lib/jdiff/hadoop_1.0.1.xml
  199 +share/hadoop/lib/jdiff/hadoop_1.0.2.xml
  200 +share/hadoop/lib/jdiff/hadoop_1.0.3.xml
  201 +share/hadoop/lib/jdiff/hadoop_${PKGVERSION_NOREV}.xml
  202 +share/hadoop/lib/jersey-core-1.8.jar
  203 +share/hadoop/lib/jersey-json-1.8.jar
  204 +share/hadoop/lib/jersey-server-1.8.jar
  205 +share/hadoop/lib/jets3t-0.6.1.jar
  206 +share/hadoop/lib/jetty-6.1.26.jar
  207 +share/hadoop/lib/jetty-util-6.1.26.jar
  208 +share/hadoop/lib/jsch-0.1.42.jar
  209 +share/hadoop/lib/jsp-2.1/jsp-2.1.jar
  210 +share/hadoop/lib/jsp-2.1/jsp-api-2.1.jar
  211 +share/hadoop/lib/junit-4.5.jar
  212 +share/hadoop/lib/kfs-0.2.2.jar
  213 +share/hadoop/lib/kfs-0.2.LICENSE.txt
  214 +share/hadoop/lib/log4j-1.2.15.jar
  215 +share/hadoop/lib/mockito-all-1.8.5.jar
  216 +share/hadoop/lib/oro-2.0.8.jar
  217 +share/hadoop/lib/servlet-api-2.5-20081211.jar
  218 +share/hadoop/lib/slf4j-api-1.4.3.jar
  219 +share/hadoop/lib/slf4j-log4j12-1.4.3.jar
  220 +share/hadoop/lib/xmlenc-0.52.jar
  221 +share/hadoop/templates/conf/capacity-scheduler.xml
  222 +share/hadoop/templates/conf/commons-logging.properties
  223 +share/hadoop/templates/conf/core-site.xml
  224 +share/hadoop/templates/conf/hadoop-env.sh
  225 +share/hadoop/templates/conf/hadoop-metrics2.properties
  226 +share/hadoop/templates/conf/hadoop-policy.xml
  227 +share/hadoop/templates/conf/hdfs-site.xml
  228 +share/hadoop/templates/conf/log4j.properties
  229 +share/hadoop/templates/conf/mapred-queue-acls.xml
  230 +share/hadoop/templates/conf/mapred-site.xml
  231 +share/hadoop/templates/conf/taskcontroller.cfg
  232 +share/hadoop/webapps/datanode/WEB-INF/web.xml
  233 +share/hadoop/webapps/hdfs/WEB-INF/web.xml
  234 +share/hadoop/webapps/hdfs/index.html
  235 +share/hadoop/webapps/history/WEB-INF/web.xml
  236 +share/hadoop/webapps/job/WEB-INF/web.xml
  237 +share/hadoop/webapps/job/analysejobhistory.jsp
  238 +share/hadoop/webapps/job/gethistory.jsp
  239 +share/hadoop/webapps/job/index.html
  240 +share/hadoop/webapps/job/job_authorization_error.jsp
  241 +share/hadoop/webapps/job/jobblacklistedtrackers.jsp
  242 +share/hadoop/webapps/job/jobconf.jsp
  243 +share/hadoop/webapps/job/jobconf_history.jsp
  244 +share/hadoop/webapps/job/jobdetails.jsp
  245 +share/hadoop/webapps/job/jobdetailshistory.jsp
  246 +share/hadoop/webapps/job/jobfailures.jsp
  247 +share/hadoop/webapps/job/jobhistory.jsp
  248 +share/hadoop/webapps/job/jobhistoryhome.jsp
  249 +share/hadoop/webapps/job/jobqueue_details.jsp
  250 +share/hadoop/webapps/job/jobtasks.jsp
  251 +share/hadoop/webapps/job/jobtaskshistory.jsp
  252 +share/hadoop/webapps/job/jobtracker.jsp
  253 +share/hadoop/webapps/job/legacyjobhistory.jsp
  254 +share/hadoop/webapps/job/loadhistory.jsp
  255 +share/hadoop/webapps/job/machines.jsp
  256 +share/hadoop/webapps/job/taskdetails.jsp
  257 +share/hadoop/webapps/job/taskdetailshistory.jsp
  258 +share/hadoop/webapps/job/taskstats.jsp
  259 +share/hadoop/webapps/job/taskstatshistory.jsp
  260 +share/hadoop/webapps/static/hadoop-logo.jpg
  261 +share/hadoop/webapps/static/hadoop.css
  262 +share/hadoop/webapps/static/jobconf.xsl
  263 +share/hadoop/webapps/static/jobtracker.js
  264 +share/hadoop/webapps/static/sorttable.js
  265 +share/hadoop/webapps/task/WEB-INF/web.xml
  266 +share/hadoop/webapps/task/index.html
  267 +@pkgdir share/hadoop/webapps/secondary/WEB-INF
  268 +@pkgdir share/hadoop/examples
  269 +@pkgdir share/hadoop/contrib/hdfsproxy/logs
13 hadoop/distinfo
@@ -5,12 +5,15 @@ RMD160 (hadoop-1.0.4.tar.gz) = 54331429cbf18d67395ec7e0aadef9bdd77f1ffa
5 5 Size (hadoop-1.0.4.tar.gz) = 62793050 bytes
6 6 SHA1 (patch-bin_hadoop) = 312c6067c363d9d81fe616bc8c285a821206829f
7 7 SHA1 (patch-bin_hadoop-config.sh) = f2257fd33a1ebfb1142830dfd8d37d54bc2f72cb
8   -SHA1 (patch-build.xml) = 6efa65ffcaadd0c56c0549c50a9cfe7085bbeb26
9   -SHA1 (patch-conf_hadoop-env.sh) = 1cbbcc5543247db5e6b058c5405ec85343773408
  8 +SHA1 (patch-build.xml) = 1247841f1749b51caea67f780e5963949301c747
  9 +SHA1 (patch-conf_hadoop-env.sh) = fd0273208f6f2b4b9f04fdff376a51417a8b1e58
10 10 SHA1 (patch-src_c++_libhdfs_configure.ac) = 56c243c83a423626d38de03fe3f2ca8cc613305b
11 11 SHA1 (patch-src_c++_libhdfs_hdfsJniHelper.c) = 7655176e404cdf890eddb69761da1f94c749c92a
12   -SHA1 (patch-src_c++_pipes_impl_HadoopPipes.cc) = cdd7a093b4197f5bd4cb978ccf7244394a9fc5e1
13   -SHA1 (patch-src_c++_task-controller_Makefile.in) = 1abb5d53b4c1a62786de9444b4fb096998926138
14   -SHA1 (patch-src_core_org_apache_hadoop_io_nativeio_NativeIO.java) = d716165847959ada61472e23e607219980d984ba
  12 +SHA1 (patch-src_c++_pipes_impl_HadoopPipes.cc) = a61ce3e64a3e240e4a5c138a32c14c877b9783a9
  13 +SHA1 (patch-src_c++_utils_m4__hadoop_utils.m4) = f7533a1871ede335df7bf9ce5f160fd685652dbd
  14 +SHA1 (patch-src_core_core-default.xml) = 86e18ba30e84827c83612fb4a3d9f6b8327bcdd5
  15 +SHA1 (patch-src_core_org_apache_hadoop_io_nativeio_NativeIO.java) = e05d3566522a9aa334077ec9dbd89659c7d42087
  16 +SHA1 (patch-src_mapred_org_apache_hadoop_mapred_TaskRunner.java) = ec13a84f8a879e4face71a3cba60ac4dad3dd25c
15 17 SHA1 (patch-src_native_acinclude.m4) = 451c852d8aca3d23f7424afa0d6b17a6f61c7168
16 18 SHA1 (patch-src_native_configure.ac) = cc35857e70eed83274763074648ada0e0497013c
  19 +SHA1 (patch-src_saveVersion.sh) = 71a2688a011dfc91c2ed48b50c469941f80e1573
180 hadoop/patches/patch-build.xml
... ... @@ -1,116 +1,86 @@
1 1 $NetBSD$
2 2
3   ---- build.xml.orig 2012-05-08 20:35:00.000000000 +0000
  3 +The task-controller and jsvc components only build on Linux. The librecordio
  4 +component doesn't like to build against xerces-c (recent GCC too aggressive?).
  5 +Simplify installation phase for pkgsrc purposes.
  6 +--- build.xml.orig 2012-10-03 05:17:24.000000000 +0000
4 7 +++ build.xml
5   -@@ -443,14 +443,14 @@
6   - <!-- ====================================================== -->
7   - <!-- Compile the Java files -->
8   - <!-- ====================================================== -->
9   -- <target name="record-parser" depends="init" if="javacc.home">
10   -+ <target name="record-parser" if="javacc.home">
11   - <javacc
12   - target="${core.src.dir}/org/apache/hadoop/record/compiler/generated/rcc.jj"
13   - outputdirectory="${core.src.dir}/org/apache/hadoop/record/compiler/generated"
14   - javacchome="${javacc.home}" />
15   - </target>
16   -
17   -- <target name="compile-rcc-compiler" depends="init, record-parser">
18   -+ <target name="compile-rcc-compiler" depends="init, record-parser">
19   - <javac
20   - encoding="${build.encoding}"
21   - srcdir="${core.src.dir}"
22   -@@ -470,7 +470,7 @@
23   - </taskdef>
24   - </target>
25   -
26   -- <target name="compile-core-classes" depends="init, compile-rcc-compiler">
27   -+ <target name="compile-core-classes" depends="compile-rcc-compiler">
28   - <taskdef classname="org.apache.jasper.JspC" name="jsp-compile" >
29   - <classpath refid="test.classpath"/>
30   - </taskdef>
31   -@@ -584,7 +584,7 @@
32   - </copy>
33   - </target>
  8 +@@ -1595,14 +1595,6 @@
34 9
35   -- <target name="compile-tools" depends="init">
36   -+ <target name="compile-tools">
37   - <javac
38   - encoding="${build.encoding}"
39   - srcdir="${tools.src}"
40   -@@ -620,7 +620,7 @@
41   - </exec>
  10 + <copy todir="${dist.dir}/" file="build.xml"/>
  11 +
  12 +- <subant target="task-controller">
  13 +- <fileset dir="." includes="build.xml"/>
  14 +- </subant>
  15 +-
  16 +- <subant target="jsvc">
  17 +- <fileset dir="." includes="build.xml"/>
  18 +- </subant>
  19 +-
  20 + <chmod perm="ugo+x" type="file" parallel="false">
  21 + <fileset dir="${dist.dir}/bin"/>
  22 + <fileset dir="${dist.dir}/sbin"/>
  23 +@@ -1667,17 +1659,16 @@
  24 + </macro_tar>
42 25 </target>
43 26
44   -- <target name="compile-core-native" depends="create-native-configure, compile-core-classes"
45   -+ <target name="compile-core-native" depends="create-native-configure"
46   - if="compile.native">
47   -
48   - <mkdir dir="${build.native}/lib"/>
49   -@@ -2019,7 +2019,7 @@
50   - <!-- librecordio targets. -->
51   - <!-- ================================================================== -->
  27 +- <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
  28 ++ <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks"
  29 + description="assembles platform-specific artifacts for binary targets">
  30 + <delete dir="${dist.dir}"/>
  31 + <mkdir dir="${dist.dir}"/>
  32 + <mkdir dir="${dist.dir}/bin"/>
  33 +- <mkdir dir="${dist.dir}/etc/hadoop"/>
  34 + <mkdir dir="${dist.dir}/lib"/>
  35 +- <mkdir dir="${dist.dir}/lib64"/>
  36 + <mkdir dir="${dist.dir}/libexec"/>
  37 + <mkdir dir="${dist.dir}/sbin"/>
  38 + <mkdir dir="${dist.dir}/share/${name}/contrib"/>
  39 ++ <mkdir dir="${dist.dir}/share/${name}/examples"/>
  40 + <mkdir dir="${dist.dir}/share/${name}/webapps"/>
  41 + <mkdir dir="${dist.dir}/share/${name}/templates/conf"/>
52 42
53   -- <target name="compile-librecordio" depends="init" if="librecordio" >
54   -+ <target name="compile-librecordio" if="librecordio" >
55   - <mkdir dir="${build.librecordio}"/>
56   - <exec dir="${librecordio.src}" executable="${make.cmd}" failonerror="true">
57   - <env key="XERCESCROOT" value="${xercescroot}"/>
58   -@@ -2053,7 +2053,7 @@
59   - </chmod>
60   - </target>
61   -
62   -- <target name="create-c++-configure" depends="init" if="compile.c++">
63   -+ <target name="create-c++-configure" if="compile.c++">
64   - <exec executable="autoreconf" dir="${c++.utils.src}" searchpath="yes"
65   - failonerror="yes">
66   - <arg value="-if"/>
67   -@@ -2076,7 +2076,7 @@
  43 +@@ -1706,7 +1697,7 @@
  44 + <exec dir="${dist.dir}" executable="sh" failonerror="true">
  45 + <env key="BASE_NATIVE_LIB_DIR" value="${lib.dir}/native"/>
  46 + <env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
  47 +- <env key="DIST_LIB_DIR" value="${dist.dir}/${lib.data.model}"/>
  48 ++ <env key="DIST_LIB_DIR" value="${dist.dir}/lib"/>
  49 + <env key="NATIVE_PLATFORM" value="${build.platform}" />
  50 + <arg line="${native.src.dir}/packageBinNativeHadoop.sh"/>
68 51 </exec>
69   - </target>
  52 +@@ -1743,7 +1734,7 @@
  53 + </fileset>
  54 + </copy>
70 55
71   -- <target name="check-c++-makefiles" depends="init" if="compile.c++">
72   -+ <target name="check-c++-makefiles" if="compile.c++">
73   - <condition property="need.c++.utils.makefile">
74   - <not> <available file="${build.c++.utils}/Makefile"/> </not>
75   - </condition>
76   -@@ -2097,7 +2097,7 @@
77   - </condition>
78   - </target>
  56 +- <copy todir="${dist.dir}/etc/hadoop">
  57 ++ <copy todir="${dist.dir}/share/examples/hadoop">
  58 + <fileset dir="${conf.dir}" excludes="**/*.template"/>
  59 + </copy>
79 60
80   -- <target name="check-c++-makefile-libhdfs" depends="init,check-c++-libhdfs" if="islibhdfs">
81   -+ <target name="check-c++-makefile-libhdfs" depends="check-c++-libhdfs" if="islibhdfs">
82   - <condition property="need.c++.libhdfs.makefile">
83   - <not> <available file="${build.c++.libhdfs}/Makefile"/> </not>
84   - </condition>
85   -@@ -2139,6 +2139,7 @@
86   - <chmod file="${c++.pipes.src}/configure" perm="ugo+x"/>
87   - <exec executable="${c++.pipes.src}/configure" dir="${build.c++.pipes}"
88   - failonerror="yes">
89   -+ <env key="LIBS" value="-lcrypto"/>
90   - <arg value="--prefix=${install.c++}"/>
91   - </exec>
92   - </target>
93   -@@ -2804,5 +2805,23 @@
94   - <fileset file="${jsvc.install.dir}/jsvc.${os.arch}"/>
95   - </chmod>
96   - </target>
97   -+ <target name="FreeBSD-dist" >
98   -+ <mkdir dir="${dist.dir}"/>
99   -+ <mkdir dir="${dist.dir}/lib"/>
100   -+ <mkdir dir="${dist.dir}/contrib"/>
101   -+ <mkdir dir="${dist.dir}/bin"/>
102   -+
103   -+ <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
104   -+ <fileset dir="lib">
105   -+ <exclude name="**/native/**"/>
106   -+ </fileset>
107   -+ </copy>
  61 +@@ -1765,19 +1756,16 @@
  62 + </fileset>
  63 + </copy>
  64 +
  65 +- <copy todir="${dist.dir}/${lib.data.model}" includeEmptyDirs="false" flatten="true">
  66 ++ <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
  67 + <fileset dir="${build.dir}/c++">
  68 +- <include name="${build.platform}/lib/*"/>
  69 ++ <include name="${build.platform}/lib/libhadoop*.a"/>
  70 ++ <include name="${build.platform}/lib/libhdfs.la"/>
  71 ++ <include name="${build.platform}/lib/libhdfs.so.0.0.0"/>
  72 + </fileset>
  73 + </copy>
  74 +
  75 +- <subant target="task-controller">
  76 +- <fileset dir="." includes="build.xml"/>
  77 +- </subant>
  78 +-
  79 +- <subant target="jsvc">
  80 +- <fileset dir="." includes="build.xml"/>
  81 +- </subant>
  82 ++ <symlink link="${dist.dir}/lib/libhdfs.so.0" resource="libhdfs.so.0.0.0"/>
  83 ++ <symlink link="${dist.dir}/lib/libhdfs.so" resource="libhdfs.so.0.0.0"/>
108 84
109   -+ <exec dir="${basedir}" executable="sh" failonerror="true">
110   -+ <env key="BASE_NATIVE_LIB_DIR" value="${basedir}/lib/native"/>
111   -+ <env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
112   -+ <env key="DIST_LIB_DIR" value="${basedir}/lib/native"/>
113   -+ <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
114   -+ </exec>
115   -+</target>
116   - </project>
  85 + <chmod perm="ugo+x" type="file" parallel="false">
  86 + <fileset dir="${dist.dir}/bin"/>
37 hadoop/patches/patch-conf_hadoop-env.sh
... ... @@ -1,8 +1,17 @@
1 1 $NetBSD$
2 2
3   -Set vars needed for selecting the architecture.
4   ---- conf/hadoop-env.sh.orig 2012-05-08 20:34:50.000000000 +0000
  3 +Set default variables.
  4 +--- conf/hadoop-env.sh.orig 2012-10-03 05:17:13.000000000 +0000
5 5 +++ conf/hadoop-env.sh
  6 +@@ -6,7 +6,7 @@
  7 + # remote nodes.
  8 +
  9 + # The java implementation to use. Required.
  10 +-# export JAVA_HOME=/usr/lib/j2sdk1.5-sun
  11 ++export JAVA_HOME=@PKG_JAVA_HOME@
  12 +
  13 + # Extra Java CLASSPATH elements. Optional.
  14 + # export HADOOP_CLASSPATH=
6 15 @@ -15,7 +15,7 @@
7 16 # export HADOOP_HEAPSIZE=2000
8 17
@@ -12,11 +21,21 @@ Set vars needed for selecting the architecture.
12 21
13 22 # Command specific options appended to HADOOP_OPTS when specified
14 23 export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
15   -@@ -26,6 +26,7 @@ export HADOOP_JOBTRACKER_OPTS="-Dcom.sun
16   - # export HADOOP_TASKTRACKER_OPTS=
17   - # The following applies to multiple commands (fs, dfs, fsck, distcp etc)
18   - # export HADOOP_CLIENT_OPTS
19   -+HADOOP_JAVA_PLATFORM_OPTS="@JAVA_ARCH_FLAG@ $HADOOP_JAVA_PLATFORM_OPTS"
20   -
21   - # Extra ssh options. Empty by default.
  24 +@@ -31,7 +31,7 @@ export HADOOP_JOBTRACKER_OPTS="-Dcom.sun
22 25 # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
  26 +
  27 + # Where log files are stored. $HADOOP_HOME/logs by default.
  28 +-# export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
  29 ++export HADOOP_LOG_DIR=@HADOOP_LOGDIR@
  30 +
  31 + # File naming remote slave hosts. $HADOOP_HOME/conf/slaves by default.
  32 + # export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
  33 +@@ -45,7 +45,7 @@ export HADOOP_JOBTRACKER_OPTS="-Dcom.sun
  34 + # export HADOOP_SLAVE_SLEEP=0.1
  35 +
  36 + # The directory where pid files are stored. /tmp by default.
  37 +-# export HADOOP_PID_DIR=/var/hadoop/pids
  38 ++export HADOOP_PID_DIR=@HADOOP_DIR@/pids
  39 +
  40 + # A string representing this instance of hadoop. $USER by default.
  41 + # export HADOOP_IDENT_STRING=$USER
2  hadoop/patches/patch-src_c++_pipes_impl_HadoopPipes.cc
... ... @@ -1,6 +1,6 @@
1 1 $NetBSD$
2 2
3   -Needs unistd for GCC 4.7.
  3 +Needs unistd.h for GCC 4.7.
4 4 --- src/c++/pipes/impl/HadoopPipes.cc.orig 2012-05-08 20:34:52.000000000 +0000
5 5 +++ src/c++/pipes/impl/HadoopPipes.cc
6 6 @@ -34,6 +34,7 @@
14 hadoop/patches/patch-src_c++_task-controller_Makefile.in
... ... @@ -1,14 +0,0 @@
1   -$NetBSD$
2   -
3   -Remove -Werror.
4   ---- src/c++/task-controller/Makefile.in.orig 2012-05-08 20:34:52.000000000 +0000
5   -+++ src/c++/task-controller/Makefile.in
6   -@@ -197,7 +197,7 @@ sbindir = @sbindir@
7   - sharedstatedir = @sharedstatedir@
8   - sysconfdir = @sysconfdir@
9   - target_alias = @target_alias@
10   --AM_CFLAGS = -I$(srcdir)/impl -Wall -g -Werror
11   -+AM_CFLAGS = -I$(srcdir)/impl -Wall -g
12   - TESTS = test-task-controller
13   -
14   - # Define the sources for the common files
16 hadoop/patches/patch-src_c++_utils_m4__hadoop_utils.m4
... ... @@ -0,0 +1,16 @@
  1 +$NetBSD$
  2 +
  3 +HMAC_Init is in libcrypto, not libssl.
  4 +--- src/c++/utils/m4/hadoop_utils.m4.orig 2012-05-08 20:34:52.000000000 +0000
  5 ++++ src/c++/utils/m4/hadoop_utils.m4
  6 +@@ -51,8 +51,8 @@ AC_CHECK_HEADERS([pthread.h], [],
  7 + AC_MSG_ERROR(Please check if you have installed the pthread library))
  8 + AC_CHECK_LIB([pthread], [pthread_create], [],
  9 + AC_MSG_ERROR(Cannot find libpthread.so, please check))
  10 +-AC_CHECK_LIB([ssl], [HMAC_Init], [],
  11 +- AC_MSG_ERROR(Cannot find libssl.so, please check))
  12 ++AC_CHECK_LIB([crypto], [HMAC_Init], [],
  13 ++ AC_MSG_ERROR(Cannot find libcrypto.so, please check))
  14 + ])
  15 +
  16 + # define a macro for using hadoop pipes
14 hadoop/patches/patch-src_core_core-default.xml
... ... @@ -0,0 +1,14 @@
  1 +$NetBSD$
  2 +
  3 +Fix default dir for temporary storage.
  4 +--- src/core/core-default.xml.orig 2012-05-08 20:34:52.000000000 +0000
  5 ++++ src/core/core-default.xml
  6 +@@ -11,7 +11,7 @@
  7 +
  8 + <property>
  9 + <name>hadoop.tmp.dir</name>
  10 +- <value>/tmp/hadoop-${user.name}</value>
  11 ++ <value>@HADOOP_DIR@/tmp</value>
  12 + <description>A base for other temporary directories.</description>
  13 + </property>
  14 +
2  hadoop/patches/patch-src_core_org_apache_hadoop_io_nativeio_NativeIO.java
... ... @@ -1,5 +1,7 @@
1 1 $NetBSD$
2 2
  3 +Set file system flags as per sys/fcntl.h on SunOS.
  4 +(This may need to be conditioned to to cater to Linux and BSD.)
3 5 --- src/core/org/apache/hadoop/io/nativeio/NativeIO.java.orig 2012-05-08 20:34:52.000000000 +0000
4 6 +++ src/core/org/apache/hadoop/io/nativeio/NativeIO.java
5 7 @@ -37,13 +37,13 @@ public class NativeIO {
15 hadoop/patches/patch-src_mapred_org_apache_hadoop_mapred_TaskRunner.java
... ... @@ -0,0 +1,15 @@
  1 +$NetBSD$
  2 +
  3 +Introduce a hook where to pass -d64 when 64bit JVM is needed.
  4 +--- src/mapred/org/apache/hadoop/mapred/TaskRunner.java.orig 2012-10-03 05:17:19.000000000 +0000
  5 ++++ src/mapred/org/apache/hadoop/mapred/TaskRunner.java
  6 +@@ -377,6 +377,9 @@ abstract class TaskRunner extends Thread
  7 +
  8 + vargs.add(jvm.toString());
  9 +
  10 ++ // Let pkgsrc inject -d64 here in case of a 64bit JVM
  11 ++ vargs.add("@JAVA_ARCH_FLAG@");
  12 ++
  13 + // Add child (task) java-vm options.
  14 + //
  15 + // The following symbols if present in mapred.{map|reduce}.child.java.opts
23 hadoop/patches/patch-src_saveVersion.sh
... ... @@ -0,0 +1,23 @@
  1 +$NetBSD$
  2 +
  3 +Use id instead of whoami for better portability. Use digest instead of md5sum.
  4 +--- src/saveVersion.sh.orig 2012-05-08 20:34:52.000000000 +0000
  5 ++++ src/saveVersion.sh
  6 +@@ -22,7 +22,7 @@ unset LANG
  7 + unset LC_CTYPE
  8 + version=$1
  9 + build_dir=$2
  10 +-user=`whoami`
  11 ++user=`id -un`
  12 + date=`date`
  13 + if [ -d .git ]; then
  14 + revision=`git log -1 --pretty=format:"%H"`
  15 +@@ -33,7 +33,7 @@ else
  16 + revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
  17 + url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
  18 + fi
  19 +-srcChecksum=`find src -name '*.java' | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1`
  20 ++srcChecksum=`find src -name '*.java' | LC_ALL=C sort | xargs digest md5 | digest md5 | cut -d ' ' -f 1`
  21 +
  22 + mkdir -p $build_dir/src/org/apache/hadoop
  23 + cat << EOF | \

0 comments on commit 87a51fc

Please sign in to comment.
Something went wrong with that request. Please try again.