Updated Branches:
refs/heads/master 66dc1800a -> fc6c3fd5b
BIGTOP-788. Oozie RPM build error due to lack of
usr/lib/oozie/{libserver,oozie-server,libext}
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/fc6c3fd5
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/fc6c3fd5
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/fc6c3fd5
Branch: refs/heads/master
Commit: fc6c3fd5bcb651accac436b6af30248560e6be10
Parents: 66dc180
Author: Roman Shaposhnik <[email protected]>
Authored: Sun Nov 18 19:46:51 2012 -0800
Committer: Roman Shaposhnik <[email protected]>
Committed: Sun Nov 18 19:56:02 2012 -0800
----------------------------------------------------------------------
.../src/common/oozie/do-component-build | 7 +++++--
bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6c3fd5/bigtop-packages/src/common/oozie/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/do-component-build
b/bigtop-packages/src/common/oozie/do-component-build
index 5b2cc20..03c5cce 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
+
+. `dirname $0`/bigtop.bom
#
# Resolve source directory
#
@@ -39,7 +41,6 @@ RELEASE_DIR=$PWD
#
# Resolve build version
#
-OOZIE_VERSION=3.1.3-incubating
RELEASE_ENV_FILENAME=release.env
RELEASE_ENV_FILE=${RELEASE_DIR}/cloudera/${RELEASE_ENV_FILENAME}
if [ -f "${RELEASE_ENV_FILE}" ]; then
@@ -86,7 +87,9 @@ if [ "${DO_MAVEN_DEPLOY}" = "deploy" ]; then
fi
# Invoke Oozie build script with CDH options
-${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=0.23.1 ${EXTRA_GOALS}
-Dmaven.repo.local=${HOME}/.m2/repository "$@"
+# FIXME: the following need to go away once we transition to 3.3.X
+HADOOP_VERSION=0.23.1
+${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=${HADOOP_VERSION}
${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
MKDISTRO_RESULT=$?
if [ "${MKDISTRO_RESULT}" != "0" ]; then
echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6c3fd5/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
index 3ba548c..9afdb70 100644
--- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
+++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
@@ -137,7 +137,7 @@ Requires: bigtop-utils
%install
%__rm -rf $RPM_BUILD_ROOT
- sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=.
--server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT
--docs-dir=$RPM_BUILD_ROOT%{doc_oozie} --initd-dir=$RPM_BUILD_ROOT%{initd_dir}
--conf-dir=$RPM_BUILD_ROOT%{conf_oozie_dist}
+ sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=$PWD
--server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT
--docs-dir=$RPM_BUILD_ROOT%{doc_oozie} --initd-dir=$RPM_BUILD_ROOT%{initd_dir}
--conf-dir=$RPM_BUILD_ROOT%{conf_oozie_dist}
%__ln_s -f %{data_oozie}/ext-2.2
$RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/ext-2.2
%__rm -rf $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs
