Repository: knox Updated Branches: refs/heads/master dc547086c -> 4f68d7aac
KNOX-284: Remove RPM build in favor of Bigtop RPM build Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/4f68d7aa Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/4f68d7aa Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/4f68d7aa Branch: refs/heads/master Commit: 4f68d7aac3b256aa9c1dbd9b27695cdcf3fb9d23 Parents: dc54708 Author: Kevin Minder <[email protected]> Authored: Sun Mar 9 15:43:31 2014 -0400 Committer: Kevin Minder <[email protected]> Committed: Sun Mar 9 15:43:31 2014 -0400 ---------------------------------------------------------------------- build.xml | 44 ++---------------------- gateway-rpm/build_knox_rpm.sh | 45 ------------------------- gateway-rpm/knox.spec | 68 -------------------------------------- 3 files changed, 3 insertions(+), 154 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/4f68d7aa/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b843554..cb5a409 100644 --- a/build.xml +++ b/build.xml @@ -66,10 +66,6 @@ <os family="windows" /> </condition> - <condition property="rpm-builder" value="./gateway-rpm/build_knox_rpm.sh"> - <os family="unix" /> - </condition> - <target name="_init" description="Initialize the build."> </target> @@ -108,27 +104,14 @@ </exec> </target> - <target name="post-build" depends="_init,_rpm,_changes"/> + <target name="post-build" depends="_init,_changes"/> <target name="_changes" depends="_init"> <copy file="CHANGES" todir="target/${gateway-version}"/> </target> - <target name="set-rpm-builder-privs" if="isUnix"> - <chmod file="${rpm-builder}" perm="700"/> - </target> - <target name="rpm" depends="package,_rpm" description="Package and build RPM of the product."/> - <target name="_rpm" depends="_init,set-rpm-builder-privs" description="Build RPM of the product from existing package."> - <exec executable="${rpm-builder}"> - <arg value="target"/> - <arg value="${gateway-artifact}"/> - <arg value="${gateway-version}"/> - <arg value="${release-manager}"/> - </exec> - <checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}.rpm" algorithm="MD5" fileext=".md5" forceOverwrite="yes"/> - <checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}.rpm" algorithm="SHA1" fileext=".sha" forceOverwrite="yes"/> - </target> + <target name="build-candidate"> <exec executable="${curl.cmd}"> @@ -151,9 +134,6 @@ <url url="${build-url}/knox-${gateway-version}.tar.gz"/> <url url="${build-url}/knox-${gateway-version}.tar.gz.md5"/> <url url="${build-url}/knox-${gateway-version}.tar.gz.sha"/> - <url url="${build-url}/knox-${gateway-version}.rpm"/> - <url url="${build-url}/knox-${gateway-version}.rpm.md5"/> - <url url="${build-url}/knox-${gateway-version}.rpm.sha"/> <url url="${build-url}/CHANGES"/> </get> </target> @@ -173,10 +153,6 @@ <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.md5"/> <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.sha"/> <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.asc"/> - <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm"/> - <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm.md5"/> - <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm.sha"/> - <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm.asc"/> <url url="${svn.staging.path}/knox-${gateway-version}/CHANGES"/> <url url="${svn.staging.path}/knox-${gateway-version}/KEYS"/> </get> @@ -213,15 +189,6 @@ <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.tar.gz" algorithm="SHA" verifyproperty="tar.sha.ok"/> <fail message="SHA Invalid"><condition><isfalse value="${tar.sha.ok}"/></condition></fail> - <echo>Verify ${gateway-artifact}-${gateway-version}.rpm</echo> - <exec executable="gpg" dir="${install.dir}" failonerror="true"> - <arg value="--verify"/> - <arg value="${gateway-artifact}-${gateway-version}.rpm.asc"/> - </exec> - <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.rpm" verifyproperty="rpm.md5.ok"/> - <fail message="MD5 Invalid"><condition><isfalse value="${rpm.md5.ok}"/></condition></fail> - <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.rpm" algorithm="SHA" verifyproperty="rpm.sha.ok"/> - <fail message="SHA Invalid"><condition><isfalse value="${rpm.sha.ok}"/></condition></fail> </target> <target name="sign-candidate" depends="_init" description="Sign a downloaded created release."> @@ -244,11 +211,6 @@ <arg value="${gateway-artifact}-${gateway-version}.tar.gz"/> </exec> <exec executable="gpg" dir="${candidate.dir}"> - <arg value="--armor"/> - <arg value="--detach-sig"/> - <arg value="${gateway-artifact}-${gateway-version}.rpm"/> - </exec> - <exec executable="gpg" dir="${candidate.dir}"> <arg value="--export"/> <arg value="--armor"/> <arg value="--output"/> @@ -267,7 +229,7 @@ <echo message="${stage-message}"/> </target> - <target name="release" depends="package,rpm" description="Build release artifacts including RPM and sign."/> + <target name="release" depends="package" description="Build release artifacts and sign."/> <target name="stage-candidate" depends="unstage-candidate" description="Stage release artifacts."> <exec executable="svn"> http://git-wip-us.apache.org/repos/asf/knox/blob/4f68d7aa/gateway-rpm/build_knox_rpm.sh ---------------------------------------------------------------------- diff --git a/gateway-rpm/build_knox_rpm.sh b/gateway-rpm/build_knox_rpm.sh deleted file mode 100755 index 651cfec..0000000 --- a/gateway-rpm/build_knox_rpm.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/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. -# - -# target -KNOX_PACKAGE_TARGET=$1 -# knox -KNOX_NAME=$2 -# 0.4.0-SNAPSHOT -KNOX_VER=$3 -# target/RPM base directory -KNOX_TOPDIR="$(pwd)"/$KNOX_PACKAGE_TARGET/RPM -# Hardware platform -KNOX_BUILD_ARCH="noarch" -#RPM name -KNOX_RPMFILENAME="$KNOX_NAME-$KNOX_VER.rpm" - -#SOURCES Contains the original sources, patches, and icon files. -#SPECS Contains the spec files used to contrl the build process. -#The BUILD directory in which the sources are unpacked, and the software is built. -#RPMS Contains the binary package files created by the build process. -#SRPMS Contains the source package files created by the build process. -mkdir -p $KNOX_TOPDIR/{SOURCES,SPECS,BUILD,RPMS,SRPMS} - -cp ./gateway-rpm/knox.spec $KNOX_TOPDIR/SPECS -cp ./$KNOX_PACKAGE_TARGET/$KNOX_VER/$KNOX_NAME-$KNOX_VER.tar.gz $KNOX_TOPDIR/SOURCES - -rpmbuild --define "_rpmfilename $KNOX_RPMFILENAME" --define "_topdir $KNOX_TOPDIR" --define "_knox_name $KNOX_NAME" --define "_knox_ver $KNOX_VER" --define "_build_arch $KNOX_BUILD_ARCH" --bb $KNOX_TOPDIR/SPECS/knox.spec - -cp $KNOX_TOPDIR/RPMS/$KNOX_RPMFILENAME $KNOX_PACKAGE_TARGET/$KNOX_VER http://git-wip-us.apache.org/repos/asf/knox/blob/4f68d7aa/gateway-rpm/knox.spec ---------------------------------------------------------------------- diff --git a/gateway-rpm/knox.spec b/gateway-rpm/knox.spec deleted file mode 100644 index a973fcb..0000000 --- a/gateway-rpm/knox.spec +++ /dev/null @@ -1,68 +0,0 @@ -# -# Knox spec file for RPM... -# - -# -# 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. -# - -Summary: Knox -Name: %_knox_name -Version: %_knox_ver -Release: 1 -License: Apache License, Version 2.0 -Group: Applications/Server -Vendor: Hortonworks. -Packager: Hortonworks <[email protected]> -BuildArch: %_build_arch - -#knox-0.4.0-SNAPSHOT.tar.gz -Source: %{name}-%{_knox_ver}.tar.gz - -%description -Knox server... - -%prep -echo "Knox installation preparation" - -%setup -n %{name}-%{_knox_ver} - -%build -echo "Knox installation build" - -%install -mkdir -p $RPM_BUILD_ROOT/usr/lib/knox/ -cp -R ./ $RPM_BUILD_ROOT/usr/lib/knox/ - -%clean -rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR - -%files -/usr/lib/knox/ - -%pre - -%post -mkdir -p /usr/var/knox /usr/run/knox -chown -R `logname` /usr/lib/knox /usr/var/knox /usr/run/knox -echo "Knox installation complete" - -%postun - - - - --
