sanlock: upgrade 3.8.4 -> 3.8.5

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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2022-10-24 14:37:58 +08:00 committed by Khem Raj
parent 9712b6ea41
commit cc532b9d4e
2 changed files with 1 additions and 20 deletions

View File

@ -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@arm.com>
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',

View File

@ -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"