Repository: bigtop Updated Branches: refs/heads/master eb7abe8c6 -> 0aebd834a
BIGTOP-1635: hue compile on vanilla debian Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0aebd834 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0aebd834 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0aebd834 Branch: refs/heads/master Commit: 0aebd834a4777d0344da88d9391204934925cfb9 Parents: eb7abe8 Author: Olaf Flebbe <[email protected]> Authored: Fri Mar 27 10:58:36 2015 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Thu Apr 2 16:12:48 2015 +0200 ---------------------------------------------------------------------- .../src/common/hue/hue-virtualenv.tgz | Bin 0 -> 1769776 bytes bigtop-packages/src/common/hue/install_hue.sh | 3 +++ bigtop-packages/src/deb/hue/hue-common.preinst | 2 +- bigtop-packages/src/deb/hue/rules | 6 ++++++ .../src/deb/hue/source/include-binaries | 1 + bigtop-packages/src/rpm/hue/SPECS/hue.spec | 8 ++++++++ 6 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0aebd834/bigtop-packages/src/common/hue/hue-virtualenv.tgz ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/hue-virtualenv.tgz b/bigtop-packages/src/common/hue/hue-virtualenv.tgz new file mode 100644 index 0000000..29b2a38 Binary files /dev/null and b/bigtop-packages/src/common/hue/hue-virtualenv.tgz differ http://git-wip-us.apache.org/repos/asf/bigtop/blob/0aebd834/bigtop-packages/src/common/hue/install_hue.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/install_hue.sh b/bigtop-packages/src/common/hue/install_hue.sh index ff70dd6..045f6b9 100644 --- a/bigtop-packages/src/common/hue/install_hue.sh +++ b/bigtop-packages/src/common/hue/install_hue.sh @@ -115,6 +115,9 @@ ln -fs $LIB_DIR/desktop/libs/hadoop/java-lib/*plugin*jar $PREFIX/$HADOOP_DIR # character (which is the limit for #!) (cd $PREFIX/$LIB_DIR ; bash tools/relocatable.sh) +# remove RECORD files since it contains "real" paths confusing rpmbuild +(cd $PREFIX/$LIB_DIR ; rm build/env/lib/python*/site-packages/*.dist-info/RECORD) + # Remove Hue database and then recreate it, but with just the "right" apps rm -f $PREFIX/$LIB_DIR/desktop/desktop.db $PREFIX/$LIB_DIR/app.reg APPS="about filebrowser help proxy useradmin oozie jobbrowser jobsub metastore" http://git-wip-us.apache.org/repos/asf/bigtop/blob/0aebd834/bigtop-packages/src/deb/hue/hue-common.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-common.preinst b/bigtop-packages/src/deb/hue/hue-common.preinst index eb4c0d3..0641767 100644 --- a/bigtop-packages/src/deb/hue/hue-common.preinst +++ b/bigtop-packages/src/deb/hue/hue-common.preinst @@ -45,7 +45,7 @@ case "$1" in # In upgrade, make a copy of the database, if it's there. if [ "$1" == "upgrade" ] ; then echo "... stopping any running Hue" - /etc/init.d/hue stop || : + service hue stop || : OLD_DESKTOP_DB=/usr/share/hue/desktop/desktop.db if [ -e $OLD_DESKTOP_DB ]; then echo ... backing up $OLD_DESKTOP_DB as ${OLD_DESKTOP_DB}.bak.$2 http://git-wip-us.apache.org/repos/asf/bigtop/blob/0aebd834/bigtop-packages/src/deb/hue/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/rules b/bigtop-packages/src/deb/hue/rules index 2ff28c7..4e4c8e6 100755 --- a/bigtop-packages/src/deb/hue/rules +++ b/bigtop-packages/src/deb/hue/rules @@ -35,6 +35,12 @@ $(APPS:%=debian/hue-%.prerm): debian/hue-app.prerm.tpl dh $@ override_dh_auto_build: + # apply https://github.com/cloudera/hue/commit/2bbdd91e27cac9ab79e193dc4ad18d0647ae0048 + # see BIGTOP-1635 + rm -rf tools/virtual-bootstrap + rm -rf desktop/core/ext-py/ctypes-1.0.2/ctypes + tar -xvf debian/hue-virtualenv.tgz + # end of workaround env FULL_VERSION=${HUE_BASE_VERSION} bash -x debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository override_dh_auto_install: build $(APPS:%=debian/hue-%.postinst) $(APPS:%=debian/hue-%.prerm) http://git-wip-us.apache.org/repos/asf/bigtop/blob/0aebd834/bigtop-packages/src/deb/hue/source/include-binaries ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/source/include-binaries b/bigtop-packages/src/deb/hue/source/include-binaries new file mode 100644 index 0000000..e3fe0e4 --- /dev/null +++ b/bigtop-packages/src/deb/hue/source/include-binaries @@ -0,0 +1 @@ +debian/hue-virtualenv.tgz http://git-wip-us.apache.org/repos/asf/bigtop/blob/0aebd834/bigtop-packages/src/rpm/hue/SPECS/hue.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec index 8bc50bd..210eb7c 100644 --- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec +++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec @@ -26,6 +26,7 @@ Source1: %{name}.init Source2: %{name}.init.suse Source3: do-component-build Source4: install_hue.sh +Source5: hue-virtualenv.tgz #BIGTOP_PATCH_FILES URL: http://github.com/cloudera/hue Requires: %{name}-common = %{version}-%{release} @@ -151,6 +152,13 @@ It supports a file browser, job tracker interface, cluster health monitor, and m %setup -n %{name}-release-%{hue_base_version} #BIGTOP_PATCH_COMMANDS + +#apply https://github.com/cloudera/hue/commit/2bbdd91e27cac9ab79e193dc4ad18d0647ae0048 +# see BIGTOP-1635 +rm -rf tools/virtual-bootstrap +rm -rf desktop/core/ext-py/ctypes-1.0.2/ctypes +tar -xvf %{SOURCE5} +#end of workaround ######################################## # Build ########################################
