diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-protocols/frr')
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch | 34 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.1.1.bb (renamed from meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.0.bb) | 5 |
2 files changed, 2 insertions, 37 deletions
diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch deleted file mode 100644 index 8c83d5c8eb..0000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 15 Mar 2024 14:34:06 -0700 -Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g. - musl musl only provides POSIX version of basename and it has also removed - providing it via string.h header [1] which now results in compile errors with - newer compilers e.g. clang-18 - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - zebra/zebra_netns_notify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c -index 1bb1292e34..d55df2f62d 100644 ---- a/zebra/zebra_netns_notify.c -+++ b/zebra/zebra_netns_notify.c -@@ -41,6 +41,10 @@ - #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 - #define ZEBRA_NS_POLLING_MAX_RETRIES 200 - -+#if !defined(__GLIBC__) -+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) -+#endif -+ - DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); - static struct event *zebra_netns_notify_current; - --- -2.44.0 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.0.bb b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.1.1.bb index afd2c95a0e..237b52592b 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.1.1.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.1 \ file://frr.pam \ - file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ " -SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" +SRCREV = "dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" |