[meta-networking][PATCH 1/3] ctdb: drop duplicated DESCRIPTION

[meta-networking][PATCH 1/3] ctdb: drop duplicated DESCRIPTION

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
index d4c0f86..66c966d 100644
--- a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
+++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
@@ -2,10 +2,6 @@ DESCRIPTION = "CTDB is a cluster implementation of the TDB database \
 used by Samba and other projects to store temporary data. If an \
 application is already using TDB for temporary data it is very easy \
 to convert that application to be cluster aware and use CTDB instead."
-DESCRIPTION = "CTDB is a cluster implementation of the TDB database \
-used by Samba and other projects to store temporary data. If an \
-application is already using TDB for temporary data it is very easy \
-to convert that application to be cluster aware and use CTDB instead."
 HOMEPAGE = "https://ctdb.samba.org/"
 LICENSE = "GPL-2.0+ & LGPL-3.0+ & GPL-3.0+"
 
-- 
2.8.0

[meta-networking][PATCH 2/3] ctdb: rdepend on procps

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

ctdbd_wrapper requires pgrep.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
index 66c966d..232546c 100644
--- a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
+++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
@@ -28,6 +28,9 @@ PARALLEL_MAKE = ""
 
 DEPENDS += "popt libtevent libtalloc libldb"
 
+# ctdbd_wrapper requires pgrep, hence procps
+RDEPENDS_${PN} += "procps"
+
 do_configure() {
     oe_runconf
 }
-- 
2.8.0

[meta-networking][PATCH 3/3] ctdb: disable the service by default

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

The systemd service is disabled by default, as the service will fail to start
without /etc/ctdb/nodes. If the user supplies this, they can re-enable the
service.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
index 232546c..5d75784 100644
--- a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
+++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
@@ -44,6 +44,10 @@ do_install_append() {
     rm -r ${D}/${localstatedir}/run
 }
 
+# The systemd service is disabled by default, as the service will fail to
+# start without /etc/ctdb/nodes. If the user supplies this, they can re-enable
+# the service.
+SYSTEMD_AUTO_ENABLE = "disable"
 SYSTEMD_SERVICE_${PN} = "ctdb.service"
 
 # onnode is a shell script with bashisms and bash #!
-- 
2.8.0