From 7d5cf76ef656be26f599640d5e61fbab7b866b66 Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Mon, 27 Feb 2017 16:32:48 -0500 Subject: [PATCH] Install PG 9.3 from PostgreSQL apt source for Wheezy Since Wheezy only ships with PG 9.1 by default, we need a new source for PG 9.3+. Set up the installer to use the PostgreSQL community's apt sources and install PG 9.3 as the new minimum required version. Based on Chris Sharp's ideas for using PG apt source in LP#1493824 Signed-off-by: Ben Shum --- Open-ILS/src/extras/install/Makefile.debian | 7 +++++++ Open-ILS/src/extras/install/Makefile.debian-wheezy | 20 +++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian index 495cdb2b34..1535f61239 100644 --- a/Open-ILS/src/extras/install/Makefile.debian +++ b/Open-ILS/src/extras/install/Makefile.debian @@ -1,6 +1,7 @@ # actions required by all debian-based OSs APT_TOOL=apt-get -yq +RELEASE_CODENAME=$(shell lsb_release -cs) install_debs: $(APT_TOOL) install $(DEBS) @@ -30,6 +31,12 @@ debian_sys_config: # refresh the dynamic library cache ldconfig +# Adding this for installing versions from PostgreSQL community apt source +debian_postgresql_repo: + echo "deb http://apt.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" > /etc/apt/sources.list.d/pgdg.list + wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - + $(APT_TOOL) update + clean: echo "cleaning" diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy index 52fb75e155..88a3829d0a 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-wheezy +++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy @@ -87,12 +87,16 @@ export CPAN_MODULES_FORCE = \ Business::Stripe \ Class::DBI::Frozen::301 -PGSQL_SERVER_DEBS_91 = \ - $(DEB_PGSQL_COMMON_MODS) \ - postgresql-9.1 \ - postgresql-contrib-9.1 \ - postgresql-plperl-9.1 \ - postgresql-server-dev-9.1 +PGSQL_APT_REPO_DEBS = \ + wget \ + ca-certificates + +PGSQL_SERVER_DEBS_93 = \ + $(DEB_PGSQL_COMMON_MODS) \ + postgresql-9.3 \ + postgresql-contrib-9.3 \ + postgresql-plperl-9.3 \ + postgresql-server-dev-9.3 # note: some prereqs are repeated in the developer/packager # sections to support building Evergreen packages on servers @@ -131,7 +135,9 @@ all: make -f $(DIR)/Makefile.debian debian_sys_config install_postgres_server: - make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)" + make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)" + make -f $(DIR)/Makefile.debian debian_postgresql_repo + make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_93)" install_developer: make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" -- 2.11.0