From 784233808062dbc599b649ce9858759ab0a8dff3 Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Tue, 5 Jul 2016 12:53:13 -0400 Subject: [PATCH] LP#1603708: Remove support for Ubuntu 12.04 Precise With support for Ubuntu 16.04 Xenial in place, remove the oldest LTS, which is Ubuntu 12.04 Precise. Signed-off-by: Ben Shum Signed-off-by: Galen Charlton --- README | 5 ++--- src/extras/Makefile.install | 16 +++------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/README b/README index 69cd54b3..bb1228d3 100644 --- a/README +++ b/README @@ -42,7 +42,6 @@ Well-tested values for include: * `debian-jessie` for Debian 8.0 * `debian-wheezy` for Debian 7.0 - * `ubuntu-precise` for Ubuntu 12.04 * `ubuntu-trusty` for Ubuntu 14.04 * `ubuntu-xenial` for Ubuntu 16.04 * `fedora` for Fedora 17 and later @@ -419,7 +418,7 @@ apxs2 -i -a -c mod_websocket.c 3. Create the websocket Apache instance (more information about this in `/usr/share/doc/apache2/README.multiple-instances`) + -.(Debian / Ubuntu Precise) +.(Debian) [source, bash] --------------------------------------------------------------------------- sh /usr/share/doc/apache2.2-common/examples/setup-instance websockets @@ -440,7 +439,7 @@ a2dismod websocket + 5. Copy into place the config files + -.(Debian / Ubuntu Precise) +.(Debian) [source, bash] --------------------------------------------------------------------------- cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/ diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install index 96e60d89..39d7ed4d 100644 --- a/src/extras/Makefile.install +++ b/src/extras/Makefile.install @@ -4,7 +4,7 @@ # # Makefile to install prerequisites for OpenSRF # -# Currently supports Debian (jessie/wheezy), Ubuntu (precise/trusty) +# Currently supports Debian (jessie/wheezy), Ubuntu (trusty/xenial) # and Fedora (16). # # Installs Perl prereqs, libjs with Perl wrapper @@ -14,10 +14,10 @@ # - or - # make -f Makefile.install debian-wheezy # - or - -# make -f Makefile.install ubuntu-precise -# - or - # make -f Makefile.install ubuntu-trusty # - or - +# make -f Makefile.install ubuntu-xenial +# - or - # make -f Makefile.install fedora # # --------------------------------------------------------------------- @@ -163,11 +163,6 @@ EXTRA_DEBS_JESSIE = \ apache2-prefork-dev \ libncurses5-dev -EXTRA_DEBS_UBUNTU_PRECISE = \ - apache2-mpm-prefork \ - apache2-prefork-dev \ - ncurses-dev - EXTRA_DEBS_UBUNTU_TRUSTY = \ apache2-mpm-prefork \ apache2-prefork-dev \ @@ -192,10 +187,8 @@ generic_debian: install_debs fedora: install_fedora_rpms -ubuntu-precise: generic_ubuntu precise ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods apache_perl_mod -precise: install_extra_debs install_extra_debs_precise debian_sys_config trusty: install_extra_debs install_extra_debs_trusty debian_sys_config xenial: install_extra_debs install_extra_debs_xenial debian_sys_config generic_ubuntu: install_debs @@ -228,9 +221,6 @@ install_extra_debs_wheezy: install_extra_debs $(APT_TOOL) install $(EXTRA_DEBS_WHEEZY) # Install even more packaged dependencies on modern distros -install_extra_debs_precise: - $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_PRECISE) - install_extra_debs_trusty: $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY) -- 2.43.2