diff mbox series

[meta-oe,07/11] libmemcached: merge inc into bb

Message ID 20241220153629.2499631-8-peter.marko@siemens.com
State Under Review
Headers show
Series upgrade recipes to solve CVEs | expand

Commit Message

Marko, Peter Dec. 20, 2024, 3:36 p.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

After removing old libmemcached recipe version, these is no reasons
anymore to have this split.
The memcached resurrected project uses cmake and different urls.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 .../libmemcached/libmemcached.inc             | 17 -----------------
 .../libmemcached/libmemcached_1.0.18.bb       | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 meta-networking/recipes-support/libmemcached/libmemcached.inc
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-networking/recipes-support/libmemcached/libmemcached.inc
deleted file mode 100644
index 319ab29ce7..0000000000
--- a/meta-networking/recipes-support/libmemcached/libmemcached.inc
+++ /dev/null
@@ -1,17 +0,0 @@ 
-DESCRIPTION = "open source C/C++ client library and tools for the memcached server"
-DEPENDS = "libevent util-linux"
-SECTION = "libdevel"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
-
-SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz"
-
-UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached"
-
-TARGET_LDFLAGS += "-luuid"
-TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
-
-inherit autotools gettext pkgconfig
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
index 56778c0483..7d18d0217d 100644
--- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
+++ b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
@@ -1,6 +1,11 @@ 
-require libmemcached.inc
+DESCRIPTION = "open source C/C++ client library and tools for the memcached server"
+DEPENDS = "libevent util-linux"
+SECTION = "libdevel"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
 
-SRC_URI += "\
+SRC_URI = "\
+           http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz \
            file://crosscompile.patch \
            file://0001-configure.ac-Do-not-configure-build-aux.patch \
            file://0001-Fix-comparison-types.patch \
@@ -8,3 +13,13 @@  SRC_URI += "\
            "
 SRC_URI[md5sum] = "b3958716b4e53ddc5992e6c49d97e819"
 SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82"
+
+UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached"
+
+TARGET_LDFLAGS += "-luuid"
+TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
+
+inherit autotools gettext pkgconfig