From a3c338f9417611e9116616472ca7ce3bec0ca75b Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 8 Jul 2013 15:43:57 -0400 Subject: [PATCH] LP 1190279 Installer makefiles OS targets for PG server Instead of requesting install_pgsql_server_debs_91, install_pgsql_server_backport_debs_91, etc. when installing the postgres server, simply give each OS type its own postgres install target. make -f Makefile.install postgres-server-debian-wheezy make -f Makefile.install postgres-server-debian-squeeze make -f Makefile.install postgres-server-ubuntu-lucid make -f Makefile.install postgres-server-ubuntu-precise make -f Makefile.install postgres-server-fedora Let the OS module decide what and how to install the postgres server. Changes are reflected in docs/installation/server_installation.txt Signed-off-by: Bill Erickson Signed-off-by: Chris Sharp Signed-off-by: Dan Scott --- Open-ILS/src/extras/Makefile.install | 11 ++++++++ .../extras/install/Makefile.debian-squeeze | 5 ++-- .../src/extras/install/Makefile.debian-wheezy | 2 +- docs/installation/server_installation.txt | 25 +++++++++++-------- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index f6a31eb8b4..4ddd7cb81e 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -62,4 +62,15 @@ ubuntu-precise: fedora: @make -f $(DIR)/Makefile.fedora +postgres-server-debian-wheezy: + @make -f $(DIR)/Makefile.debian-wheezy install_postgres_server +postgres-server-debian-squeeze: + @make -f $(DIR)/Makefile.debian-squeeze install_postgres_server +postgres-server-ubuntu-lucid: + @make -f $(DIR)/Makefile.ubuntu-lucid install_postgres_server +postgres-server-ubuntu-precise: + @make -f $(DIR)/Makefile.ubuntu-precise install_postgres_server +postgres-server-fedora: + @make -f $(DIR)/Makefile.fedora install_postgres_server + # vim:noet:sw=4:ts=4: diff --git a/Open-ILS/src/extras/install/Makefile.debian-squeeze b/Open-ILS/src/extras/install/Makefile.debian-squeeze index a8a114fdf8..f87712b403 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-squeeze +++ b/Open-ILS/src/extras/install/Makefile.debian-squeeze @@ -3,6 +3,7 @@ DIR = $(dir $(lastword $(MAKEFILE_LIST))) APT_BACKPORT_TOOL = aptitude -t squeeze-backports -yq APT_SAFE_TOOL = aptitude -P +APT_TOOL=aptitude -yq export DEBS = \ apache2-prefork-dev\ @@ -81,7 +82,7 @@ PGSQL_CLIENT_DEBS_91 = \ libpq-dev \ postgresql-client-9.1 -all: +all: install_pgsql_client_backport_debs_91 make -f $(DIR)/Makefile.debian install_debs make -f $(DIR)/Makefile.debian test_for_libdbi_pkg make -f $(DIR)/Makefile.common install_net_z3950_simpleserver @@ -90,7 +91,7 @@ all: make -f $(DIR)/Makefile.debian install_js_sm make -f $(DIR)/Makefile.debian debian_sys_config -install_pgsql_server_backport_debs_91: +install_postgres_server: $(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91) install_pgsql_client_backport_debs_91: diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy index 001ac1c059..6169609f8c 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-wheezy +++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy @@ -86,7 +86,7 @@ all: make -f $(DIR)/Makefile.debian install_js_sm make -f $(DIR)/Makefile.debian debian_sys_config -install_pgsql_server_debs_91: +install_postgres_server: make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)" clean: diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt index 664a8cb5f5..9834628255 100644 --- a/docs/installation/server_installation.txt +++ b/docs/installation/server_installation.txt @@ -321,25 +321,28 @@ dedicated machine. You can install the packages required by Debian or Ubuntu Luc on the machine of your choice using the following commands as the *root* Linux account: -.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages -[source, bash] ------------------------------------------------------------------------------- -make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91 ------------------------------------------------------------------------------- +.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages + +Each OS build target provides the postgres server installation packages +required for each operating system. To install Postgres server packages, +use the make target 'postgres-server-'. Choose the most appropriate +command below based on your operating system. -.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages [source, bash] ------------------------------------------------------------------------------ -make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-squeeze +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-lucid +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise +make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora ------------------------------------------------------------------------------ -You can install the packages required by Fedora on the machine of your choice -using the following commands as the *root* Linux account: +.(Fedora) Postgres initialization + +Installing Postgres on Fedora requires one additional step. -.(Fedora) Installing PostgreSQL server packages [source, bash] ------------------------------------------------------------------------------ -make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server postgresql-setup initdb ------------------------------------------------------------------------------ -- 2.43.2