diff options
64 files changed, 138 insertions, 915 deletions
diff --git a/bigtop-packages/src/deb/bigtop-jsvc/compat b/bigtop-packages/src/deb/bigtop-jsvc/compat index 1e8b3149..7f8f011e 100755 --- a/bigtop-packages/src/deb/bigtop-jsvc/compat +++ b/bigtop-packages/src/deb/bigtop-jsvc/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/bigtop-jsvc/control b/bigtop-packages/src/deb/bigtop-jsvc/control index cb0a797b..63aa0362 100755 --- a/bigtop-packages/src/deb/bigtop-jsvc/control +++ b/bigtop-packages/src/deb/bigtop-jsvc/control @@ -16,7 +16,7 @@ Source: bigtop-jsvc Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), autoconf, automake, gcc +Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, gcc Standards-Version: 3.8.0 Homepage: http://commons.apache.org/daemon/ diff --git a/bigtop-packages/src/deb/bigtop-jsvc/rules b/bigtop-packages/src/deb/bigtop-jsvc/rules index ad82bfbd..13b352b1 100755 --- a/bigtop-packages/src/deb/bigtop-jsvc/rules +++ b/bigtop-packages/src/deb/bigtop-jsvc/rules @@ -23,54 +23,13 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS=-s -jsvc_pkg_name=bigtop-jsvc +%: + dh $@ -patch: patch-stamp -patch-stamp: - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/$(jsvc_pkg_name) - find debian -name .\*swp -exec rm -f {} \; - -build: build-stamp -build-stamp: patch-stamp +override_dh_auto_build: bash debian/do-component-build -Divy.home=${HOME}/.ivy2 - touch $@ -install-arch: - dh_testdir - dh_testroot +override_dh_auto_install: sh -x debian/install_jsvc.sh \ --build-dir=. \ --prefix=debian/tmp - dh_install -s --sourcedir=debian/tmp - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installinit - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture dependant packages using the common target. -binary: binary-arch -binary-arch: build install-arch binary-common - @echo Build is done - -.PHONY: build clean binary-indep binary install-indep binary-arch diff --git a/bigtop-packages/src/deb/bigtop-jsvc/source/format b/bigtop-packages/src/deb/bigtop-jsvc/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/bigtop-jsvc/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/bigtop-tomcat/compat b/bigtop-packages/src/deb/bigtop-tomcat/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/bigtop-tomcat/compat +++ b/bigtop-packages/src/deb/bigtop-tomcat/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/bigtop-tomcat/control b/bigtop-packages/src/deb/bigtop-tomcat/control index e7b5976f..4b5c1c9c 100644 --- a/bigtop-packages/src/deb/bigtop-tomcat/control +++ b/bigtop-packages/src/deb/bigtop-tomcat/control @@ -16,7 +16,7 @@ Source: bigtop-tomcat Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6) +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://tomcat.apache.org/ diff --git a/bigtop-packages/src/deb/bigtop-tomcat/rules b/bigtop-packages/src/deb/bigtop-tomcat/rules index 396f8b60..cc490f1b 100755 --- a/bigtop-packages/src/deb/bigtop-tomcat/rules +++ b/bigtop-packages/src/deb/bigtop-tomcat/rules @@ -23,67 +23,14 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/bigtop-tomcat - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: bash -x debian/install_tomcat.sh \ --build-dir=build \ --doc-dir=/usr/share/doc/bigtop-tomcat \ --prefix=debian/bigtop-tomcat - (dh_lintian) || /bin/true - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: - - -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arch diff --git a/bigtop-packages/src/deb/bigtop-tomcat/source/format b/bigtop-packages/src/deb/bigtop-tomcat/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/bigtop-tomcat/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/bigtop-utils/control b/bigtop-packages/src/deb/bigtop-utils/control index 091855e7..ce7af01a 100644 --- a/bigtop-packages/src/deb/bigtop-utils/control +++ b/bigtop-packages/src/deb/bigtop-utils/control @@ -16,7 +16,7 @@ Source: bigtop-utils Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 7.0.0~) +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://incubator.apache.org/bigtop/ diff --git a/bigtop-packages/src/deb/bigtop-utils/rules b/bigtop-packages/src/deb/bigtop-utils/rules index d860d78d..984b2ff8 100644 --- a/bigtop-packages/src/deb/bigtop-utils/rules +++ b/bigtop-packages/src/deb/bigtop-utils/rules @@ -25,52 +25,12 @@ export DH_OPTIONS DISTRO_CODENAME=$(shell lsb_release -sc) -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -build: - dh_testdir - dh_clean -k - - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - find debian -name .\*swp -exec rm -f {} \; - -install: install-indep -install-indep: - dh_installdirs +override_dh_auto_install: # Copy repo file install -d -p -m 755 debian/bigtop-utils/usr/lib/bigtop-utils/ install -p -m 755 debian/bigtop-detect-javahome debian/bigtop-utils/usr/lib/bigtop-utils/ install -d -p -m 755 debian/bigtop-utils/etc/default install -p -m 644 debian/bigtop-utils.default debian/bigtop-utils/etc/default/bigtop-utils - dh_install - - -binary-common: - dh_testdir - dh_testroot - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdocs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build install install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common -binary: binary-indep - -.PHONY: clean install-indep binary-arc diff --git a/bigtop-packages/src/deb/bigtop-utils/source/format b/bigtop-packages/src/deb/bigtop-utils/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/bigtop-utils/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/datafu/compat b/bigtop-packages/src/deb/datafu/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/datafu/compat +++ b/bigtop-packages/src/deb/datafu/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/datafu/control b/bigtop-packages/src/deb/datafu/control index ea8fe466..020fe030 100644 --- a/bigtop-packages/src/deb/datafu/control +++ b/bigtop-packages/src/deb/datafu/control @@ -17,7 +17,7 @@ Source: pig-udf-datafu Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6) +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: https://github.com/linkedin/datafu diff --git a/bigtop-packages/src/deb/datafu/rules b/bigtop-packages/src/deb/datafu/rules index 9c88694e..a86bbbec 100755 --- a/bigtop-packages/src/deb/datafu/rules +++ b/bigtop-packages/src/deb/datafu/rules @@ -23,69 +23,14 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/mahout - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: # we'll just use the build from the tarball. bash debian/do-component-build -Divy.home=${HOME}/.ivy2 - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: sh -x debian/install_datafu.sh \ --build-dir=dist \ - --prefix=debian/tmp/pig-udf-datafu - dh_install --sourcedir=debian/tmp/pig-udf-datafu -i - - (dh_lintian) || /bin/true - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: - - -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arch + --prefix=debian/tmp diff --git a/bigtop-packages/src/deb/datafu/source/format b/bigtop-packages/src/deb/datafu/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/datafu/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/flume/compat b/bigtop-packages/src/deb/flume/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/flume/compat +++ b/bigtop-packages/src/deb/flume/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/flume/control b/bigtop-packages/src/deb/flume/control index 7f8d4abc..d9d85c04 100644 --- a/bigtop-packages/src/deb/flume/control +++ b/bigtop-packages/src/deb/flume/control @@ -17,7 +17,7 @@ Source: flume Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6) +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://incubator.apache.org/projects/flume.html diff --git a/bigtop-packages/src/deb/flume/rules b/bigtop-packages/src/deb/flume/rules index 57bfc209..43119be4 100755 --- a/bigtop-packages/src/deb/flume/rules +++ b/bigtop-packages/src/deb/flume/rules @@ -25,20 +25,10 @@ export DH_OPTIONS build_version=${FLUME_VERSION} -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/flume - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: # No easy way to disable the default RAT run which fails the build because of some fails in the debian/ directory rm -rf bigtop-empty mkdir -p bigtop-empty @@ -46,15 +36,11 @@ build-indep-stamp: patch-stamp # or to unbind rat:check goal # So I am redirecting its attention with a decoy env FLUME_VERSION=$(build_version) \ - sh debian/do-component-build -Drat.basedir=${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository - touch $@ + sh debian/do-component-build -Drat.basedir=$${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: sh -x debian/install_flume.sh \ - --build-dir=${PWD} \ + --build-dir=$${PWD} \ --prefix=debian/flume install -d -m 0755 debian/flume-node/etc/default cp debian/flume-node.default debian/flume-node/etc/default/flume-node @@ -62,29 +48,4 @@ install-indep: rm debian/flume/usr/lib/flume/lib/hadoop-* ln -s /usr/lib/hadoop/hadoop-common.jar debian/flume/usr/lib/flume/lib/hadoop-common.jar ln -s /usr/lib/hadoop/hadoop-auth.jar debian/flume/usr/lib/flume/lib/hadoop-auth.jar - dh_install -i - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installinit - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common -binary-arch: -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arc diff --git a/bigtop-packages/src/deb/flume/source/format b/bigtop-packages/src/deb/flume/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/flume/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/giraph/compat b/bigtop-packages/src/deb/giraph/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/giraph/compat +++ b/bigtop-packages/src/deb/giraph/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/giraph/control b/bigtop-packages/src/deb/giraph/control index 1fc713b6..406d5f6b 100644 --- a/bigtop-packages/src/deb/giraph/control +++ b/bigtop-packages/src/deb/giraph/control @@ -17,7 +17,7 @@ Source: giraph Section: misc Priority: extra Maintainer: Apache Bigtopr <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), git-core +Build-Depends: debhelper (>= 7.0.50~), git-core Standards-Version: 3.8.0 Homepage: http://incubator.apache.org/giraph/ diff --git a/bigtop-packages/src/deb/giraph/rules b/bigtop-packages/src/deb/giraph/rules index 5a43c012..fc62b3a1 100644 --- a/bigtop-packages/src/deb/giraph/rules +++ b/bigtop-packages/src/deb/giraph/rules @@ -23,28 +23,13 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/giraph - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp - # we'll just use the build from the tarball. +override_dh_auto_build: bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: sh -x debian/install_giraph.sh \ --build-dir=target \ --conf-dir=/etc/giraph/conf.dist \ @@ -52,43 +37,4 @@ install-indep: --prefix=debian/giraph # Workaround for GIRAPH-198 cp -f debian/giraph-site.xml debian/giraph/etc/giraph/conf.dist - dh_install -i - (dh_lintian) || /bin/true - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: - -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arch diff --git a/bigtop-packages/src/deb/giraph/source/format b/bigtop-packages/src/deb/giraph/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/giraph/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/hadoop/compat b/bigtop-packages/src/deb/hadoop/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/hadoop/compat +++ b/bigtop-packages/src/deb/hadoop/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/hadoop/control b/bigtop-packages/src/deb/hadoop/control index 23bb42d8..53985fdb 100644 --- a/bigtop-packages/src/deb/hadoop/control +++ b/bigtop-packages/src/deb/hadoop/control @@ -17,7 +17,7 @@ Source: hadoop Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), ant, ant-optional, liblzo2-dev, python, libzip-dev, sharutils, g++ (>= 4), git-core, libfuse-dev, libssl-dev, cmake, pkg-config +Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, liblzo2-dev, python, libzip-dev, sharutils, g++ (>= 4), git-core, libfuse-dev, libssl-dev, cmake, pkg-config Standards-Version: 3.8.0 Homepage: http://hadoop.apache.org/core/ diff --git a/bigtop-packages/src/deb/hadoop/docs b/bigtop-packages/src/deb/hadoop/docs index 6d3d2468..b5a470a2 100644 --- a/bigtop-packages/src/deb/hadoop/docs +++ b/bigtop-packages/src/deb/hadoop/docs @@ -1,4 +1,3 @@ -CHANGES.txt LICENSE.txt NOTICE.txt README.txt diff --git a/bigtop-packages/src/deb/hadoop/rules b/bigtop-packages/src/deb/hadoop/rules index 40c731ef..deb7ae78 100755 --- a/bigtop-packages/src/deb/hadoop/rules +++ b/bigtop-packages/src/deb/hadoop/rules @@ -23,6 +23,8 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +%: + dh $@ hadoop_version=${HADOOP_BASE_VERSION} @@ -33,31 +35,23 @@ ifeq (${DEB_BUILD_ARCH},i386) native_dir=Linux-i386-32 endif -patch: patch-stamp -patch-stamp: - touch $@ - -#Architecture -build: build-stamp -build-stamp: patch-stamp - dh_testdir +override_dh_auto_build: env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \ - bash debian/do-component-build -Divy.home=${HOME}/.ivy2 - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp build-stamp + bash debian/do-component-build -Divy.home=${HOME}/.ivy2 - dh_clean +hadoop_svcs=hdfs-namenode hdfs-secondarynamenode hdfs-datanode hdfs-zkfc \ + yarn-resourcemanager yarn-nodemanager yarn-proxyserver \ + mapreduce-historyserver httpfs -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +$(hadoop_svcs): debian/init.d.tmpl + bash $< debian/hadoop-$@.svc > debian/hadoop-$@.init + cp debian/$(firstword $(subst -, ,$@)).default debian/tmp/etc/default/hadoop-$@ + echo /etc/default/hadoop-$@ >> debian/hadoop-$@.install + # FIXME: workaround for BIGTOP-105 + [ -f debian/hadoop-$@.postinst ] || cp debian/hadoop.daemon.postinst.tpl debian/hadoop-$@.postinst + sed -i -e "s|@HADOOP_DAEMON@|$@|" debian/hadoop-$@.postinst +override_dh_auto_install: bash debian/install_hadoop.sh \ --prefix=debian/tmp/ \ --distro-dir=debian \ @@ -72,87 +66,22 @@ install: build --example-dir=debian/tmp/usr/share/doc/hadoop/examples \ --native-build-string=${native_dir} \ --installed-lib-dir=/usr/lib/hadoop - # Forcing Zookeeper dependency to be on the packaged jar ln -sf /usr/lib/zookeeper/zookeeper.jar debian/tmp/usr/lib/hadoop/lib/zookeeper*.jar # Workaround for BIGTOP-583 rm -f debian/tmp/usr/lib/hadoop-*/lib/slf4j-log4j12-*.jar - -# Run dh_lintian if we've got it - this doesn't exist on debhelper 6 (eg Ubuntu Hardy) - (dh_lintian) || /bin/true - -hadoop_svcs=hdfs-namenode hdfs-secondarynamenode hdfs-datanode hdfs-zkfc \ - yarn-resourcemanager yarn-nodemanager yarn-proxyserver \ - mapreduce-historyserver httpfs - -$(hadoop_svcs): debian/init.d.tmpl - bash $< debian/hadoop-$@.svc > debian/hadoop-$@.init - cp debian/$(firstword $(subst -, ,$@)).default debian/tmp/etc/default/hadoop-$@ - echo /etc/default/hadoop-$@ >> debian/hadoop-$@.install - # FIXME: workaround for BIGTOP-105 - [ -f debian/hadoop-$@.postinst ] || cp debian/hadoop.daemon.postinst.tpl debian/hadoop-$@.postinst - sed -i -e "s|@HADOOP_DAEMON@|$@|" debian/hadoop-$@.postinst - -install-indep: $(hadoop_svcs) # FIXME: BIGTOP-463 - echo 'export JSVC_HOME=/usr/lib/bigtop-utils' >> debian/hadoop.default mkdir -p debian/tmp/etc/default + echo 'export JSVC_HOME=/usr/lib/bigtop-utils' >> debian/hadoop.default cp debian/hadoop.default debian/tmp/etc/default/hadoop - - dh_install --sourcedir=debian/tmp -i - - rm -Rf debian/hadoop/usr/lib/hadoop/bin/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 - -install-arch: - mkdir -p debian/tmp/etc/default + # Refactored from install-arch cp debian/hadoop-fuse.default debian/tmp/etc/default/hadoop-fuse mkdir -p debian/tmp/etc/security/limits.d cp debian/hdfs.conf debian/yarn.conf debian/mapreduce.conf debian/tmp/etc/security/limits.d - dh_install --sourcedir=debian/tmp -s - -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: - dh_testdir - dh_testroot - #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 -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python - dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress -# dh_fixperms -Xtask-controller -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -# Build architecture independant packages using the common target. -binary-indep: build install install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build install install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common - -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_install: $(hadoop_svcs) + dh_install + # Drop misc fuse_dfs directories + rm -Rf debian/hadoop/usr/lib/hadoop/bin/fuse_dfs + rm -Rf debian/hadoop/usr/lib/hadoop/contrib/fuse-dfs + rm -Rf debian/hadoop/usr/lib/hadoop/hdfs/contrib/fuse-dfs diff --git a/bigtop-packages/src/deb/hadoop/source/format b/bigtop-packages/src/deb/hadoop/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/hadoop/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/hbase/compat b/bigtop-packages/src/deb/hbase/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/hbase/compat +++ b/bigtop-packages/src/deb/hbase/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/hbase/control b/bigtop-packages/src/deb/hbase/control index efa9a42f..e9668c85 100644 --- a/bigtop-packages/src/deb/hbase/control +++ b/bigtop-packages/src/deb/hbase/control @@ -16,7 +16,7 @@ Source: hbase Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), git-core, adduser +Build-Depends: debhelper (>= 7.0.50~), git-core, adduser Standards-Version: 3.8.0 Homepage: http://hbase.apache.org/ diff --git a/bigtop-packages/src/deb/hbase/rules b/bigtop-packages/src/deb/hbase/rules index 4c74b156..9a6ddc8a 100755 --- a/bigtop-packages/src/deb/hbase/rules +++ b/bigtop-packages/src/deb/hbase/rules @@ -24,32 +24,17 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -hadoop_home=/usr/lib/hadoop zookeeper_home=/usr/lib/zookeeper hbase_pkg_name=hbase -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - find debian -name .\*swp -exec rm -f {} \; - -build: patch - dh_testdir +override_dh_auto_build: bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository - touch $@ -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +override_dh_auto_install: cp debian/hbase.default debian/${hbase_pkg_name}/etc/default/${hbase_pkg_name} sh -x debian/install_hbase.sh \ --build-dir=build \ @@ -71,39 +56,4 @@ install: build find debian/tmp/usr/lib/${hbase_pkg_name}/bin debian/tmp/usr/lib/${hbase_pkg_name}/lib -name \*.rb -exec chmod 644 {} \; ### webapps should not be executable either find debian/tmp/usr/lib/${hbase_pkg_name}/hbase-webapps -type f -exec chmod 644 {} \; - - (dh_lintian) || /bin/true - - touch $@ - -install-indep: - dh_install --sourcedir=debian/tmp sh debian/install_init_scripts.sh - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installinit --onlyscripts - # dh_installinit has a bug whereby it makes preinst/postinst files - # even for subpackages that don't have an init script! - rm -f debian/${hbase_pkg_name}-doc*debhelper debian/${hbase_pkg_name}.*debhelper || : - - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build install install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary: binary-indep -.PHONY: clean build binary-indep binary install configure diff --git a/bigtop-packages/src/deb/hbase/source/format b/bigtop-packages/src/deb/hbase/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/hbase/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/hive/compat b/bigtop-packages/src/deb/hive/compat index 62f94575..7f8f011e 100644 --- a/bigtop-packages/src/deb/hive/compat +++ b/bigtop-packages/src/deb/hive/compat @@ -1 +1 @@ -6
\ No newline at end of file +7 diff --git a/bigtop-packages/src/deb/hive/control b/bigtop-packages/src/deb/hive/control index a28a9072..79635fb2 100644 --- a/bigtop-packages/src/deb/hive/control +++ b/bigtop-packages/src/deb/hive/control @@ -17,7 +17,7 @@ Source: hive Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), ant +Build-Depends: debhelper (>= 7.0.50~), ant Standards-Version: 3.8.0 Homepage: http://hive.apache.org/ diff --git a/bigtop-packages/src/deb/hive/rules b/bigtop-packages/src/deb/hive/rules index 8258dde4..85289cab 100755 --- a/bigtop-packages/src/deb/hive/rules +++ b/bigtop-packages/src/deb/hive/rules @@ -25,15 +25,10 @@ export DH_OPTIONS hive_pkg_name=hive -clean: - dh_testdir - dh_testroot - rm -f *-stamp - rm -Rf debian/.ivy - dh_clean +%: + dh $@ -build-indep: build-indep-stamp -build-indep-stamp: +override_dh_auto_build: mkdir -p /tmp/debian-hive/.ivy bash debian/do-component-build -Divy.home=${HOME}/.ivy2 touch $@ @@ -41,12 +36,7 @@ build-indep-stamp: server metastore: debian/service-init.d.tpl sed -e "s|@HIVE_DAEMON@|$@|" $< > debian/${hive_pkg_name}-$@.init -install: install-indep -install-indep: metastore server - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i +override_dh_auto_install: metastore server cp debian/hive-site.xml . cp debian/hive.1 . sh debian/install_hive.sh \ @@ -60,43 +50,4 @@ install-indep: metastore server ln -s /usr/lib/zookeeper/zookeeper.jar debian/${hive_pkg_name}/usr/lib/hive/lib # Workaround for BIGTOP-583 rm -f debian/${hive_pkg_name}/usr/lib/hive/lib/slf4j-log4j12-*.jar - dh_install -i - ls -ld debian/${hive_pkg_name}/var/lib/${hive_pkg_name}/metastore - (dh_lintian) || /bin/true -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime - dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: - - -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arch diff --git a/bigtop-packages/src/deb/hive/source/format b/bigtop-packages/src/deb/hive/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/hive/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control index afa6f4ae..4ea67fc9 100644 --- a/bigtop-packages/src/deb/hue/control +++ b/bigtop-packages/src/deb/hue/control @@ -17,7 +17,7 @@ Source: hue Section: misc Priority: extra Maintainer: Apache Bigtopr <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 7), ant, python2.4-dev | python2.5-dev | python2.6-dev | python2.7-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, libsqlite3-dev, libldap2-dev, libsasl2-dev, libmysqlclient-dev, make, python-setuptools +Build-Depends: debhelper (>= 7.0.50~), ant, python2.4-dev | python2.5-dev | python2.6-dev | python2.7-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, libsqlite3-dev, libldap2-dev, libsasl2-dev, libmysqlclient-dev, make, python-setuptools Depends: libsasl2, libsqlite3, zlib1g, libxslt1, libxml2Standards-Version: 3.8.0 Homepage: http://github.com/cloudera/hue diff --git a/bigtop-packages/src/deb/hue/rules b/bigtop-packages/src/deb/hue/rules index c2da44e6..ff32be27 100755 --- a/bigtop-packages/src/deb/hue/rules +++ b/bigtop-packages/src/deb/hue/rules @@ -31,70 +31,13 @@ $(APPS:%=debian/hue-%.postinst): debian/hue-app.postinst.tpl $(APPS:%=debian/hue-%.prerm): debian/hue-app.prerm.tpl sed -e 's#@APP@#$(patsubst debian/hue-%.prerm,%,$@)#' < $< > $@ -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp +%: + dh $@ - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir +override_dh_auto_build: bash -x debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp debian/substvars - make clean - dh_clean -install: build $(APPS:%=debian/hue-%.postinst) $(APPS:%=debian/hue-%.prerm) - dh_testdir - dh_testroot - dh_prep - dh_installdirs +override_dh_auto_install: build $(APPS:%=debian/hue-%.postinst) $(APPS:%=debian/hue-%.prerm) bash -x debian/install_hue.sh --build-dir=${PWD} --prefix=${PWD}/debian/tmp sed -e 's,^,build:,;' debian/tmp/usr/lib/hue/Makefile.buildvars \ | tr _ - >> debian/hue-common.substvars - dh_install --sourcedir=debian/tmp --list-missing - -# Build architecture-independent files here. -binary-indep: install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python - dh_installinit --no-start --name=hue -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/bigtop-packages/src/deb/hue/source/format b/bigtop-packages/src/deb/hue/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/hue/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/mahout/compat b/bigtop-packages/src/deb/mahout/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/mahout/compat +++ b/bigtop-packages/src/deb/mahout/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/mahout/control b/bigtop-packages/src/deb/mahout/control index cfd41b98..ae681d1c 100644 --- a/bigtop-packages/src/deb/mahout/control +++ b/bigtop-packages/src/deb/mahout/control @@ -17,7 +17,7 @@ Source: mahout Section: misc Priority: extra Maintainer: Andrew Bayer <abayer@apache.org> -Build-Depends: debhelper (>= 6), git-core +Build-Depends: debhelper (>= 7.0.50~), git-core Standards-Version: 3.8.0 Homepage: http://mahout.apache.org diff --git a/bigtop-packages/src/deb/mahout/rules b/bigtop-packages/src/deb/mahout/rules index 9cd5b471..01e9a713 100755 --- a/bigtop-packages/src/deb/mahout/rules +++ b/bigtop-packages/src/deb/mahout/rules @@ -23,72 +23,17 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/mahout - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: # we'll just use the build from the tarball. bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: sh -x debian/install_mahout.sh \ --build-dir=build \ --doc-dir=/usr/share/doc/mahout-doc \ - --prefix=debian/tmp/mahout - rm -rf debian/tmp/mahout/usr/lib/mahout/lib/slf4j-log4j12-*.jar debian/tmp/mahout/usr/lib/mahout/lib/hadoop - ln -fs /usr/lib/hadoop/client debian/tmp/mahout/usr/lib/mahout/lib/hadoop - dh_install --sourcedir=debian/tmp/mahout -i - - (dh_lintian) || /bin/true - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: - - -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arch + --prefix=debian/tmp + rm -rf debian/tmp/usr/lib/mahout/lib/slf4j-log4j12-*.jar debian/tmp/usr/lib/mahout/lib/hadoop + ln -fs /usr/lib/hadoop/client debian/tmp/usr/lib/mahout/lib/hadoop diff --git a/bigtop-packages/src/deb/mahout/source/format b/bigtop-packages/src/deb/mahout/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/mahout/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/oozie/compat b/bigtop-packages/src/deb/oozie/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/oozie/compat +++ b/bigtop-packages/src/deb/oozie/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/oozie/control b/bigtop-packages/src/deb/oozie/control index b4caf737..ee99dc31 100644 --- a/bigtop-packages/src/deb/oozie/control +++ b/bigtop-packages/src/deb/oozie/control @@ -16,7 +16,7 @@ Source: oozie Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6) +Build-Depends: debhelper (>= 7.0.50~) Depends: zip, unzip Standards-Version: 3.8.0 Homepage: http://incubator.apache.org/oozie/ diff --git a/bigtop-packages/src/deb/oozie/rules b/bigtop-packages/src/deb/oozie/rules index 3e0c6448..ddfc511f 100755 --- a/bigtop-packages/src/deb/oozie/rules +++ b/bigtop-packages/src/deb/oozie/rules @@ -23,62 +23,22 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -patch: patch-stamp -patch-stamp: - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/oozie - find debian -name .\*swp -exec rm -f {} \; - +%: + dh $@ # we need to set 'maven.repo.local' otherwise the build with # fakeroot fails because it tries to use /root/.m2 -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: mkdir -p distro/downloads env DO_MAVEN_DEPLOY="" FULL_VERSION=${OOZIE_BASE_VERSION} bash -x debian/do-component-build mkdir -p debian/tmp tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -) - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: + rm -rf ./debian/oozie + rm -rf ./debian/oozie-client sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=. --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie/etc/oozie/conf.dist - dh_install -i ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps/oozie/ext-2.2 rm -rf debian/oozie/usr/lib/oozie/webapps/oozie/docs ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps/oozie/docs - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman - dh_installdirs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installinit - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arc diff --git a/bigtop-packages/src/deb/oozie/source/format b/bigtop-packages/src/deb/oozie/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/oozie/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/pig/compat b/bigtop-packages/src/deb/pig/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/pig/compat +++ b/bigtop-packages/src/deb/pig/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/pig/control b/bigtop-packages/src/deb/pig/control index 76a15c22..ad041744 100644 --- a/bigtop-packages/src/deb/pig/control +++ b/bigtop-packages/src/deb/pig/control @@ -17,7 +17,7 @@ Source: pig Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), ant, ant-optional +Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional Standards-Version: 3.8.0 Homepage: http://pig.apache.org/ diff --git a/bigtop-packages/src/deb/pig/rules b/bigtop-packages/src/deb/pig/rules index 9f10710a..78fa2321 100755 --- a/bigtop-packages/src/deb/pig/rules +++ b/bigtop-packages/src/deb/pig/rules @@ -25,29 +25,13 @@ export DH_OPTIONS pig_pkg_name=pig -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - ant clean - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/${pig_pkg_name} - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: bash debian/do-component-build -Divy.home=${HOME}/.ivy2 - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot - +override_dh_auto_install: cp debian/*.properties . cp debian/pig.1 . sh -x debian/install_pig.sh \ @@ -55,44 +39,3 @@ install-indep: --prefix=debian/${pig_pkg_name} \ --doc-dir=/usr/share/doc/${pig_pkg_name} \ --examples-dir=/usr/share/doc/${pig_pkg_name}/examples - - dh_install -i - (dh_lintian) || /bin/true - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: - - -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arch diff --git a/bigtop-packages/src/deb/pig/source/format b/bigtop-packages/src/deb/pig/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/pig/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/sqoop/compat b/bigtop-packages/src/deb/sqoop/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/sqoop/compat +++ b/bigtop-packages/src/deb/sqoop/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/sqoop/control b/bigtop-packages/src/deb/sqoop/control index b12ca70e..d3831700 100644 --- a/bigtop-packages/src/deb/sqoop/control +++ b/bigtop-packages/src/deb/sqoop/control @@ -16,7 +16,7 @@ Source: sqoop Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), ant, ant-optional, git-core, sed, asciidoc, xmlto +Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, git-core, sed, asciidoc, xmlto Standards-Version: 3.8.0 Homepage: http://incubator.apache.org/sqoop/ diff --git a/bigtop-packages/src/deb/sqoop/rules b/bigtop-packages/src/deb/sqoop/rules index 98c96fe2..c73d5ecb 100755 --- a/bigtop-packages/src/deb/sqoop/rules +++ b/bigtop-packages/src/deb/sqoop/rules @@ -23,55 +23,15 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/sqoop - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: bash debian/do-component-build -Divy.home=${HOME}/.ivy2 - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: sh -x debian/install_sqoop.sh \ --build-dir=build/sqoop-${SQOOP_BASE_VERSION} \ --conf-dir=/etc/sqoop/conf.dist \ --prefix=debian/sqoop cp debian/sqoop-metastore.sh debian/sqoop-metastore.init - dh_install -i - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installinit - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arc diff --git a/bigtop-packages/src/deb/sqoop/source/format b/bigtop-packages/src/deb/sqoop/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/sqoop/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/whirr/compat b/bigtop-packages/src/deb/whirr/compat index 1e8b3149..7f8f011e 100644 --- a/bigtop-packages/src/deb/whirr/compat +++ b/bigtop-packages/src/deb/whirr/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/whirr/control b/bigtop-packages/src/deb/whirr/control index f372172c..5ba28baf 100644 --- a/bigtop-packages/src/deb/whirr/control +++ b/bigtop-packages/src/deb/whirr/control @@ -16,7 +16,7 @@ Source: whirr Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), git-core +Build-Depends: debhelper (>= 7.0.50~), git-core Standards-Version: 3.8.0 Homepage: http://whirr.apache.org/ diff --git a/bigtop-packages/src/deb/whirr/rules b/bigtop-packages/src/deb/whirr/rules index a574be5b..6c64ee0f 100755 --- a/bigtop-packages/src/deb/whirr/rules +++ b/bigtop-packages/src/deb/whirr/rules @@ -23,76 +23,23 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/whirr - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: # No easy way to disable the default RAT run which fails the build because of some fails in the debian/ directory rm -rf bigtop-empty mkdir -p bigtop-empty # Bruno could not find a way to add debian/ to RAT exclude list through cmd line # or to unbind rat:check goal # So he was redirecting its attention with a decoy - bash debian/do-component-build -Drat.basedir=${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository + bash debian/do-component-build -Drat.basedir=$${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository mkdir -p debian/tmp # NOTE: FIXME me right away cp -r debian/whirr.1 . - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: bash -x debian/install_whirr.sh \ --build-dir=build \ --doc-dir=/usr/share/doc/whirr \ --prefix=debian/whirr - (dh_lintian) || /bin/true - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: - - -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arch diff --git a/bigtop-packages/src/deb/whirr/source/format b/bigtop-packages/src/deb/whirr/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/whirr/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/bigtop-packages/src/deb/zookeeper/compat b/bigtop-packages/src/deb/zookeeper/compat index 1e8b3149..7f8f011e 100755 --- a/bigtop-packages/src/deb/zookeeper/compat +++ b/bigtop-packages/src/deb/zookeeper/compat @@ -1 +1 @@ -6 +7 diff --git a/bigtop-packages/src/deb/zookeeper/control b/bigtop-packages/src/deb/zookeeper/control index 80d535ea..c5e7a22c 100755 --- a/bigtop-packages/src/deb/zookeeper/control +++ b/bigtop-packages/src/deb/zookeeper/control @@ -16,7 +16,7 @@ Source: zookeeper Section: misc Priority: extra Maintainer: Bigtop <bigtop-dev@incubator.apache.org> -Build-Depends: debhelper (>= 6), ant, ant-optional, autoconf, automake +Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, autoconf, automake Standards-Version: 3.8.0 Homepage: http://zookeeper.apache.org/ diff --git a/bigtop-packages/src/deb/zookeeper/rules b/bigtop-packages/src/deb/zookeeper/rules index 1a84f748..5840611a 100755 --- a/bigtop-packages/src/deb/zookeeper/rules +++ b/bigtop-packages/src/deb/zookeeper/rules @@ -25,56 +25,17 @@ export DH_OPTIONS zookeeper_pkg_name=zookeeper -patch: patch-stamp -patch-stamp: - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f *-stamp - dh_clean - rm -Rf debian/tmp debian/$(zookeeper_pkg_name) - find debian -name .\*swp -exec rm -f {} \; - -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +override_dh_auto_build: bash debian/do-component-build -Divy.home=${HOME}/.ivy2 mkdir -p debian/tmp tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -) - touch $@ -install: install-indep -install-indep: - dh_testdir - dh_testroot +override_dh_auto_install: cp debian/zookeeper.1 debian/zoo.cfg . sh -x debian/install_zookeeper.sh \ --build-dir=build/zookeeper-${ZOOKEEPER_BASE_VERSION} \ --prefix=debian/$(zookeeper_pkg_name) dh_install -i - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installinit - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary-arch: -binary: binary-indep -.PHONY: build clean binary-indep binary install-indep binary-arc diff --git a/bigtop-packages/src/deb/zookeeper/source/format b/bigtop-packages/src/deb/zookeeper/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/bigtop-packages/src/deb/zookeeper/source/format @@ -0,0 +1 @@ +3.0 (quilt) @@ -109,6 +109,7 @@ $(BUILD_DIR)/%/.sdeb: mkdir -p $($(PKG)_OUTPUT_DIR)/ for file in $($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE).dsc \ $($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE).diff.gz \ + $($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE).debian.tar.gz \ $($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE)_source.changes \ $($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz ; \ do [ -e $(PKG_BUILD_DIR)/deb/$$file ] && cp $(PKG_BUILD_DIR)/deb/$$file $($(PKG)_OUTPUT_DIR); \ |