Skip to contentSkip to conversation

cluster: fix SRC_URI and depends

PATCH New Armin Kuster 1 participant 3 messages May 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 cluster: fix SRC_URI and depends

corosync 1.x have removed from meta-cgl, and use corosync under meta-networking.

corosync 2.x can replace corosync 1.x + openais (in meta-cgl), so remove depend on openais

---
 meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb +2 -2
index 1c6e353..34076d3 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Red Hat Cluster"
 SECTION = "libs"
 HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage"
 
-SRC_URI = "https://fedorahosted.org/releases/c/l/cluster/${BP}.tar.xz \
+SRC_URI = "https://releases.pagure.org/linux-cluster/cluster/${BP}.tar.xz \
            file://0001-Fix-the-kernel-source-patch.patch"
 
 
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://doc/README.licence;md5=ee8ae43af5ea09f12ca7f7a649764c
 
 PR = "r1"
 
-DEPENDS = "corosync dbus openldap openais libxml2 ncurses perl zlib"
+DEPENDS = "corosync dbus openldap libxml2 ncurses perl zlib"
 
 FILES_${PN} += "/lib/udev/rules.d/51-dlm.rules \
     ${localstatedir}/run "
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/3 openais: remove as corosync 2.x replaces functionality

corosync 2.x can replace corosync 1.x + openais.

openais is no longer maintainted and shutdown.
https://github.com/corosync/openais/commit/f2bc4445a7c4ba5d17a218af855dc19d55ed2803

---
 .../openais/files/build-cleanup-configure-ac.patch | 41 -----------------
 .../openais/files/fix-lcrso-linkage.patch          | 21 ---------
 .../openais/files/openais-fix-bash.patch           | 10 ----
 .../files/openais-fix-corosync-not-quit.patch      | 53 ----------------------
 .../openais/files/openais-fix-init-script.patch    | 42 -----------------
 .../files/openais-fix-resource-cleanup-entry.patch | 37 ---------------
 .../openais-saTmrTimerReschedule-test-error.patch  | 50 --------------------
 .../recipes-cgl/openais/files/openais.service      | 14 ------
 .../recipes-cgl/openais/openais_1.1.4.bb           | 35 --------------
 9 files changed, 303 deletions(-)
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/build-cleanup-configure-ac.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/fix-lcrso-linkage.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais-fix-bash.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais-fix-corosync-not-quit.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais-fix-init-script.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais-fix-resource-cleanup-entry.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais-saTmrTimerReschedule-test-error.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais.service
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
meta-cgl-common/recipes-cgl/openais/files/build-cleanup-configure-ac.patch deleted +0 -41
deleted file mode 100644
index 48284ad..0000000
@@ -1,41 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2014-07-15 16:23:11.852805276 +0200
-+++ b/configure.ac	2014-07-15 16:36:00.483752038 +0200
-@@ -48,6 +48,7 @@
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
-+AC_PROG_SED
- AC_CHECK_PROGS([GROFF], [groff])
- 
- # Checks for libraries.
-@@ -66,7 +67,7 @@
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h \
- 		  stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h \
- 		  sys/time.h syslog.h unistd.h sys/types.h getopt.h malloc.h \
--		  sys/sockio.h])
-+          sys/sockio.h utmpx.h ifaddrs.h stddef.h sys/file.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-@@ -78,7 +79,6 @@
- AC_TYPE_INT8_T
- AC_TYPE_SIZE_T
- AC_TYPE_SSIZE_T
--AC_HEADER_TIME
- AC_TYPE_UINT16_T
- AC_TYPE_UINT32_T
- AC_TYPE_UINT64_T
-@@ -88,11 +88,11 @@
- # Checks for library functions.
- AC_FUNC_CLOSEDIR_VOID
- AC_FUNC_ERROR_AT_LINE
--AC_REPLACE_FNMATCH
- AC_FUNC_FORK
- AC_PROG_GCC_TRADITIONAL
- AC_FUNC_MALLOC
- AC_FUNC_MEMCMP
-+AC_FUNC_MMAP
- AC_FUNC_REALLOC
- AC_FUNC_SELECT_ARGTYPES
- AC_TYPE_SIGNAL
meta-cgl-common/recipes-cgl/openais/files/fix-lcrso-linkage.patch deleted +0 -21
deleted file mode 100644
index 9acfc20..0000000
@@ -1,21 +0,0 @@
-Index: openais-1.1.2/services/Makefile.am
-===================================================================
---- openais-1.1.2.orig/services/Makefile.am	2010-03-22 23:00:09.000000000 +0300
-+++ openais-1.1.2/services/Makefile.am	2010-03-22 22:59:51.000000000 +0300
-@@ -78,13 +78,13 @@
- 
- else
- service_amf.lcrso: $(AMF_OBJECTS)
--	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
- 
- service_%.lcrso: %.o
--	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
- 
- %.lcrso: %.o
--	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
- endif
- 
- %.o: %.c
meta-cgl-common/recipes-cgl/openais/files/openais-fix-bash.patch deleted +0 -10
deleted file mode 100644
index ede77e8..0000000
@@ -1,10 +0,0 @@
-Index: openais-1.1.3/init/generic.in
-===================================================================
---- openais-1.1.3.orig/init/generic.in
-+++ openais-1.1.3/init/generic.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # Authors:
- #  Andrew Beekhof <[email protected]>
meta-cgl-common/recipes-cgl/openais/files/openais-fix-corosync-not-quit.patch deleted +0 -53

53 lines not on this page · raw message

meta-cgl-common/recipes-cgl/openais/files/openais-fix-init-script.patch deleted +0 -42

42 lines not on this page · raw message

meta-cgl-common/recipes-cgl/openais/files/openais-fix-resource-cleanup-entry.patch deleted +0 -37
deleted file mode 100644
index 55313ce..0000000
@@ -1,37 +0,0 @@
-commit f70bea251f21a8bd646e59b34e6f74f6ee3fe29b
-Author: yanjun.zhu <[email protected]>
-Date:   Tue Mar 19 12:23:55 2013 +0800
-
-    openais: remove cleanup entry from openais
-
-    message_handler_req_exec_lck_resourceclose is to remove cleanup
-    entry from corosync. Now this job is done by pacemaker. So remove
-    this feature from openais.
-
-    Upstream-Status: Pending
-
-    Signed-off-by: yanjun.zhu <[email protected]>
-
-diff -urpN a/services/lck.c b/services/lck.c
---- a/services/lck.c
-+++ b/services/lck.c
-@@ -2304,17 +2304,9 @@ error_exit:
- 
- 		if (error == SA_AIS_OK) {
- 			/*
--			 * Remove the cleanup entry for this resource.
-+			 * cleanup entry for this resource can not be removed.
-+			 * This will be done by pacemaker.
- 			 */
--			cleanup = lck_resource_cleanup_find (
--				req_exec_lck_resourceclose->source.conn,
--				&req_exec_lck_resourceclose->resource_name);
--
--			if (cleanup != NULL) {
--				list_del (&cleanup->cleanup_list);
--				free (cleanup);
--			}
--
- 			hdb_handle_put (&resource_hdb, req_exec_lck_resourceclose->resource_id);
- 			hdb_handle_destroy (&resource_hdb, req_exec_lck_resourceclose->resource_id);
- 		}
meta-cgl-common/recipes-cgl/openais/files/openais-saTmrTimerReschedule-test-error.patch deleted +0 -50

50 lines not on this page · raw message

meta-cgl-common/recipes-cgl/openais/files/openais.service deleted +0 -14
deleted file mode 100644
index 230e4bb..0000000
@@ -1,14 +0,0 @@
-[Unit]
-Description=OpenAIS Cluster Framework
-ConditionKernelCommandLine=!nocluster
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-ExecStart=@DATADIR@/openais/openais start
-ExecStop=@DATADIR@/openais/openais stop
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb deleted +0 -35
deleted file mode 100644
index cdf1454..0000000
@@ -1,35 +0,0 @@
-DESCRIPTION = "Implementation of the Service Availability Forum Application Interface Specification (AIS)"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4cb00dd52a063edbece6ae248a2ba663"
-DEPENDS = "cluster-glue corosync"
-
-
-SRC_URI = " \
-    http://tux.rainside.sk/gentoo/distfiles/openais-${PV}.tar.gz \
-    file://fix-lcrso-linkage.patch \
-    file://build-cleanup-configure-ac.patch \
-    file://openais-fix-bash.patch \
-    file://openais-fix-init-script.patch \
-    file://openais-saTmrTimerReschedule-test-error.patch \
-    file://openais-fix-corosync-not-quit.patch \
-    file://openais-fix-resource-cleanup-entry.patch \
-    file://openais.service \
-    "
-
-SRC_URI[md5sum] = "e500ad3c49fdc45d8653f864e80ed82c"
-SRC_URI[sha256sum] = "974b4959f3c401c16156dab31e65a6d45bbf84dd85a88c2a362712e738c06934"
-
-inherit autotools pkgconfig systemd
-
-SYSTEMD_SERVICE_${PN} = "openais.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-do_install_append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -D -m 0755 ${D}${sysconfdir}/init.d/openais ${D}${datadir}/${BPN}/openais
-        install -D -m 0644 ${WORKDIR}/openais.service ${D}${systemd_system_unitdir}/openais.service
-        sed -i -e 's,@DATADIR@,${datadir},g' ${D}${systemd_system_unitdir}/openais.service
-    fi
-}
-
-FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug"
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/3 packagegroup-cgl-middleware: remove openais

In reply to Armin Kuster
---
 meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb | 1 -
 1 file changed, 1 deletion(-)
meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb +0 -1
index cd97fec..6ec68c4 100644
@@ -43,7 +43,6 @@ RDEPENDS_packagegroup-cgl-middleware = "\
     vlan \
     corosync \
  ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "iscsi-initiator-utils", "",d)} \
-    openais \
     openipmi \
     openhpi \
     pacemaker \
Signature · 1 line
2.7.4