aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended/glusterfs
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/glusterfs')
-rw-r--r--recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch88
-rw-r--r--recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch30
-rw-r--r--recipes-extended/glusterfs/files/glusterd.service4
-rw-r--r--recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch17
-rw-r--r--recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch37
-rw-r--r--recipes-extended/glusterfs/glusterfs.inc78
-rw-r--r--recipes-extended/glusterfs/glusterfs_11.1.bb6
-rw-r--r--recipes-extended/glusterfs/glusterfs_6.1.bb6
8 files changed, 195 insertions, 71 deletions
diff --git a/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch b/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch
new file mode 100644
index 00000000..1cdccf99
--- /dev/null
+++ b/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch
@@ -0,0 +1,88 @@
+From f66bd85af09397300ad434655fc68861f48c2e3c Mon Sep 17 00:00:00 2001
+From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
+Date: Thu, 2 Jan 2020 07:46:23 -0500
+Subject: [PATCH] cli: duplicate defns of cli_default_conn_timeout and
+ cli_ten_minutes_timeout
+
+Winter is coming. So is gcc-10.
+
+Compiling with gcc-10-20191219 snapshot reveals dupe defns of
+cli_default_conn_timeout and cli_ten_minutes_timeout in
+.../cli/src/cli.[ch] due to missing extern decl.
+
+There are many changes coming in gcc-10 described in
+https://gcc.gnu.org/gcc-10/changes.html
+
+compiling cli.c with gcc-9 we see:
+ ...
+ .quad .LC88
+ .comm cli_ten_minutes_timeout,4,4
+ .comm cli_default_conn_timeout,4,4
+ .text
+ .Letext0:
+ ...
+
+and with gcc-10:
+ ...
+ .quad .LC88
+ .globl cli_ten_minutes_timeout
+ .bss
+ .align 4
+ .type cli_ten_minutes_timeout, @object
+ .size cli_ten_minutes_timeout, 4
+ cli_ten_minutes_timeout:
+ .zero 4
+ .globl cli_default_conn_timeout
+ .align 4
+ .type cli_default_conn_timeout, @object
+ .size cli_default_conn_timeout, 4
+ cli_default_conn_timeout:
+ .zero 4
+ .text
+ .Letext0:
+ ...
+
+which is reflected in the .o file as (gcc-9):
+...
+0000000000000004 C cli_ten_minutes_timeout
+0000000000000004 C cli_default_conn_timeout
+...
+
+and (gcc-10):
+...
+0000000000000020 B cli_ten_minutes_timeout
+0000000000000024 B cli_default_conn_timeout
+...
+
+See nm(1) and ld(1) for a description C (common) and B (BSS) and how
+they are treated by the linker.
+
+Note: there is still a small chance that gcc-10 will land in Fedora-32,
+despite 31 Dec. 2019 having been the deadline for that to happen.
+
+Change-Id: I54ea485736a4910254eeb21222ad263721cdef3c
+Fixes: bz#1193929
+Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
+
+Upstream-Status: Backport [https://review.gluster.org/#/c/glusterfs/+/23956/]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ cli/src/cli.c | 3 +++
+ cli/src/cli.h | 4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+Index: glusterfs-11.1/cli/src/cli.c
+===================================================================
+--- glusterfs-11.1.orig/cli/src/cli.c
++++ glusterfs-11.1/cli/src/cli.c
+@@ -65,6 +65,9 @@
+
+ extern struct rpc_clnt_program cli_prog;
+
++int cli_default_conn_timeout = 120;
++int cli_ten_minutes_timeout = 600;
++
+ static int
+ glusterfs_ctx_defaults_init(glusterfs_ctx_t *ctx)
+ {
diff --git a/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch b/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch
new file mode 100644
index 00000000..d139ea28
--- /dev/null
+++ b/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch
@@ -0,0 +1,30 @@
+From 526b64958b8aabcbad48ffb61f6855b374a68da6 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Thu, 25 Jan 2024 18:08:01 +0000
+Subject: [PATCH] configure: pass SSL_CERTS. Don't discover it
+
+Executing the ssl binary to locate the certificates doesn't work
+in our environment. Pass it to the build instead.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1cda220..fe14134 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -814,6 +814,7 @@ AS_IF([test "x$enable_fuse_notifications" != "xno"], [
+ dnl Find out OpenSSL trusted certificates path
+ AC_MSG_CHECKING([for OpenSSL trusted certificates path])
+ SSL_CERT_PATH=$(openssl version -d | sed -e 's|OPENSSLDIR: "\(.*\)".*|\1|')
++SSL_CERT_PATH="${SSL_CERTS_DIR}"
+ if test -d "${SSL_CERT_PATH}" 1>/dev/null 2>&1; then
+ AC_MSG_RESULT([$SSL_CERT_PATH])
+ AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.])
+--
+2.39.2
+
diff --git a/recipes-extended/glusterfs/files/glusterd.service b/recipes-extended/glusterfs/files/glusterd.service
index 4835c820..2219f582 100644
--- a/recipes-extended/glusterfs/files/glusterd.service
+++ b/recipes-extended/glusterfs/files/glusterd.service
@@ -4,9 +4,9 @@ After=syslog.target network.target
[Service]
Type=forking
-PIDFile=@localstatedir@/run/glusterd.pid
+PIDFile=/run/glusterd.pid
ExecStartPre=@base_bindir@/mkdir -p @localstatedir@/log/glusterfs
-ExecStart=@SBINDIR@/glusterd -p @localstatedir@/run/glusterd.pid
+ExecStart=@SBINDIR@/glusterd -p /run/glusterd.pid
[Install]
WantedBy=multi-user.target
diff --git a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch
index c8e0e7d7..7a72e9cb 100644
--- a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch
+++ b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch
@@ -24,19 +24,16 @@ Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
extras/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/extras/Makefile.am b/extras/Makefile.am
-index ff5ca9b..1f59746 100644
---- a/extras/Makefile.am
-+++ b/extras/Makefile.am
-@@ -10,7 +10,7 @@ endif
+Index: glusterfs-11.1/extras/Makefile.am
+===================================================================
+--- glusterfs-11.1.orig/extras/Makefile.am
++++ glusterfs-11.1/extras/Makefile.am
+@@ -10,7 +10,7 @@
EditorModedir = $(docdir)
EditorMode_DATA = glusterfs-mode.el glusterfs.vim
-SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \
+SUBDIRS = benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \
- $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python
+ $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python \
+ ganesha command-completion
- confdir = $(sysconfdir)/glusterfs
---
-2.8.1
-
diff --git a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch
index e8f99acc..9b807fee 100644
--- a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch
+++ b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch
@@ -26,24 +26,24 @@ Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
geo-replication/src/gsyncd.c | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index bc4cf93..d55a7b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -279,6 +279,8 @@ AC_CANONICAL_HOST
+Index: glusterfs-11.1/configure.ac
+===================================================================
+--- glusterfs-11.1.orig/configure.ac
++++ glusterfs-11.1/configure.ac
+@@ -261,6 +261,8 @@
AC_PROG_CC
AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
+ LT_INIT
+AC_SUBST(TARGET_PYTHON)
+
AC_SUBST([shrext_cmds])
AC_CHECK_PROG([RPCGEN], [rpcgen], [yes], [no])
-diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am
-index 9937a0b..07456fb 100644
---- a/geo-replication/src/Makefile.am
-+++ b/geo-replication/src/Makefile.am
-@@ -22,7 +22,8 @@ noinst_HEADERS = procdiggy.h
+Index: glusterfs-11.1/geo-replication/src/Makefile.am
+===================================================================
+--- glusterfs-11.1.orig/geo-replication/src/Makefile.am
++++ glusterfs-11.1/geo-replication/src/Makefile.am
+@@ -22,7 +22,8 @@
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \
-DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \
@@ -53,11 +53,11 @@ index 9937a0b..07456fb 100644
AM_CFLAGS = -Wall $(GF_CFLAGS)
-diff --git a/geo-replication/src/gsyncd.c b/geo-replication/src/gsyncd.c
-index 77af662..8cd0551 100644
---- a/geo-replication/src/gsyncd.c
-+++ b/geo-replication/src/gsyncd.c
-@@ -118,9 +118,9 @@ invoke_gsyncd(int argc, char **argv)
+Index: glusterfs-11.1/geo-replication/src/gsyncd.c
+===================================================================
+--- glusterfs-11.1.orig/geo-replication/src/gsyncd.c
++++ glusterfs-11.1/geo-replication/src/gsyncd.c
+@@ -115,9 +115,9 @@
goto error;
j = 0;
@@ -69,7 +69,7 @@ index 77af662..8cd0551 100644
nargv[j++] = python;
nargv[j++] = GSYNCD_PREFIX "/python/syncdaemon/" GSYNCD_PY;
for (i = 1; i < argc; i++)
-@@ -170,7 +170,7 @@ find_gsyncd(pid_t pid, pid_t ppid, char *name, void *data)
+@@ -167,7 +167,7 @@
ret = 0;
switch (zeros) {
case 2:
@@ -78,6 +78,3 @@ index 77af662..8cd0551 100644
strcmp(basename(buf + strlen(buf) + 1), GSYNCD_PY)) == 0) {
ret = 1;
break;
---
-2.17.1
-
diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 1ac5123e..c5f21c70 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -19,17 +19,21 @@ SRC_URI += "file://glusterd.init \
file://libglusterfs-Don-t-link-against-libfl.patch \
file://glusterd-change-port-range.patch \
file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \
+ file://0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch \
+ file://0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch \
"
-LICENSE = "(LGPLv3+ | GPLv2) & GPLv3+ & LGPLv3+ & GPLv2+ & LGPLv2+ & LGPLv2.1+ & Apache-2.0"
+LICENSE = "(LGPL-3.0-or-later | GPL-2.0-only) & GPL-3.0-or-later & LGPL-3.0-or-later & GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later & Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING-GPLV2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING-LGPLV3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://contrib/fuse-util/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-inherit autotools pkgconfig distutils-base update-rc.d systemd
+inherit autotools pkgconfig setuptools3-base update-rc.d systemd
+inherit python3-dir
+inherit bash-completion
-DEPENDS += "bison-native flex-native python3-native fuse libaio libtirpc libxml2 ncurses \
- openssl python3 readline zlib liburcu util-linux glib-2.0 acl"
+DEPENDS += "openssl-native bison-native flex-native python3-native fuse libaio libtirpc libxml2 ncurses \
+ openssl python3 readline zlib liburcu util-linux glib-2.0 acl ca-certificates ca-certificates-native liburing"
# rpc now comes from libtirpc instead of glibc
#
@@ -39,27 +43,31 @@ LDFLAGS += " -ltirpc"
EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \
ac_cv_file__etc_SuSE_release=no \
ac_cv_file__etc_redhat_release=no \
- ac_cv_file__etc_centos_release=no \
+ ac_cv_file__etc_centos_release=no \
+ ac_cv_file__etc_os_release=no \
--with-mountutildir=${sbindir} \
--disable-fusermount \
- TARGET_PYTHON=${bindir}/python \
- PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
+ TARGET_PYTHON=${bindir}/python3 \
+ PYTHON=${PYTHON} \
+ SSL_CERTS_DIR="${sysconfdir_native}/ssl/certs" \
BUILD_PYTHON_INC=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
BUILD_PYTHON_LIB=python${PYTHON_BASEVERSION} \
BUILD_PYTHON_SITE_PACKAGES=${PYTHON_SITEPACKAGES_DIR} \
"
-PACKAGECONFIG ??= "georeplication libibverbs"
-PACKAGECONFIG_remove_mipsarch = "libibverbs"
-PACKAGECONFIG_remove_arm = "libibverbs"
+PACKAGECONFIG ??= "georeplication"
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync"
-PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm,"
+# PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm,"
PACKAGECONFIG[ocf] = "--with-ocf,--without-ocf,,"
PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
+PACKAGECONFIG[tcmalloc] = ",--without-tcmalloc,,"
-do_install_append() {
+# TODO: packageconfig for:
+# --disable-linux-io_uring
+
+do_install:append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/glusterd.init \
${D}${sysconfdir}/init.d/glusterd
@@ -106,29 +114,29 @@ INITSCRIPT_NAME = "glusterd"
INITSCRIPT_PARAMS = "start 20 5 3 2 . stop 80 0 1 6 ."
SYSTEMD_PACKAGES = "glusterfs-server"
-SYSTEMD_SERVICE_${PN} = "glusterd.service"
+SYSTEMD_SERVICE:${PN} = "glusterd.service"
SYSTEMD_AUTO_ENABLE = "disable"
# Allow plug-in symlinks.
-INSANE_SKIP_${PN} += "dev-so"
-INSANE_SKIP_${PN}-rdma += "dev-so"
-INSANE_SKIP_${PN}-fuse += "dev-so"
-INSANE_SKIP_${PN}-server += "dev-so"
+INSANE_SKIP:${PN} += "dev-so"
+INSANE_SKIP:${PN}-rdma += "dev-so"
+INSANE_SKIP:${PN}-fuse += "dev-so"
+INSANE_SKIP:${PN}-server += "dev-so"
PACKAGES += "${PN}-rdma ${PN}-geo-replication ${PN}-fuse ${PN}-server \
${PN}-api ${PN}-ocf"
-RDEPENDS_${PN} += "python3-core python-json python-ctypes bash"
-RDEPENDS_${PN}-ocf += "bash"
-RDEPENDS_${PN}-server += "bash"
-RDEPENDS_${PN}-geo-replication += "python3-core bash"
+RDEPENDS:${PN} += "python3-core python3-json python3-ctypes bash"
+RDEPENDS:${PN}-ocf += "bash"
+RDEPENDS:${PN}-server += "bash"
+RDEPENDS:${PN}-geo-replication += "python3-core bash"
-FILES_${PN}-dbg += "${libdir}/glusterfs/${PV}/*/.debug \
+FILES:${PN}-dbg += "${libdir}/glusterfs/${PV}/*/.debug \
${libdir}/glusterfs/${PV}/*/*/.debug \
${libdir}/glusterfs/${PV}/*/*/*/.debug \
${libexecdir}/glusterfs/.debug"
-FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \
+FILES:${PN} = "${libdir}/glusterfs/${PV}/auth \
${libdir}/glusterfs/${PV}/rpc-transport/socket* \
${libdir}/glusterfs/${PV}/xlator/cluster \
${libdir}/glusterfs/${PV}/xlator/debug \
@@ -138,7 +146,7 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \
${libdir}/glusterfs/${PV}/xlator/protocol/client* \
${libdir}/glusterfs/${PV}/xlator/system \
${libdir}/glusterfs/${PV}/xlator/testing \
- ${libdir}/glusterfs/${PV}/xlator/playground \
+ ${libdir}/glusterfs/${PV}/xlator/playground \
${libdir}/glusterfs/${PV}/xlator/meta.so \
${libdir}/glusterfs/ganesha \
${libdir}/glusterfs/glusterfs/glusterfind \
@@ -151,7 +159,7 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \
${libdir}/libgfdb.so.* \
${libdir}/libgfxdr.so.* \
${libdir}/python*/site-packages \
- ${libexecdir}/glusterfs/gfevents \
+ ${libexecdir}/glusterfs/gfevents \
${libexecdir}/glusterfs/events \
${libexecdir}/glusterfs/glusterfind \
${libexecdir}/glusterfs/gfind_missing_files \
@@ -161,7 +169,10 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \
${libexecdir}/glusterfs/peer_mountbroker \
${libexecdir}/glusterfs/peer_gsec_create \
${libexecdir}/glusterfs/gverify.sh \
+ ${libexecdir}/glusterfs/glfsheal \
+ ${libexecdir}/glusterfs/scripts/ \
${libexecdir}/glusterfs/peer_add_secret_pub \
+ ${libexecdir}/ganesha/ \
${localstatedir} \
${sysconfdir}/default/volatiles \
${sbindir}/glusterfs \
@@ -173,30 +184,31 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \
${sbindir}/glustereventsd \
${sbindir}/gf_attach \
${sbindir}/*.py \
- ${sbindir}/gluster-setgfid2path \
+ ${sbindir}/gluster-setgfid2path \
${bindir}/ \
${sysconfdir}/glusterfs \
${sysconfdir}/ganesha \
${datadir}/glusterfs/* \
"
-FILES_${PN}-rdma = "${libdir}/glusterfs/${PV}/rpc-transport/rdma*"
+FILES:${PN}-rdma = "${libdir}/glusterfs/${PV}/rpc-transport/rdma*"
-FILES_${PN}-geo-replication = "${libexecdir}/glusterfs/gsyncd \
+FILES:${PN}-geo-replication = "${libexecdir}/glusterfs/gsyncd \
${libexecdir}/glusterfs/python/syncdaemon \
${libexecdir}/glusterfs/peer_georep-sshkey.py \
${libexecdir}/glusterfs/set_geo_rep_pem_keys.sh \
${sbindir}/gluster-georep-sshkey"
-FILES_${PN}-fuse = "${bindir}/fusermount-glusterfs \
+FILES:${PN}-fuse = "${bindir}/fusermount-glusterfs \
${libdir}/glusterfs/${PV}/xlator/mount \
${sbindir}/mount.glusterfs \
${base_sbindir}/mount.glusterfs"
-FILES_${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \
+FILES:${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \
${libdir}/glusterfs/${PV}/xlator/nfs \
${libdir}/glusterfs/${PV}/xlator/protocol/server* \
${libdir}/glusterfs/${PV}/xlator/storage \
+ ${libdir}/glusterfs/${PV}/cloudsync-plugins/ \
${sbindir}/gluster \
${sbindir}/glusterd \
${sysconfdir}/glusterfs/glusterd.vol \
@@ -206,11 +218,11 @@ FILES_${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \
${systemd_system_unitdir}"
# Note: Debian package renaming produces libgfapi[0-9]+-*.*.rpm.
-FILES_${PN}-api = "${libdir}/libgfapi.so.*"
+FILES:${PN}-api = "${libdir}/libgfapi.so.*"
-FILES_${PN}-ocf = "${prefix}/lib/ocf"
+FILES:${PN}-ocf = "${prefix}/lib/ocf"
-pkg_postinst_${PN}() {
+pkg_postinst:${PN}() {
if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ]; then
/etc/init.d/populate-volatile.sh update
fi
diff --git a/recipes-extended/glusterfs/glusterfs_11.1.bb b/recipes-extended/glusterfs/glusterfs_11.1.bb
new file mode 100644
index 00000000..224fe187
--- /dev/null
+++ b/recipes-extended/glusterfs/glusterfs_11.1.bb
@@ -0,0 +1,6 @@
+SRC_URI = "https://bits.gluster.org/pub/gluster/glusterfs/src/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "7e290a50026752f435f694651687e0f2"
+SRC_URI[sha256sum] = "6a31b8450d02cd12f47f4571c031e9d6b8705279a0e8970ae9a05e1c87dffb76"
+
+require glusterfs.inc
diff --git a/recipes-extended/glusterfs/glusterfs_6.1.bb b/recipes-extended/glusterfs/glusterfs_6.1.bb
deleted file mode 100644
index e109c080..00000000
--- a/recipes-extended/glusterfs/glusterfs_6.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC_URI = "https://bits.gluster.org/pub/gluster/glusterfs/src/${BPN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "18967c357204d4cbdd9c1731508862c6"
-SRC_URI[sha256sum] = "32ac75c883cdf18e081893ce5210b2331f1ee9ba25e3f3f56136d9878b194dc7"
-
-require glusterfs.inc