Skip to contentSkip to conversation

freediameter: Upgrade to latest on master 1.5.0+

PATCH New Khem Raj 1 participant 1 message Apr 14, 2024

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 freediameter: Upgrade to latest on master 1.5.0+

This also fixes all ptests, therefore move freediameter out of PTESTS_PROBLEMS_META_NETWORKING to PTESTS_FAST_META_NETWORKING

---
 .../ptest-packagelists-meta-networking.inc    |  2 +-
 ...sctp.c-update-the-old-sctp-api-check.patch | 97 -------------------
 .../freediameter/files/run-ptest              |  6 +-
 ...iameter_1.4.0.bb => freediameter_1.5.0.bb} | 16 +--
 4 files changed, 14 insertions(+), 107 deletions(-)
 delete mode 100644 meta-networking/recipes-protocols/freediameter/files/0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch
 rename meta-networking/recipes-protocols/freediameter/{freediameter_1.4.0.bb => freediameter_1.5.0.bb} (89%)
meta-networking/conf/include/ptest-packagelists-meta-networking.inc +1 -1
index 574e3a0aa1..7ec6f9063d 100644
@@ -7,6 +7,7 @@
 # ptests which take less than ~30s each
 
 PTESTS_FAST_META_NETWORKING = "\
+    freediameter \
     geoip \
     libcoap \
     libldb \
@@ -27,7 +28,6 @@ PTESTS_SLOW_META_NETWORKING = "\
 "
 
 PTESTS_PROBLEMS_META_NETWORKING = "\
-    freediameter \
     geoip-perl \
     libtevent \
     lksctp-tools \
meta-networking/recipes-protocols/freediameter/files/0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch deleted +0 -97

97 lines not on this page · raw message

meta-networking/recipes-protocols/freediameter/files/run-ptest +5 -1
index 3c841644b7..7d0648935c 100644
@@ -7,4 +7,8 @@ if ! lsmod | grep -q sctp && ! modprobe sctp 2>/dev/null; then
 fi
 
 cmake  -E cmake_echo_color --cyan "Running tests..."
-ctest --force-new-ctest-process
+if ctest --force-new-ctest-process ; then
+        echo "PASS: freediameter"
+else
+        echo "FAIL: freediameter"
+fi
meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb renamed from meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb +8 -8
similarity index 89%
rename from meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb
rename to meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb
index 44fc46e3a8..0407384aae 100644
@@ -13,22 +13,22 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 fd_pkgname = "freeDiameter"
 
-SRC_URI = "\
-    http://www.freediameter.net/hg/${fd_pkgname}/archive/${PV}.tar.gz;downloadfilename=${fd_pkgname}-${PV}.tar.gz \
+SRCPV .= "+git"
+SRCREV = "f9f1e464e6c675d222b3be4cab9c13408d544c83"
+SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=master \
     file://Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch \
+    file://run-ptest \
     file://freediameter.service \
     file://freediameter.init \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://install_test.patch file://run-ptest file://0001-tests-use-EXTENSIONS_DIR.patch', '', d)} \
     file://freeDiameter.conf \
-    file://0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch \
+    file://install_test.patch \
+    file://0001-tests-use-EXTENSIONS_DIR.patch \
     "
 
-SRC_URI[sha256sum] = "7a537401bd110c606594b7c6be71b993f0ccc73ae151ad68040979286ba4e50e"
-
-S = "${WORKDIR}/${fd_pkgname}-${PV}"
+S = "${WORKDIR}/git"
 
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=69bdc1d97648a2d35914563fcbbb361a"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=868c059b6147748b1d621e500feeac4f"
 
 PTEST_PATH = "${libdir}/${fd_pkgname}/ptest"
 
Signature · 1 line
2.44.0