Skip to contentSkip to conversation

cluster-glue: several fixes

PATCH New [email protected] 1 participant 4 messages May 31, 2017

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover cluster-glue: several fixes

From: Jackie Huang <[email protected]>

--
The following changes since commit c0afa706e9cdb650c0e8bb79f503743632350b00:

core-image-cgl: Remove ROOTFS_PKGMANAGE_BOOTSTRAP (2017-05-24 14:19:13 +0200)

are available in the git repository at:

https://github.com/jackiehjm/meta-cgl.git jhuang0/up_cluster-glue_170531_0
https://github.com//tree/jhuang0/up_cluster-glue_170531_0

Jackie Huang (3):
cluster-glue: inherit systemd
cluster-glue: fix the licenses
cluster-glue: update useradd parameters

 .../cluster-glue/cluster-glue_1.0.12.bb            | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 1/3 cluster-glue: inherit systemd

From: Jackie Huang <[email protected]>

inherit systemd and add PACKAGECONFIG to add proper configure option and dependency when systemd is enabled.

Signed-off-by Jackie Huang <[email protected]>
---
 meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +7 -1
index 9604bca..eed7262 100644
@@ -20,10 +20,16 @@ SRC_URI[sha256sum] = "feba102fa1e24b6be2005089ebe362b82d6567af60005cf371679b1b44
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
 
-inherit autotools useradd pkgconfig
+inherit autotools useradd pkgconfig systemd
+
+SYSTEMD_SERVICE_${PN} = "logd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 S = "${WORKDIR}/Reusable-Cluster-Components-glue--glue-${PV}"
 
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,systemd"
+
 EXTRA_OECONF = "--with-daemon-user=hacluster --with-daemon-group=haclient --disable-fatal-warnings"
 
 CACHED_CONFIGUREVARS="ac_cv_path_XML2CONFIG=0"
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH 2/3 cluster-glue: fix the licenses

In reply to [email protected]

From: Jackie Huang <[email protected]>

It includes LGPL 2.1 as well according to COPYING.LIB.

And point the LIC_FILES_CHKSUM to the checksums of the license text in the source code.

Signed-off-by Jackie Huang <[email protected]>
---
 meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +5 -3
index eed7262..b5cf997 100644
@@ -3,7 +3,11 @@ the Heartbeat/Pacemaker cluster stack. In essence, Glue is everything that \
 is not the cluster messaging layer (Heartbeat), nor the cluster resource manager \
 (Pacemaker), nor a Resource Agent."
 
-LICENSE = "GPLv2"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+                    file://COPYING.LIB;md5=243b725d71bb5df4a1e5920b344b86ad \
+"
+
 DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux net-snmp openhpi"
 
 SRC_URI = " \

@@ -18,8 +22,6 @@ SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
 SRC_URI[md5sum] = "ec620466d6f23affa3b074b72bca7870"
 SRC_URI[sha256sum] = "feba102fa1e24b6be2005089ebe362b82d6567af60005cf371679b1b44ec503f"
 
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
-
 inherit autotools useradd pkgconfig systemd
 
 SYSTEMD_SERVICE_${PN} = "logd.service"
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH 3/3 cluster-glue: update useradd parameters

In reply to [email protected]

From: Jackie Huang <[email protected]>

Update useradd parameters for cluster-glue according to spec file from source code:

https://github.com/ClusterLabs/cluster-glue/blob/master/cluster-glue-fedora.spec

And use HA_USER and HA_GROUP for easy maintenance.

Signed-off-by Kai Kang <[email protected]>
Signed-off-by Jackie Huang <[email protected]>
---
 .../recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +11 -3
index b5cf997..783469d 100644
@@ -27,18 +27,26 @@ inherit autotools useradd pkgconfig systemd
 SYSTEMD_SERVICE_${PN} = "logd.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
+HA_USER = "hacluster"
+HA_GROUP = "haclient"
+
 S = "${WORKDIR}/Reusable-Cluster-Components-glue--glue-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,systemd"
 
-EXTRA_OECONF = "--with-daemon-user=hacluster --with-daemon-group=haclient --disable-fatal-warnings"
+EXTRA_OECONF = "--with-daemon-user=${HA_USER} \
+                --with-daemon-group=${HA_GROUP} \
+                --disable-fatal-warnings \
+               "
 
 CACHED_CONFIGUREVARS="ac_cv_path_XML2CONFIG=0"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat -g haclient -r hacluster"
-GROUPADD_PARAM_${PN} = "-r haclient"
+USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER} \
+                       -g ${HA_GROUP} -r -s ${sbindir}/nologin -c 'cluster user' ${HA_USER} \
+                      "
+GROUPADD_PARAM_${PN} = "-r ${HA_GROUP}"
 
 do_configure_prepend() {
     ln -sf ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml2/libxml ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml
Signature · 1 line
2.11.0