From: Wang Mingyu <[email protected]> setuptools.patch removed since it's included in 3.8.5.
Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit cc532b9d4e0394f442cc3e3b6c7f65858a551a3c) Shortlog: python: Replace distutils with setuptools sanlock: fix memory leak of lockspace renewal_history sanlock: fix pthread_create error check Revert "sanlock: Shrink thread pool when there is no work" sanlock: fix pthread_create error paths sanlock: acquire should ignore unused options str sanlock: use helper to set max_sectors_kb Signed-off-by: Gyorgy Sarvari <[email protected]> --- .../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 <[email protected]> - -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 a59a5c41df..ce289a0d8e 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb @@ -15,9 +15,8 @@ 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 \ " -SRCREV = "a181e951376d49a82eef17920c8ebedec80b4823" +SRCREV = "b820c63093c4ae85d7da4f719cf3026d7fca5d09" S = "${WORKDIR}/git"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#123803): https://lists.openembedded.org/g/openembedded-devel/message/123803 Mute This Topic: https://lists.openembedded.org/mt/117431642/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
