Lp 1875544: Add Installation Support for Ubuntu 20.04 Focal Fossa

Update README and install prerequisites with ubuntu-focal target.

Consolidate Ubuntu Makefile.install targets to remove redundant
"code."

Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Ben Shum <ben@evergreener.net>

diff --git a/README b/README
index f5b1727..0d8b820 100644 (file)
--- a/README
+++ b/README
@@ -69,6 +69,7 @@ Well-tested values for <osname> include:
   * `debian-jessie` for Debian 8
   * `ubuntu-xenial` for Ubuntu 16.04
   * `ubuntu-bionic` for Ubuntu 18.04
+  * `ubuntu-focal` for Ubuntu 20.04
 
 Patches and suggestions for improvement from users of these distributions,
 or others, are welcome!
@@ -205,7 +206,7 @@ work for OpenSRF.
 1. Stop ejabberd before making any changes to its configuration by issuing the
    following command as the *root* Linux account:
 +
-.(Debian / Ubuntu Xenial / Ubuntu Bionic) Stopping ejabberd
+.(Debian / Ubuntu Xenial / Ubuntu Bionic / Ubuntu Focal) Stopping ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
 systemctl stop ejabberd.service
@@ -260,7 +261,7 @@ hosts:
     ##access_max_user_messages: max_user_offline_messages
 -----------------------
 +
-(Debian Buster / Ubuntu Bionic) Ejabberd 18.x::
+(Debian Buster / Ubuntu Bionic / Ubuntu Focal) Ejabberd 18.x::
 Open `/etc/ejabberd/ejabberd.yml` and make the following
 changes:
   a. Define your public and private domains in the `hosts` directive. For
@@ -293,7 +294,7 @@ mod_legacy_auth: {}
 +
 3. Restart the ejabberd server to make the changes take effect:
 +
-.(Debian / Ubuntu Xenial / Ubuntu Bionic) Starting ejabberd
+.(Debian / Ubuntu Xenial / Ubuntu Bionic / Ubuntu Focal) Starting ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
 systemctl start ejabberd.service

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 7baa188..0808d21 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -5,7 +5,7 @@
 # Makefile to install prerequisites for OpenSRF
 #
 # Currently supports Debian (jessie/stretch) and Ubuntu
-# (xenial/bionic)
+# (xenial/bionic/focal)
 #
 # Installs Perl prereqs, libjs with Perl wrapper
 #
@@ -20,6 +20,8 @@
 #   - or -
 #   make -f Makefile.install ubuntu-bionic
 #      - or -
+#   make -f Makefile.install ubuntu-focal
+#      - or -
 #      make -f Makefile.install fedora
 #
 # ---------------------------------------------------------------------
@@ -158,12 +160,7 @@ EXTRA_DEBS_DEBIAN_STRETCH = \
        apache2-dev \
        libncurses5-dev
 
-EXTRA_DEBS_UBUNTU_XENIAL = \
-       apache2 \
-       apache2-dev \
-       libncurses5-dev
-
-EXTRA_DEBS_UBUNTU_BIONIC = \
+EXTRA_DEBS_UBUNTU = \
        apache2 \
        apache2-dev \
        libncurses5-dev
@@ -184,11 +181,11 @@ generic_debian: install_debs
 
 fedora: install_fedora_rpms
 
-ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods apache_perl_mod
-ubuntu-bionic: generic_ubuntu bionic apache_mpm_prefork_mods apache_perl_mod
-xenial: install_extra_debs install_extra_debs_xenial debian_sys_config
-bionic: install_extra_debs install_extra_debs_bionic debian_sys_config
-generic_ubuntu: install_debs
+ubuntu-xenial: generic_ubuntu
+ubuntu-bionic: generic_ubuntu
+ubuntu-focal: generic_ubuntu
+generic_ubuntu: install_debs install_extra_debs install_extra_debs_ubuntu \
+                debian_sys_config apache_mpm_prefork_mods apache_perl_mod
 
 # ------------------------------------------------------------------
 # - DEBIAN ---------------------------------------------------------
@@ -215,11 +212,8 @@ install_extra_debs_jessie: install_extra_debs
        $(APT_TOOL) install $(EXTRA_DEBS_JESSIE)
 
 # Install even more packaged dependencies on modern distros
-install_extra_debs_xenial:
-       $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_XENIAL)
-
-install_extra_debs_bionic:
-       $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_BIONIC)
+install_extra_debs_ubuntu:
+       $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU)
 
 
 # Some OSes activate the Apache mpm_event module by default.