xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2163 - remaining RHEL6 RPM changes

Browse source 
- Amend: update build.sh to build the full set of rpms

Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f

Conflicts:
	rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0

Former-commit-id: 19d80d96c3 [formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]
Former-commit-id: c0458d512d
This commit is contained in:
Bryan Kowal 2013-08-07 11:31:07 -05:00 • committed by Steve Harris
parent 5dffc9321c
commit 6b305d4ea3
9 changed files with 92 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rpms/awips2.core/Installer.hydroapps/component.spec
View file

@ -33,11 +33,14 @@ then
exit 1
fi
mkdir -p ${RPM_BUILD_ROOT}/awips2/edex/data
%build
%install
mkdir -p ${RPM_BUILD_ROOT}/awips2/edex/data
if [ $? -ne 0 ]; then
exit 1
fi
FILES_NATIVE="%{_baseline_workspace}/files.native"
/bin/cp -rf ${FILES_NATIVE}/awipsShare \

7
rpms/awips2.edex/Installer.edex-component/component.spec
View file

@ -39,11 +39,14 @@ fi
if [ -d %{_build_root} ]; then
rm -rf %{_build_root}
fi
mkdir -p %{_build_root}
%build
%install
mkdir -p %{_build_root}
if [ $? -ne 0 ]; then
exit 1
fi
unzip %{_baseline_workspace}/build.edex/edex/dist/%{_component_name}.zip \
-d %{_build_root}
@ -63,4 +66,4 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/edex
/awips2/edex/*
/awips2/edex/*

9
rpms/awips2.edex/Installer.edex-configuration/component.spec
View file

@ -33,14 +33,15 @@ fi
if [ -d %{_build_root} ]; then
rm -rf %{_build_root}
fi
%build
%install
mkdir -p %{_build_root}/awips2/edex
if [ $? -ne 0 ]; then
exit 1
fi
%build
%install
DEPLOY_SCRIPT="build.edex/deploy-common/deploy-esb-configuration.xml"
# use deploy-install to deploy edex-configuration.
@ -126,4 +127,4 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2
%dir /awips2/edex
%dir /awips2/edex/bin
%config(noreplace) /awips2/edex/bin/setup.env
%config(noreplace) /awips2/edex/bin/setup.env

41
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
View file

@ -1,6 +1,6 @@
diff -crB a/component.spec b/component.spec
*** a/component.spec 2013-01-05 09:43:38.000000000 -0600
--- b/component.spec 2013-01-05 09:49:43.000000000 -0600
*** a/component.spec 2013-08-07 10:24:32.038932868 -0500
--- b/component.spec 2013-08-07 10:24:18.422990138 -0500
***************
*** 1,13 ****
#
@ -48,15 +48,11 @@ diff -crB a/component.spec b/component.spec
requires: awips2-edex-base
requires: awips2-python
***************
*** 40,58 ****
rm -rf %{_build_root}
*** 47,62 ****
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}
%build
%install
!
! unzip %{_baseline_workspace}/build.edex/edex/dist/%{_component_name}.zip \
-d %{_build_root}
if [ $? -ne 0 ]; then
@ -68,19 +64,17 @@ diff -crB a/component.spec b/component.spec
%preun
%postun
--- 40,98 ----
rm -rf %{_build_root}
%clean
--- 47,100 ----
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}
+ # prepare the init.d directory path
+ mkdir -p %{_build_root}/etc/init.d
+ if [ $? -ne 0 ]; then
+ exit 1
+ fi
%build
%install
! unzip %{_baseline_workspace}/build.edex/edex/dist/edex-datadelivery.zip \
-d %{_build_root}
if [ $? -ne 0 ]; then
@ -128,17 +122,12 @@ diff -crB a/component.spec b/component.spec
+ fi
%postun
%clean
***************
*** 63,66 ****
%defattr(644,awips,fxalpha,755)
*** 67,69 ****
--- 105,109 ----
%dir /awips2
%dir /awips2/edex
! /awips2/edex/*
\ No newline at end of file
--- 93,98 ----
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/edex
! /awips2/edex/*
!
! %attr(744,root,root) /etc/init.d/*
/awips2/edex/*
+
+ %attr(744,root,root) /etc/init.d/*

85
rpms/awips2.edex/Installer.edex-native/component.spec
View file

@ -1,85 +0,0 @@
#
# AWIPS II edex-native Spec File
#
Name: awips2-edex-native
Summary: AWIPS II Edex
Version: %{_component_version}
Release: %{_component_release}
Group: AWIPSII
BuildRoot: %{_build_root}
URL: N/A
License: N/A
Distribution: N/A
Vendor: Raytheon
Packager: Bryan Kowal
AutoReq: no
provides: awips2-edex-native
requires: awips2
requires: awips2-edex-base
%description
AWIPS II Edex Installation - Installs The AWIPS II EDEX Native Libraries.
# Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
%prep
# Verify That The User Has Specified A BuildRoot.
if [ "%{_build_root}" = "" ]
then
echo "ERROR: The RPM Build Root has not been specified."
exit 1
fi
if [ -d %{_build_root} ]; then
rm -rf %{_build_root}
fi
mkdir -p %{_build_root}/awips2
if [ $? -ne 0 ]; then
exit 1
fi
%build
%install
FILES_NATIVE="%{_baseline_workspace}/files.native"
PACKAGES="%{_awipscm_share}/packages"
# extract the native libraries
/bin/cp -rf ${FILES_NATIVE}/edex %{_build_root}/awips2/
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}/awips2/edex/lib/native/linux32/awips1
if [ $? -ne 0 ]; then
exit 1
fi
# copy the AWIPS I mhs libraries
cp ${PACKAGES}/mhs/* \
%{_build_root}/awips2/edex/lib/native/linux32/awips1
if [ $? -ne 0 ]; then
exit 1
fi
%pre
%post
%preun
%postun
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/edex
%defattr(755,awips,fxalpha,755)
%dir /awips2/edex/bin
/awips2/edex/bin/*
%dir /awips2/edex/lib
/awips2/edex/lib/*

6
rpms/awips2.edex/Installer.edex-shapefiles/component.spec
View file

@ -37,11 +37,15 @@ fi
if [ -d %{_build_root} ]; then
rm -rf %{_build_root}
fi
mkdir -p %{_build_root}/awips2/edex/data/utility/edex_static/base/shapefiles
%build
%install
mkdir -p %{_build_root}/awips2/edex/data/utility/edex_static/base/shapefiles
if [ $? -ne 0 ]; then
exit 1
fi
AWIPS2_STATIC=%{_awipscm_share}/awips2-static
# Determine which version of the shapefiles we should use.

11
rpms/awips2.edex/Installer.edex/component.spec
View file

@ -38,18 +38,23 @@ fi
if [ -d %{_build_root} ]; then
rm -rf %{_build_root}
fi
%build
%install
mkdir -p %{_build_root}/awips2/edex
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}/awips2/edex/logs
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}/etc/init.d
if [ $? -ne 0 ]; then
exit 1
fi
%build
%install
DEPLOY_SCRIPT="build.edex/deploy-common/deploy-esb.xml"
BUILD_ARCH="%{_build_arch}"

5
rpms/awips2.edex/deploy.builder/build.sh
View file

@ -161,11 +161,6 @@ export COMPONENT_NAME="edex-datadelivery"
patchDDSpecification
buildRPM "Installer.edex-datadelivery"
unset COMPONENT_NAME
# For, now edex-native is always a 32-bit rpm.
export TARGET_BUILD_ARCH="i386"
buildRPM "Installer.edex-native"
# Reset the target architecture for the remaining rpms.
setTargetArchitecture
DIST="${WORKSPACE}/build.edex/edex/dist"
for edex_zip in `cd ${DIST}; ls -1;`;

92
rpms/build/x86_64/build.sh
View file

@ -123,58 +123,58 @@ if [ "${1}" = "-64bit" ]; then
fi
if [ "${1}" = "-rh6" ]; then
#buildRPM "awips2-python"
#buildRPM "awips2-python-cherrypy"
#buildRPM "awips2-python-nose"
#buildRPM "awips2-python-pil"
#buildRPM "awips2-python-qpid"
#buildRPM "awips2-python-thrift"
#buildRPM "awips2-python-werkzeug"
#buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-pupynere"
#buildRPM "awips2-python-h5py"
#buildRPM "awips2-python-matplotlib"
#buildRPM "awips2-python-scientific"
#buildRPM "awips2-python-scipy"
#buildRPM "awips2-python-tables"
#buildRPM "awips2-python-pmw"
#buildRPM "awips2-python-tpg"
#buildRPM "awips2-ant"
#buildRPM "awips2-tools"
#buildRPM "awips2-postgres"
#buildRPM "awips2-pgadmin3"
#unpackHttpdPypies
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-nose"
buildRPM "awips2-python-pil"
buildRPM "awips2-python-qpid"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-numpy"
buildRPM "awips2-python-pupynere"
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-matplotlib"
buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-tables"
buildRPM "awips2-python-pmw"
buildRPM "awips2-python-tpg"
buildRPM "awips2-ant"
buildRPM "awips2-tools"
buildRPM "awips2-postgres"
buildRPM "awips2-pgadmin3"
unpackHttpdPypies
if [ $? -ne 0 ]; then
exit 1
fi
#buildRPM "awips2-httpd-pypies"
#buildRPM "awips2-httpd-collaboration"
#buildQPID
buildRPM "awips2-httpd-pypies"
buildRPM "awips2-httpd-collaboration"
buildQPID
if [ $? -ne 0 ]; then
exit 1
fi
#buildRPM "awips2-ldm"
#buildCAVE
buildRPM "awips2-ldm"
buildCAVE
if [ $? -ne 0 ]; then
exit 0
fi
#buildRPM "awips2-alertviz"
#buildRPM "awips2-database-server-configuration"
#buildRPM "awips2-database-standalone-configuration"
#buildRPM "awips2-database"
#buildRPM "awips2-maps-database"
#buildRPM "awips2-ncep-database"
#buildRPM "awips2-adapt-native"
#buildRPM "awips2-aviation-shared"
#buildRPM "awips2-cli"
#buildRPM "awips2-edex-environment"
#buildRPM "awips2-data.gfe"
#buildRPM "awips2-data.hdf5-gfe.climo"
#buildRPM "awips2-gfesuite-client"
#buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-groovy"
#buildRPM "awips2-localapps-environment"
#buildLocalizationRPMs
buildRPM "awips2-alertviz"
buildRPM "awips2-database-server-configuration"
buildRPM "awips2-database-standalone-configuration"
buildRPM "awips2-database"
buildRPM "awips2-maps-database"
buildRPM "awips2-ncep-database"
buildRPM "awips2-adapt-native"
buildRPM "awips2-aviation-shared"
buildRPM "awips2-cli"
buildRPM "awips2-edex-environment"
buildRPM "awips2-data.gfe"
buildRPM "awips2-data.hdf5-gfe.climo"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
buildRPM "awips2-groovy"
buildRPM "awips2-localapps-environment"
buildLocalizationRPMs
if [ $? -ne 0 ]; then
exit 1
fi
@ -183,6 +183,12 @@ if [ "${1}" = "-rh6" ]; then
buildRPM "awips2-data.hdf5-topo"
buildRPM "awips2"
buildOpenfire
buildEDEX
if [ $? -ne 0 ]; then
exit 1
fi
buildRPM "awips2-hydroapps-shared"
buildRPM "awips2-notification"
exit 0
fi