Browse files

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

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

0 comments on commit 87a51fc

Please sign in to comment.