From 0c9dbfae5d78aadcdb9d1119a6e8c64e92f27a16 Mon Sep 17 00:00:00 2001 From: Joe Roberts Date: Sun, 30 Apr 2023 13:54:42 -0700 Subject: [PATCH] GITC-4404 Deprecating RPM builds - All MRF driver code is now in core GDAL repo - Only mrf_apps remain in this repo --- GNUmakefile | 166 ---------------------- bin/build_el7_docker_image.sh | 28 ---- bin/build_el7_rpms_in_docker.sh | 44 ------ bin/build_el8_docker_image.sh | 28 ---- bin/build_el8_rpms_in_docker.sh | 47 ------ bin/build_el9_docker_image.sh | 28 ---- bin/build_el9_rpms_in_docker.sh | 46 ------ deploy/gibs-gdal/gibs-gdal.spec | 245 -------------------------------- docker/el7/Dockerfile | 6 - docker/el8/Dockerfile | 6 - docker/el9/Dockerfile | 6 - 11 files changed, 650 deletions(-) delete mode 100644 GNUmakefile delete mode 100755 bin/build_el7_docker_image.sh delete mode 100755 bin/build_el7_rpms_in_docker.sh delete mode 100755 bin/build_el8_docker_image.sh delete mode 100755 bin/build_el8_rpms_in_docker.sh delete mode 100755 bin/build_el9_docker_image.sh delete mode 100755 bin/build_el9_rpms_in_docker.sh delete mode 100644 deploy/gibs-gdal/gibs-gdal.spec delete mode 100644 docker/el7/Dockerfile delete mode 100644 docker/el8/Dockerfile delete mode 100644 docker/el9/Dockerfile diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index 422e967..0000000 --- a/GNUmakefile +++ /dev/null @@ -1,166 +0,0 @@ -# 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. - -GDAL_VERSION=2.4.4 -GDAL_ARTIFACT=gdal-$(GDAL_VERSION).tar.gz -GDAL_HOME=http://download.osgeo.org/gdal -GDAL_URL=$(GDAL_HOME)/$(GDAL_VERSION)/$(GDAL_ARTIFACT) - -PREFIX=/usr/local -SMP_FLAGS=-j $(shell cat /proc/cpuinfo | grep processor | wc -l) -LIB_DIR=$(shell \ - [ "$(shell arch)" == "x86_64" ] \ - && echo "lib64" \ - || echo "lib" \ -) -RPMBUILD_FLAGS=-ba - -all: - @echo "Use targets gdal-rpm" - -gdal: gdal-unpack gdal-compile - -#----------------------------------------------------------------------------- -# Download -#----------------------------------------------------------------------------- - -download: gdal-download - -gdal-download: upstream/$(GDAL_ARTIFACT).downloaded - -upstream/$(GDAL_ARTIFACT).downloaded: - mkdir -p upstream - rm -f upstream/$(GDAL_ARTIFACT) - ( cd upstream ; wget $(GDAL_URL) ) - touch upstream/$(GDAL_ARTIFACT).downloaded - -#----------------------------------------------------------------------------- -# Compile -#----------------------------------------------------------------------------- - -gdal-unpack: build/gdal/VERSION - -build/gdal/VERSION: - mkdir -p build/gdal/mrf_apps - tar xf upstream/$(GDAL_ARTIFACT) -C build/gdal \ - --strip-components=1 --exclude=.gitignore - cp mrf_apps/* build/gdal/mrf_apps/ - -gdal-compile: - ( cd build/gdal ; sed -i 's/HAVE_CAD = yes/HAVE_CAD = no/g' GDALmake.opt.in ; ./configure \ - --prefix=$(PREFIX) \ - --libdir=$(PREFIX)/$(LIB_DIR) \ - --mandir=$(PREFIX)/share/man \ - --with-threads \ - --without-bsb \ - --with-geotiff=internal \ - --with-libtiff=internal \ - --without-ogdi \ - --with-libz \ - --with-geos \ - --with-jasper=no \ - --with-png \ - --with-gif \ - --with-jpeg \ - --with-curl \ - --with-python=yes \ - --with-pcraster \ - --with-jpeg12=no \ - --enable-shared \ - --with-gdal-ver=$(GDAL_VERSION) \ - --disable-rpath \ - --with-expat \ - --without-teigha \ - --without-cad \ - --without-pg \ - --with-openjpeg \ - ) - $(MAKE) -C build/gdal $(SMP_FLAGS) man - -#----------------------------------------------------------------------------- -# Install -#----------------------------------------------------------------------------- -install: gdal-install - -gdal-install: - $(MAKE) -C build/gdal install install-man PREFIX=$(PREFIX) - $(MAKE) -C build/gdal/mrf_apps install - install -m 755 mrf_apps/mrf_clean.py -D $(DESTDIR)/$(PREFIX)/bin/mrf_clean.py - install -m 755 mrf_apps/mrf_join.py -D $(DESTDIR)/$(PREFIX)/bin/mrf_join.py - install -m 755 mrf_apps/mrf_read_data.py -D $(DESTDIR)/$(PREFIX)/bin/mrf_read_data.py - install -m 755 mrf_apps/mrf_read_idx.py -D $(DESTDIR)/$(PREFIX)/bin/mrf_read_idx.py - install -m 755 mrf_apps/mrf_read.py -D $(DESTDIR)/$(PREFIX)/bin/mrf_read.py - install -m 755 mrf_apps/mrf_size.py -D $(DESTDIR)/$(PREFIX)/bin/mrf_size.py - install -m 755 mrf_apps/tiles2mrf.py -D $(DESTDIR)/$(PREFIX)/bin/tiles2mrf.py - -#----------------------------------------------------------------------------- -# Local install -#----------------------------------------------------------------------------- -local-install: gdal-local-install - -gdal-local-install: - mkdir -p build/install - $(MAKE) gdal-install DESTDIR=$(PWD)/build/install - -#----------------------------------------------------------------------------- -# Artifacts -#----------------------------------------------------------------------------- -artifacts: gdal-artifact - -gdal-artifact: - mkdir -p dist - rm -f dist/gibs-gdal-$(GDAL_VERSION).tar.bz2 - tar cjvf dist/gibs-gdal-$(GDAL_VERSION).tar.bz2 \ - --transform="s,^,gibs-gdal-$(GDAL_VERSION)/," \ - mrf_apps deploy/gibs-gdal GNUmakefile - -#----------------------------------------------------------------------------- -# RPM -#----------------------------------------------------------------------------- -rpm: gdal-rpm - -gdal-rpm: gdal-artifact - mkdir -p build/rpmbuild/SOURCES - mkdir -p build/rpmbuild/BUILD - mkdir -p build/rpmbuild/BUILDROOT - rm -f dist/gibs-gdal*.rpm - cp \ - upstream/gdal-$(GDAL_VERSION).tar.gz \ - dist/gibs-gdal-$(GDAL_VERSION).tar.bz2 \ - build/rpmbuild/SOURCES - rpmbuild \ - --define _topdir\ "$(PWD)/build/rpmbuild" \ - -ba deploy/gibs-gdal/gibs-gdal.spec - mv build/rpmbuild/RPMS/*/gibs-gdal*.rpm dist - mv build/rpmbuild/SRPMS/gibs-gdal*.rpm dist - -#----------------------------------------------------------------------------- -# Mock -#----------------------------------------------------------------------------- -mock: gdal-mock - -gdal-mock: - mock --clean - mock --root=gibs-epel-9-$(shell arch) \ - dist/gibs-gdal-$(GDAL_VERSION)-*.src.rpm - -#----------------------------------------------------------------------------- -# Clean -#----------------------------------------------------------------------------- -clean: - rm -rf build - -distclean: clean - rm -rf dist - rm -rf upstream - - diff --git a/bin/build_el7_docker_image.sh b/bin/build_el7_docker_image.sh deleted file mode 100755 index 2b87726..0000000 --- a/bin/build_el7_docker_image.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -if ! ls dist/gibs-gdal-*.el7.*.rpm >/dev/null 2>&1; then - echo "No RPMs found in ./dist/" >&2 - exit 1 -fi - -TAG="$1" - -mkdir -p docker/el7/rpms -cp dist/gibs-gdal-*.el7.*.rpm docker/el7/rpms/ -rm -f docker/el7/rpms/gibs-gdal-*.src.rpm -rm -f docker/el7/rpms/gibs-gdal-debuginfo-*.rpm - -( - set -e - cd docker/el7 - - if [ -z "$TAG" ]; then - docker build --no-cache . - else - docker build --no-cache -t "$TAG" . - fi -) - -rm -rf docker/el7/rpms diff --git a/bin/build_el7_rpms_in_docker.sh b/bin/build_el7_rpms_in_docker.sh deleted file mode 100755 index 5c8243a..0000000 --- a/bin/build_el7_rpms_in_docker.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -set -evx - -DOCKER_UID=$(id -u) -DOCKER_GID=$(id -g) -mkdir -p dist -cat > dist/build_rpms.sh </dev/null 2>&1; then - echo "No RPMs found in ./dist/" >&2 - exit 1 -fi - -TAG="$1" - -mkdir -p docker/el8/rpms -cp dist/gibs-gdal-*.el8.*.rpm docker/el8/rpms/ -rm -f docker/el8/rpms/gibs-gdal-*.src.rpm -rm -f docker/el8/rpms/gibs-gdal-*debuginfo-*.rpm - -( - set -e - cd docker/el8 - - if [ -z "$TAG" ]; then - docker build --no-cache . - else - docker build --no-cache -t "$TAG" . - fi -) - -rm -rf docker/el8/rpms diff --git a/bin/build_el8_rpms_in_docker.sh b/bin/build_el8_rpms_in_docker.sh deleted file mode 100755 index 0b6a6ea..0000000 --- a/bin/build_el8_rpms_in_docker.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -set -evx - -DOCKER_UID=$(id -u) -DOCKER_GID=$(id -g) -mkdir -p dist -cat > dist/build_rpms.sh </dev/null 2>&1; then - echo "No RPMs found in ./dist/" >&2 - exit 1 -fi - -TAG="$1" - -mkdir -p docker/el9/rpms -cp dist/gibs-gdal-*.el9.*.rpm docker/el9/rpms/ -rm -f docker/el9/rpms/gibs-gdal-*.src.rpm -rm -f docker/el9/rpms/gibs-gdal-*debuginfo-*.rpm - -( - set -e - cd docker/el9 - - if [ -z "$TAG" ]; then - docker build --no-cache . - else - docker build --no-cache -t "$TAG" . - fi -) - -rm -rf docker/el9/rpms diff --git a/bin/build_el9_rpms_in_docker.sh b/bin/build_el9_rpms_in_docker.sh deleted file mode 100755 index c50c43d..0000000 --- a/bin/build_el9_rpms_in_docker.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -set -evx - -DOCKER_UID=$(id -u) -DOCKER_GID=$(id -g) -mkdir -p dist -cat > dist/build_rpms.sh < - 2.4.4-5 -- Support for el9 builds - -* Wed Jul 7 2021 Matthew Cechini - 2.4.4-4 -- Adding install requirement for proj.4 -- Updating linking of /usr/lib64/libproj.so - -* Mon Apr 19 2021 Joe T. Roberts - 2.4.4-3 -- Support for CentOS 8 builds - -* Wed Dec 16 2020 Joe T. Roberts - 2.4.4-2 -- Use Python3 apps, include can, and moved gcc-c++ to BuildRequires - -* Thu Mar 19 2020 Joe T. Roberts - 2.4.4-1 -- Update to GDAL 2.4.4 - -* Thu Aug 1 2019 Joe T. Roberts - 2.4.2-1 -- Update to GDAL 2.4.2 - -* Thu Mar 7 2019 Joe T. Roberts - 2.4.0-1 -- Update to GDAL 2.4.0 and added apps - -* Thu Jul 6 2017 Joe T. Roberts - 2.1.4-1 -- New upstream GDAL version - -* Wed Apr 12 2017 Joe T. Roberts - 2.1.3-1 -- New upstream GDAL version - -* Wed Dec 21 2016 Joe T. Roberts - 2.1.2-1 -- New upstream GDAL version - -* Fri Sep 2 2016 Joe T. Roberts - 2.1.1-1 -- Transition to GDAL version 2 - -* Mon Apr 25 2016 Joe T. Roberts - 1.11.4-1 -- New upstream GDAL version - -* Tue Mar 8 2016 Joe T. Roberts - 1.11.2-3 -- Added numpy and removed plugin-mrf package - -* Tue Feb 2 2016 Joshua Rodriguez - 1.11.2-2 -- Remove PostgreSQL dependency - -* Tue Oct 14 2014 Mike McGann - 1.11.1-1 -- New upstream GDAL version - -* Fri Aug 8 2014 Mike McGann - 1.11.0-2 -- Updates for building on EL7 - -* Fri Jul 18 2014 Mike McGann - 1.11.0-1 -- New upstream GDAL version - -* Wed Apr 30 2014 Joe T. Roberts - 1.10.1-5 -- Changed MRF version to 0.3.1 - -* Tue Apr 1 2014 Joe T. Roberts - 1.10.1-4 -- Changed MRF version to 0.3.0 - -* Tue Feb 18 2014 Joe T. Roberts - 1.10.1-3 -- Changed MRF version to 0.2.4 to be consistent with project release - -* Thu Sep 5 2013 Mike McGann - 1.10.1-2 -- Rebuild with PostgreSQL 9.2 and Expat support -- Added correct Obsoletes/Provides for devel package - -* Wed Sep 4 2013 Mike McGann - 1.10.1-1 -- New upstream version -- Rebuild with official MRF code - -* Fri Aug 23 2013 Mike McGann - 1.10.0-7 -- Obsoletes/Provides now correct and includes gdal-python - -* Wed Jul 24 2013 Mike McGann - 1.10.0-6 -- Corrections for mrf_insert from Lucian. - -* Thu Jul 11 2013 Mike McGann - 1.10.0-5 -- Link failure discovered in chroot build. Back to dynamic linking of - proj with a dependency on the devel package. - -* Mon Jul 8 2013 Mike McGann - 1.10.0-4 -- Statically linking libproj for now since it is looking for the non-versioned - shared object that is in the devel package. -- Added Lucian artifact which adds insert support for MRFs. - -* Thu Jun 6 2013 Mike McGann - 1.10.0-3 -- Split out MRF plugin into a separate package. - -* Sat May 11 2013 Mike McGann - 1.10.0-2 -- Combined python package into main since it is required to run many of - the gdal utilities. - -* Wed Apr 24 2013 Mike McGann - 1.10.0-1 -- Initial package diff --git a/docker/el7/Dockerfile b/docker/el7/Dockerfile deleted file mode 100644 index c45a6e7..0000000 --- a/docker/el7/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM centos:7 - -COPY rpms/gibs-gdal-*.el7.*.rpm /rpms/ - -RUN yum install -y epel-release && yum clean all -RUN yum install -y /rpms/gibs-gdal-*.el7.*.rpm diff --git a/docker/el8/Dockerfile b/docker/el8/Dockerfile deleted file mode 100644 index 6cd8237..0000000 --- a/docker/el8/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM centos:8 - -COPY rpms/gibs-gdal-*.el8.*.rpm /rpms/ - -RUN yum install -y epel-release python36 && yum clean all -RUN yum install -y /rpms/gibs-gdal-*.el8.*.rpm diff --git a/docker/el9/Dockerfile b/docker/el9/Dockerfile deleted file mode 100644 index c52ee1f..0000000 --- a/docker/el9/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM rockylinux:9.1 - -COPY rpms/gibs-gdal-*.el9.*.rpm /rpms/ - -RUN yum install -y epel-release && yum clean all -RUN yum install -y /rpms/gibs-gdal-*.el9.*.rpm