From: Wang Mingyu <wangmy@...>

setuptools.patch
removed since it's included in 3.8.5.

Signed-off-by: Wang Mingyu <wangmy@...>
Signed-off-by: Khem Raj <raj.khem@...>
(cherry picked from commit cc532b9d4e0394f442cc3e3b6c7f65858a551a3c)
Signed-off-by: Armin Kuster <akuster808@...>
---
.../sanlock/sanlock/setuptools.patch | 18 ------------------
.../{sanlock_3.8.4.bb => sanlock_3.8.5.bb} | 3 +--
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch
rename meta-oe/recipes-extended/sanlock/{sanlock_3.8.4.bb => sanlock_3.8.5.bb} (95%)

diff --git a/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch b/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch
deleted file mode 100644
index c375e10f75..0000000000
--- a/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Switch to setuptools as distutils is deprecated.
-
-Upstream-Status: Backport [https://pagure.io/sanlock/c/75758fc10db2354dda397d3aba63c7b72a420982]
-Signed-off-by: Ross Burton <ross.burton@...>
-
-diff --git a/python/setup.py b/python/setup.py
-index b3bfaf1..dfbaf21 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -4,7 +4,7 @@
- # modify, copy, or redistribute it subject to the terms and conditions
- # of the GNU General Public License v.2.
-
--from distutils.core import setup, Extension
-+from setuptools import setup, Extension
-
- sanlocklib = ['sanlock']
- sanlock = Extension(name='sanlock',
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb
similarity index 95%
rename from meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb
rename to meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb
index 3b4ae318c6..c2a17d06b9 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb
@@ -15,10 +15,9 @@ PV .= "+git${SRCPV}"

SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
- file://setuptools.patch \
file://0001-add-missing-system-header-string.h.patch \
"
-SRCREV = "a181e951376d49a82eef17920c8ebedec80b4823"
+SRCREV = "b820c63093c4ae85d7da4f719cf3026d7fca5d09"

S = "${WORKDIR}/git"

--
2.25.1