incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1296378 [3/3] - in /incubator/bigtop/branches/hadoop-0.23: ./ bigtop-packages/src/common/oozie/ bigtop-packages/src/deb/oozie/ bigtop-packages/src/rpm/oozie/SPECS/
Date Fri, 02 Mar 2012 18:39:29 GMT
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postinst?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postinst (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postinst Fri
Mar  2 18:39:28 2012
@@ -38,7 +38,6 @@ case "$1" in
     configure)
         chown -R oozie:oozie /var/lib/oozie /var/log/oozie
         update-rc.d oozie defaults >/dev/null || exit 1
-        /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postrm
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postrm?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postrm (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postrm Fri Mar
 2 18:39:28 2012
@@ -37,11 +37,6 @@ set -e
 
 case "$1" in
     purge)
-       rm -rf /etc/oozie
-       rm -rf /var/lib/oozie
-       rm -rf /var/run/oozie
-       rm -rf /var/tmp/oozie
-       rm -rf /var/log/oozie
        update-rc.d -f oozie remove > /dev/null || exit 1
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules Fri Mar  2 18:39:28
2012
@@ -23,12 +23,6 @@ export DH_VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-ifneq "$(wildcard ${HOME}/.m2/settings.xml)" ""
-	m2_settings_flag=--settings ${HOME}/.m2/settings.xml
-else
-	m2_settings_flag=
-endif
-
 patch: patch-stamp
 patch-stamp:	
 	patch -p0 < debian/patch
@@ -48,10 +42,8 @@ clean:	
 
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
-#	M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`
 	mkdir -p distro/downloads
-	(export DO_MAVEN_DEPLOY=""; export FULL_VERSION=2.3.1; sh -x debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository
${m2_settings_flag} -DskipTests)
-#	rm -rf ${M2_CACHE}
+	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 $@

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Fri
Mar  2 18:39:28 2012
@@ -24,6 +24,22 @@
   %define initd_dir %{_sysconfdir}/rc.d/init.d
   %define alternatives_cmd alternatives
 %else
+
+# Only tested on openSUSE 11.4. le'ts update it for previous release when confirmed
+%if 0%{suse_version} > 1130
+%define suse_check \# Define an empty suse_check for compatibility with older sles
+%endif
+
+# SLES is more strict anc check all symlinks point to valid path
+# But we do point to a hadoop jar which is not there at build time
+# (but would be at install time).
+# Since our package build system does not handle dependencies,
+# these symlink checks are deactivated
+%define __os_install_post \
+    %{suse_check} ; \
+    /usr/lib/rpm/brp-compress ; \
+    %{nil}
+
   %define doc_oozie %{_docdir}/oozie
   %define initd_dir %{_sysconfdir}/rc.d
   %define alternatives_cmd update-alternatives
@@ -40,6 +56,9 @@ License: APL2
 Source0: %{name}-%{oozie_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_oozie.sh
+Source3: oozie.1
+Source4: oozie-env.sh
+Source5: oozie.init
 Patch0: patch
 Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
 Requires(post): /sbin/chkconfig, hadoop
@@ -108,15 +127,12 @@ Requires: bigtop-utils
 
 
 %prep
-%setup -n apache-oozie-135dcce
+%setup -n oozie-%{oozie_base_version}
 %patch0 -p0
 
 %build
-    M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`
     mkdir -p distro/downloads
-    # curl --retry 5 -# -L -k -o distro/downloads/tomcat.tar.gz http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.tar.gz
   
-    (export DO_MAVEN_DEPLOY="";export FULL_VERSION=%{version};cp %{SOURCE1} bin; sh -x bin/do-component-build
-Dmaven.repo.local=${HOME}/.m2/repository -DskipTests)
-    rm -rf ${M2_CACHE}
+    env DO_MAVEN_DEPLOY="" FULL_VERSION=%{oozie_base_version} bash -x %{SOURCE1}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
@@ -132,7 +148,6 @@ getent group oozie >/dev/null || /usr/sb
 getent passwd oozie >/dev/null || /usr/sbin/useradd --comment "Oozie User" --shell /bin/false
-M -r -g oozie --home /var/run/oozie oozie >/dev/null
 
 %post 
-%{lib_oozie}/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop
 /sbin/chkconfig --add oozie 
 
 %preun
@@ -164,7 +179,9 @@ fi
 %{lib_oozie}/bin/oozie-sys.sh
 %{lib_oozie}/bin/oozie-env.sh
 %{lib_oozie}/bin/oozied.sh
-%{lib_oozie}/oozie.war
+%{lib_oozie}/bin/ooziedb.sh
+%{lib_oozie}/webapps
+%{lib_oozie}/libtools
 %{lib_oozie}/oozie-sharelib.tar.gz
 %{lib_oozie}/oozie-server
 %{initd_dir}/oozie
@@ -179,7 +196,6 @@ fi
 %{usr_bin}/oozie
 %dir %{lib_oozie}/bin
 %{lib_oozie}/bin/oozie
-%{lib_oozie}/bin/oozie-examples.sh
 %{lib_oozie}/lib
 %doc %{doc_oozie}
 %{man_dir}/man1/oozie.1.*

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Fri Mar  2 18:39:28 2012
@@ -91,14 +91,12 @@ $(eval $(call PACKAGE,sqoop,SQOOP))
 OOZIE_NAME=oozie
 OOZIE_RELNOTES_NAME=Apache Oozie
 OOZIE_PKG_NAME=oozie
-OOZIE_BASE_VERSION=3.1.2
-OOZIE_PKG_VERSION=3.1.2
+OOZIE_BASE_VERSION=3.1.3-incubating
+OOZIE_PKG_VERSION=3.1.3
 OOZIE_RELEASE_VERSION=1
 OOZIE_TARBALL_DST=oozie-$(OOZIE_BASE_VERSION).tar.gz
-#OOZIE_TARBALL_SRC=2.3.2
-#OOZIE_SITE=http://github.com/yahoo/oozie/tarball
-OOZIE_SITE=https://github.com/apache/oozie/tarball
-OOZIE_TARBALL_SRC=135dcce
+OOZIE_TARBALL_SRC=oozie-$(OOZIE_BASE_VERSION)-src.tar.gz
+OOZIE_SITE=$(APACHE_MIRROR)/incubator/$(OOZIE_NAME)/$(OOZIE_NAME)-$(OOZIE_BASE_VERSION)/
 $(eval $(call PACKAGE,oozie,OOZIE))
 
 # Whirr



Mime
View raw message