summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch18
-rw-r--r--meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb (renamed from meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb)3
2 files changed, 1 insertions, 20 deletions
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 @@
1Switch to setuptools as distutils is deprecated.
2
3Upstream-Status: Backport [https://pagure.io/sanlock/c/75758fc10db2354dda397d3aba63c7b72a420982]
4Signed-off-by: Ross Burton <ross.burton@arm.com>
5
6diff --git a/python/setup.py b/python/setup.py
7index b3bfaf1..dfbaf21 100644
8--- a/python/setup.py
9+++ b/python/setup.py
10@@ -4,7 +4,7 @@
11 # modify, copy, or redistribute it subject to the terms and conditions
12 # of the GNU General Public License v.2.
13
14-from distutils.core import setup, Extension
15+from setuptools import setup, Extension
16
17 sanlocklib = ['sanlock']
18 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
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}"
15 15
16SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ 16SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
17 file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ 17 file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
18 file://setuptools.patch \
19 file://0001-add-missing-system-header-string.h.patch \ 18 file://0001-add-missing-system-header-string.h.patch \
20 " 19 "
21SRCREV = "a181e951376d49a82eef17920c8ebedec80b4823" 20SRCREV = "b820c63093c4ae85d7da4f719cf3026d7fca5d09"
22 21
23S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
24 23