From 50b643b846b0847ec87cfe2290cab91ca7dea562 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Fri, 17 Mar 2017 19:37:29 -0600 Subject: [PATCH 1/2] don't bother checking for ignored components --- rpms/awips2.edex/deploy.builder/build.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/rpms/awips2.edex/deploy.builder/build.sh b/rpms/awips2.edex/deploy.builder/build.sh index d2dddda38b..58333680ca 100644 --- a/rpms/awips2.edex/deploy.builder/build.sh +++ b/rpms/awips2.edex/deploy.builder/build.sh @@ -113,12 +113,8 @@ DIST="${WORKSPACE}/build.edex/edex/dist" for edex_zip in `cd ${DIST}; ls -1;`; do edex_component=`python -c "zipFile='${edex_zip}'; componentName=zipFile.replace('.zip',''); print componentName;"` - - # Check if component is in the ignore file, do not build an RPM if so. - if ! grep -Fxq "${edex_component}" ${WORKSPACE}/build.edex/component.ignore.txt; then - export COMPONENT_NAME="${edex_component}" - buildRPM "Installer.edex-component" - unset COMPONENT_NAME - fi + export COMPONENT_NAME="${edex_component}" + buildRPM "Installer.edex-component" + unset COMPONENT_NAME done From dd416db0365d6ca923e0d4e6474e6b654057ec5a Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 20 Mar 2017 13:04:39 -0600 Subject: [PATCH 2/2] postgis legacy version in Installer.maps-database, fixes #107 --- rpms/awips2.core/Installer.maps-database/component.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec index c2aed9dfce..bf1cb3ca59 100644 --- a/rpms/awips2.core/Installer.maps-database/component.spec +++ b/rpms/awips2.core/Installer.maps-database/component.spec @@ -168,7 +168,7 @@ if [ "${MAPS_DB_EXISTS}" = "false" ]; then fi # Do we still need legacy? - SQL_FILE="/awips2/postgresql/share/contrib/postgis-2.2/legacy.sql" + SQL_FILE="/awips2/postgresql/share/contrib/postgis-2.0/legacy.sql" su - ${DB_OWNER} -c \ "${PSQL} -d maps -U awips -q -p 5432 -f ${SQL_FILE}" >> ${SQL_LOG} 2>&1 if [ $? -ne 0 ]; then