From 1ac60d39f056ff66f8ff9063e544b9e98543c981 Mon Sep 17 00:00:00 2001
From: Hasan Naqvi <56742004+hasan-brcm@users.noreply.github.com>
Date: Fri, 27 May 2022 13:49:58 -0700
Subject: [PATCH] [frr]: fix official build break (#10947)

Official build fails complaining missing below targets:
2022-05-25T10:50:38.0560306Z tar: target/debs/buster/libyang2-cpp1_2.0.112-6_amd64.deb: Cannot stat: No such file or directory
2022-05-25T10:50:38.0571392Z tar: target/debs/buster/libyang2-cpp-dev_2.0.112-6_amd64.deb: Cannot stat: No such file or directory
2022-05-25T10:50:38.0588893Z tar: target/debs/buster/libyang2-cpp1-dbgsym_2.0.112-6_amd64.deb: Cannot stat: No such file or directory
2022-05-25T10:50:38.0590887Z tar: target/debs/buster/yang-tools_2.0.112-6_all.deb: Cannot stat: No such file or directory
---
 rules/libyang2.mk | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/rules/libyang2.mk b/rules/libyang2.mk
index 1e181b2a30..ca6d611b52 100644
--- a/rules/libyang2.mk
+++ b/rules/libyang2.mk
@@ -20,19 +20,6 @@ $(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_DEV)))
 LIBYANG2_DBG = libyang2-dbgsym_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_DBG)))
 
-LIBYANG2_CPP = libyang2-cpp1_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
-$(LIBYANG2_CPP)_DEPENDS += $(LIBYANG2)
-$(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_CPP)))
-
-LIBYANG2_CPP_DEV = libyang2-cpp-dev_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_CPP_DEV)))
-
-LIBYANG2_CPP_DBG = libyang2-cpp1-dbgsym_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_CPP_DBG)))
-
-YANG_TOOLS = yang-tools_$(LIBYANG2_FULLVERSION)_all.deb
-$(YANG_TOOLS)_DEPENDS += $(LIBYANG2)
-$(eval $(call add_derived_package,$(LIBYANG2),$(YANG_TOOLS)))
 
 LIBYANG2_TOOLS = libyang2-tools_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_TOOLS)))
@@ -40,4 +27,5 @@ $(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_TOOLS)))
 LIBYANG2_TOOLS_DBG = libyang2-tools-dbgsym_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_TOOLS_DBG)))
 
-export LIBYANG2 LIBYANG2_DBG LIBYANG2_DEV LIBYANG2_CPP LIBYANG2_CPP_DEV LIBYANG2_CPP_DBG YANG_TOOLS LIBYANG2_TOOLS LIBYANG2_TOOLS_DBG
+export LIBYANG2 LIBYANG2_DBG LIBYANG2_DEV LIBYANG2_TOOLS LIBYANG2_TOOLS_DBG
+