diff mbox series

[meta-networking,14/35] openlldp: upgrade 1.1.1 -> 1.2.0

Message ID 20260927105002.1832451-14-ankur.tyagi85@gmail.com
State New
Headers show
Series [meta-gnome,1/35] gimp: upgrade 3.2.4 -> 3.2.6 | expand

Commit Message

Ankur Tyagi Sept. 27, 2026, 10:49 a.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch that is merged in the upstream version.

Changelog:
https://github.com/intel/openlldp/blob/v1.2.0/ChangeLog

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...string.h-for-mem-function-prototypes.patch | 23 -------------------
 .../{openlldp_1.1.1.bb => openlldp_1.2.0.bb}  |  7 +++---
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch
 rename meta-networking/recipes-protocols/openlldp/{openlldp_1.1.1.bb => openlldp_1.2.0.bb} (86%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch b/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch
deleted file mode 100644
index b6d9cf7707..0000000000
--- a/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch
+++ /dev/null
@@ -1,23 +0,0 @@ 
-From d88aae2230683517b6d5b62cced51da81317a722 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 29 Aug 2022 22:37:14 -0700
-Subject: [PATCH] clif: Include string.h for mem* function prototypes
-
-Upstream-Status: Submitted [https://github.com/intel/openlldp/pull/86]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- clif.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/clif.c b/clif.c
-index cad6f75..0758a7e 100644
---- a/clif.c
-+++ b/clif.c
-@@ -32,6 +32,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/socket.h>
diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.2.0.bb
similarity index 86%
rename from meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb
rename to meta-networking/recipes-protocols/openlldp/openlldp_1.2.0.bb
index ad72b5cdde..7f8b56a895 100644
--- a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb
+++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.2.0.bb
@@ -11,13 +11,12 @@  inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
 
 DEPENDS = "libnl libconfig readline"
 
-SRCREV = "f1dd9eb961fab06723d2bedb2f7e2b81e45ee9ab"
-PV .= "+git"
-SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \
+SRCREV = "da26ebdc2606619aae4b231a85e5d0cc19a5efee"
+
+SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-${@oe.utils.trim_version('${PV}', 2)};tag=v${PV} \
            file://0001-Fix-musl-libc-build-issue.patch \
            file://0001-autotools-Add-include-path-to-generated-version.h.patch \
            file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \
-           file://0004-clif-Include-string.h-for-mem-function-prototypes.patch \
            "
 
 # Enable install of systemd conf files.