From dc3cea95eb5abbb5c216796d8d336533a7028516 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 25 May 2023 13:45:08 +0200 Subject: [PATCH 1/2] mgmtd: embed necessary YANG models MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Listing `.c` files in `$(…_OBJECTS):` does not have the desired effect. (Also CLEANFILES is not needed, yang/subdir.am already has yang/*.c in CLEANFILES anyway.) Fixes: #13600 Signed-off-by: David Lamparter --- mgmtd/subdir.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mgmtd/subdir.am b/mgmtd/subdir.am index a93f8f9441..4a4c387700 100644 --- a/mgmtd/subdir.am +++ b/mgmtd/subdir.am @@ -57,12 +57,16 @@ sbin_PROGRAMS += mgmtd/mgmtd mgmtd_mgmtd_SOURCES = \ mgmtd/mgmt_main.c \ # end +nodist_mgmtd_mgmtd_SOURCES = \ + # nothing mgmtd_mgmtd_CFLAGS = $(AM_CFLAGS) -I ./ mgmtd_mgmtd_LDADD = mgmtd/libmgmtd.a lib/libfrr.la $(LIBCAP) $(LIBM) $(LIBYANG_LIBS) $(UST_LIBS) mgmtd_mgmtd_LDADD += mgmtd/libmgmt_be_nb.la if STATICD -$(mgmtd_mgmtd_OBJECTS): yang/frr-staticd.yang.c -CLEANFILES += yang/frr-staticd.yang.c +nodist_mgmtd_mgmtd_SOURCES += \ + yang/frr-staticd.yang.c \ + yang/frr-bfdd.yang.c \ + # end nodist_mgmtd_libmgmt_be_nb_la_SOURCES += staticd/static_vty.c endif From d76e6a58e5b5529676e805c8eda1d8afda2d2155 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 25 May 2023 13:47:03 +0200 Subject: [PATCH 2/2] ripd: embed BFD YANG models The frr-ripd model has a dependency on frr-bfdd, so include it in build. Signed-off-by: David Lamparter --- ripd/subdir.am | 1 + 1 file changed, 1 insertion(+) diff --git a/ripd/subdir.am b/ripd/subdir.am index 294a05e575..c793a6d685 100644 --- a/ripd/subdir.am +++ b/ripd/subdir.am @@ -48,6 +48,7 @@ noinst_HEADERS += \ ripd_ripd_LDADD = lib/libfrr.la $(LIBCAP) nodist_ripd_ripd_SOURCES = \ yang/frr-ripd.yang.c \ + yang/frr-bfdd.yang.c \ # end ripd_ripd_snmp_la_SOURCES = ripd/rip_snmp.c