IGNORE THIS COMMIT: merge libyang3 step 6 (PR sonic-net#21790)

bradh352 · Feb 19, 2025 · e7a05eb · e7a05eb
1 parent 49f2d74
commit e7a05eb
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 528 deletions.
diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
@@ -7,9 +7,6 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SYNCD_VS) \
                               $(LIBTEAMDCTL) \
                               $(LIBTEAM_UTILS) \
                               $(SONIC_DEVICE_DATA) \
-                              $(LIBYANG) \
-                              $(LIBYANG_CPP) \
-                              $(LIBYANG_PY3) \
                               $(LIBYANG3) \
                               $(LIBYANG3_PY3) \
                               $(SONIC_UTILITIES_DATA) \

diff --git a/rules/docker-bmp.mk b/rules/docker-bmp.mk
@@ -13,7 +13,6 @@ $(DOCKER_BMP)_PYTHON_WHEELS = $(SONIC_BMPCFGD)
 $(DOCKER_BMP)_INSTALL_DEBS = $(LIBSWSSCOMMON) \
                              $(SONIC_BMPD) \
                              $(PYTHON3_SWSSCOMMON) \
-                             $(LIBYANG_PY3) \
                              $(LIBYANG3_PY3)
 
 $(DOCKER_BMP)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)

diff --git a/rules/docker-config-engine-bookworm.mk b/rules/docker-config-engine-bookworm.mk
@@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BOOKWORM = docker-config-engine-bookworm.gz
 $(DOCKER_CONFIG_ENGINE_BOOKWORM)_PATH = $(DOCKERS_PATH)/docker-config-engine-bookworm
 
 $(DOCKER_CONFIG_ENGINE_BOOKWORM)_DEPENDS += $(LIBSWSSCOMMON) \
-                                          $(LIBYANG) \
-                                          $(LIBYANG_CPP) \
-                                          $(LIBYANG_PY3) \
                                           $(LIBYANG3) \
                                           $(LIBYANG3_PY3) \
                                           $(PYTHON3_SWSSCOMMON) \

diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk
@@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BULLSEYE = docker-config-engine-bullseye.gz
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_PATH = $(DOCKERS_PATH)/docker-config-engine-bullseye
 
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \
-                                          $(LIBYANG) \
-                                          $(LIBYANG_CPP) \
-                                          $(LIBYANG_PY3) \
                                           $(LIBYANG3) \
                                           $(LIBYANG3_PY3) \
                                           $(PYTHON3_SWSSCOMMON) \

diff --git a/rules/docker-config-engine-buster.mk b/rules/docker-config-engine-buster.mk
@@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BUSTER = docker-config-engine-buster.gz
 $(DOCKER_CONFIG_ENGINE_BUSTER)_PATH = $(DOCKERS_PATH)/docker-config-engine-buster
 
 $(DOCKER_CONFIG_ENGINE_BUSTER)_DEPENDS += $(LIBSWSSCOMMON) \
-                                          $(LIBYANG) \
-                                          $(LIBYANG_CPP) \
-                                          $(LIBYANG_PY3) \
                                           $(LIBYANG3) \
                                           $(LIBYANG3_PY3) \
                                           $(PYTHON3_SWSSCOMMON) \

diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk
@@ -15,7 +15,7 @@ $(DOCKER_MACSEC)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_IMAGE_
 $(DOCKER_MACSEC)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
 
 $(DOCKER_MACSEC)_INSTALL_PYTHON_WHEELS = $(SONIC_UTILITIES_PY3)
-$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3) $(LIBYANG3_PY3)
+$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG3_PY3)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC)
 SONIC_BOOKWORM_DOCKERS += $(DOCKER_MACSEC)

diff --git a/rules/libyang.dep b/rules/libyang.dep
diff --git a/rules/libyang.mk b/rules/libyang.mk
diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk
@@ -16,10 +16,7 @@ $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
                                   $(SONIC_PLATFORM_COMMON_PY3) \
                                   $(SONIC_YANG_MGMT_PY3) \
                                   $(SONIC_YANG_MODELS_PY3)
-$(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG) \
-                                      $(LIBYANG_CPP) \
-                                      $(LIBYANG_PY3) \
-                                      $(LIBYANG3) \
+$(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG3) \
                                       $(LIBYANG3_PY3) \
                                       $(LIBSWSSCOMMON) \
                                       $(PYTHON3_SWSSCOMMON)

diff --git a/rules/sonic_bgpcfgd.mk b/rules/sonic_bgpcfgd.mk
@@ -10,10 +10,7 @@ $(SONIC_BGPCFGD)_SRC_PATH = $(SRC_PATH)/sonic-bgpcfgd
 $(SONIC_BGPCFGD)_DEPENDS += $(SONIC_CONFIG_ENGINE_PY3) \
                             $(SONIC_YANG_MGMT_PY3) \
                             $(SONIC_YANG_MODELS_PY3)
-$(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG) \
-                                 $(LIBYANG_CPP) \
-                                 $(LIBYANG_PY3) \
-                                 $(LIBYANG3) \
+$(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG3) \
                                  $(LIBYANG3_PY3) \
                                  $(PYTHON3_SWSSCOMMON)
 $(SONIC_BGPCFGD)_PYTHON_VERSION = 3

diff --git a/slave.mk b/slave.mk
@@ -1730,4 +1730,4 @@ jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \
 
 ## To build some commonly used libs. Some submodules depend on these libs.
 ## It is used in component pipelines. For example: swss needs libnl, libyang
-lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG) $(LIBYANG3) $(PROTOBUF) $(LIB_SONIC_DASH_API))
+lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG3) $(PROTOBUF) $(LIB_SONIC_DASH_API))
diff --git a/src/libyang/.gitignore b/src/libyang/.gitignore
diff --git a/src/libyang/Makefile b/src/libyang/Makefile
diff --git a/src/libyang/patch/debian-packaging-files.patch b/src/libyang/patch/debian-packaging-files.patch