You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2011/10/24 21:27:32 UTC
svn commit: r1188319 - in /incubator/bigtop/trunk: ./
bigtop-packages/src/common/bigtop-utils/
bigtop-packages/src/deb/bigtop-utils/ bigtop-packages/src/rpm/bigtop-utils/
bigtop-packages/src/rpm/bigtop-utils/RPMS/
bigtop-packages/src/rpm/bigtop-utils/S...
Author: bmahe
Date: Mon Oct 24 19:27:32 2011
New Revision: 1188319
URL: http://svn.apache.org/viewvc?rev=1188319&view=rev
Log:
BIGTOP-25. Add a new bigtop-utils package which provides some java home autodetection
Added:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/LICENSE
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/
incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/compat
incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/control
incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/copyright
incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/RPMS/
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/RPMS/.gitignore
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/.gitignore
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
Modified:
incubator/bigtop/trunk/bigtop.mk
incubator/bigtop/trunk/package.mk
Added: incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/LICENSE
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/LICENSE?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/LICENSE (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/LICENSE Mon Oct 24 19:27:32 2011
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome Mon Oct 24 19:27:32 2011
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Uncomment and set the following variable in order for the
+# guesswork step to be skipped
+#
+# JAVA_HOME=/usr/java/latest
+
+# attempt to find java
+if [ -z "$JAVA_HOME" ]; then
+ for candidate in \
+ /usr/lib/jvm/java-6-sun \
+ /usr/lib/jvm/java-1.6.0-sun-1.6.0.*/jre/ \
+ /usr/lib/jvm/java-1.6.0-sun-1.6.0.* \
+ /usr/lib/j2sdk1.6-sun \
+ /usr/java/jdk1.6* \
+ /usr/java/jre1.6* \
+ /Library/Java/Home \
+ /usr/java/default \
+ /usr/lib/jvm/default-java ; do
+ if [ -e $candidate/bin/java ]; then
+ export JAVA_HOME=$candidate
+ break
+ fi
+ done
+fi
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/compat
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/compat?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/compat (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/compat Mon Oct 24 19:27:32 2011
@@ -0,0 +1 @@
+7
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/control?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/control (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/control Mon Oct 24 19:27:32 2011
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Source: bigtop-utils
+Section: misc
+Priority: extra
+Maintainer: Bigtop <bi...@incubator.apache.org>
+Build-Depends: debhelper (>= 7.0.0~)
+Standards-Version: 3.8.0
+Homepage: http://incubator.apache.org/bigtop/
+
+Package: bigtop-utils
+Architecture: all
+Depends: ${misc:Depends}
+Description: Collection of useful tools for Bigtop
+ This includes a collection of useful tools and files for Bigtop
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/copyright
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/copyright?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/copyright (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/copyright Mon Oct 24 19:27:32 2011
@@ -0,0 +1,15 @@
+Format: http://dep.debian.net/deps/dep5
+Source: http://incubator.apache.org/bigtop/
+Upstream-Name: Apache Bigtop - Incubating
+
+Files: *
+Copyright: 2008-2011, The Apache Software Foundation
+License: Apache-2.0
+
+Files debian/*
+Copyright: 2011, The Apache Software Foundation
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/rules?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/rules (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-utils/rules Mon Oct 24 19:27:32 2011
@@ -0,0 +1,74 @@
+#!/usr/bin/make -f
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+DISTRO_CODENAME=$(shell lsb_release -sc)
+
+patch: patch-stamp
+patch-stamp:
+ touch $@
+
+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
+ # 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/
+ 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
Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/RPMS/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/RPMS/.gitignore?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/RPMS/.gitignore (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/RPMS/.gitignore Mon Oct 24 19:27:32 2011
@@ -0,0 +1 @@
+repodata
Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/.gitignore?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/.gitignore (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/.gitignore Mon Oct 24 19:27:32 2011
@@ -0,0 +1 @@
+*.swp
Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec?rev=1188319&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec Mon Oct 24 19:27:32 2011
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Name: bigtop-utils
+Version: %{bigtop_utils_version}
+Release: %{bigtop_utils_release}
+Summary: Collection of useful tools for Bigtop
+
+Group: Applications/Engineering
+License: APL2
+URL: http://incubator.apache.org/bigtop/
+Source0: bigtop-detect-javahome
+Source1: LICENSE
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch: noarch
+
+%description
+This includes a collection of useful tools and files for Bigtop
+
+
+%prep
+%setup -q -T -c
+install -p -m 644 %{SOURCE0} .
+install -p -m 644 %{SOURCE1} .
+
+%build
+
+
+%install
+install -d -p -m 755 $RPM_BUILD_ROOT%{_libexecdir}/
+install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_libexecdir}/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE
+
+%{_libexecdir}/bigtop-detect-javahome
+
+%changelog
+
+
Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1188319&r1=1188318&r2=1188319&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Mon Oct 24 19:27:32 2011
@@ -135,3 +135,12 @@ FLUME_TARBALL_DST=flume-$(FLUME_BASE_VER
FLUME_TARBALL_SRC=$(FLUME_TARBALL_DST)
FLUME_SITE=http://github.com/downloads/cloudera/flume/
$(eval $(call PACKAGE,flume,FLUME))
+
+# Bigtop-utils
+BIGTOP_UTILS_NAME=bigtop-utils
+BIGTOP_UTILS__RELNOTES_NAME=Bigtop-utils
+BIGTOP_UTILS_PKG_NAME=bigtop-utils
+BIGTOP_UTILS_BASE_VERSION=$(subst -,.,$(BIGTOP_VERSION))
+BIGTOP_UTILS_PKG_VERSION=$(BIGTOP_UTILS_BASE_VERSION)
+BIGTOP_UTILS_RELEASE_VERSION=1
+$(eval $(call PACKAGE,bigtop-utils,BIGTOP_UTILS))
Modified: incubator/bigtop/trunk/package.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/package.mk?rev=1188319&r1=1188318&r2=1188319&view=diff
==============================================================================
--- incubator/bigtop/trunk/package.mk (original)
+++ incubator/bigtop/trunk/package.mk Mon Oct 24 19:27:32 2011
@@ -20,7 +20,7 @@ SHELL := /bin/bash
$(BUILD_DIR)/%/.download:
mkdir -p $(@D)
mkdir -p $(DL_DIR)
- [ -f $($(PKG)_DOWNLOAD_DST) ] || (cd $(DL_DIR) && curl --retry 5 -# -L -k -o $($(PKG)_TARBALL_DST) $($(PKG)_DOWNLOAD_URL))
+ [ -z "$($(PKG)_TARBALL_SRC)" -o -f $($(PKG)_DOWNLOAD_DST) ] || (cd $(DL_DIR) && curl --retry 5 -# -L -k -o $($(PKG)_TARBALL_DST) $($(PKG)_DOWNLOAD_URL))
touch $@
# Make source RPMs
@@ -29,12 +29,13 @@ $(BUILD_DIR)/%/.srpm:
mkdir -p $(PKG_BUILD_DIR)/rpm/
cp -r $(BASE_DIR)/bigtop-packages/src/rpm/$($(PKG)_NAME)/* $(PKG_BUILD_DIR)/rpm/
mkdir -p $(PKG_BUILD_DIR)/rpm/{INSTALL,SOURCES,BUILD,SRPMS}
- cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/rpm/SOURCES
+ [ -z "$($(PKG)_TARBALL_SRC)" ] || cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/rpm/SOURCES
[ -d $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME) ] && cp -r $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/* $(PKG_BUILD_DIR)/rpm/SOURCES
+ PKG_NAME_FOR_PKG=$(subst -,_,$($(PKG)_NAME)); \
rpmbuild --define "_topdir $(PKG_BUILD_DIR)/rpm/" \
- --define "$($(PKG)_NAME)_base_version $($(PKG)_BASE_VERSION)" \
- --define "$($(PKG)_NAME)_version $($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP)" \
- --define "$($(PKG)_NAME)_release $($(PKG)_RELEASE_VERSION)" \
+ --define "$${PKG_NAME_FOR_PKG}_base_version $($(PKG)_BASE_VERSION)" \
+ --define "$${PKG_NAME_FOR_PKG}_version $($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP)" \
+ --define "$${PKG_NAME_FOR_PKG}_release $($(PKG)_RELEASE_VERSION)" \
-bs \
--nodeps \
--buildroot="$(PKG_BUILD_DIR)/rpm/INSTALL" \
@@ -64,16 +65,21 @@ $(BUILD_DIR)/%/.yum: $(BUILD_DIR)/%/.rpm
$(BUILD_DIR)/%/.sdeb:
-rm -rf $(PKG_BUILD_DIR)/deb/
mkdir -p $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)
- cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/deb/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz
- cd $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \
- tar --strip-components 1 -xvf ../$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz
+ # Only expands the tar if there is a source artifact
+ if [ -n "$($(PKG)_TARBALL_SRC)" ]; then \
+ cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/deb/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz ;\
+ cd $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \
+ tar --strip-components 1 -xvf ../$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz;\
+ else \
+ tar -czf $(PKG_BUILD_DIR)/deb/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz LICENSE ;\
+ fi
cd $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \
cp -r $(BASE_DIR)/bigtop-packages/src/deb/$($(PKG)_NAME) debian && \
cp -r $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/* debian && \
echo -e "version=$(PKG_PKG_VERSION)\ngit.hash=deadbeaf" >> debian/build.properties && \
(echo -e "$($(PKG)_PKG_NAME) ($(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE)) stable; urgency=low\n" && \
echo " Clean build" && \
- echo " -- Jenkins <je...@cloudera.com> "`date +'%a, %d %b %Y %T %z'`) > debian/changelog && \
+ echo " -- Bigtop <bi...@incubator.apache.org> "`date +'%a, %d %b %Y %T %z'`) > debian/changelog && \
find debian -name "*.[ex,EX,~]" | xargs rm -f && \
dpkg-buildpackage -uc -us -sa -S
mkdir -p $($(PKG)_OUTPUT_DIR)/
@@ -81,8 +87,8 @@ $(BUILD_DIR)/%/.sdeb:
$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE).diff.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 cp $(PKG_BUILD_DIR)/deb/$$file $($(PKG)_OUTPUT_DIR); \
- done
+ do [ -e $(PKG_BUILD_DIR)/deb/$$file ] && cp $(PKG_BUILD_DIR)/deb/$$file $($(PKG)_OUTPUT_DIR); \
+ done
touch $@
$(BUILD_DIR)/%/.deb: SRCDEB=$($(PKG)_PKG_NAME)_$($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE).dsc