Skip to content

Commit 667dad1

Browse files
bradh352bradh352
committed
IGNORE THIS COMMIT: merge libyang3 step 7 (PR sonic-net#21790)
1 parent 8b57b93 commit 667dad1

21 files changed

+5
-530
lines changed

‎.github/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
# yang
6565
/src/sonic-yang-models/ @praveen-li @dgsudharsan @rathnasabapathyv @venkatmahalingam @qiluo-msft
6666
/src/sonic-yang-mgmt/ @sonic-net/sonic-management
67-
/src/libyang/ @sonic-net/sonic-management
6867
/src/libyang3/ @sonic-net/sonic-management
6968
/src/libyang3-py3/ @sonic-net/sonic-management
7069

‎files/build_templates/sonic_debian_extension.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
162162
fi
163163

164164
# Install sonic-yang-models Python 3 package, install dependencies
165-
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libyang_*.deb $debs_path/libyang-cpp_*.deb $debs_path/python3-yang_*.deb $debs_path/libyang3_*.deb $debs_path/python3-libyang_*.deb || \
165+
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libyang3_*.deb $debs_path/python3-libyang_*.deb || \
166166
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
167167
SONIC_YANG_MODEL_PY3_WHEEL_NAME=$(basename {{sonic_yang_models_py3_wheel_path}})
168168
sudo cp {{sonic_yang_models_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_YANG_MODEL_PY3_WHEEL_NAME

‎platform/vs/docker-sonic-vs.mk

-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SYNCD_VS) \
77
$(LIBTEAMDCTL) \
88
$(LIBTEAM_UTILS) \
99
$(SONIC_DEVICE_DATA) \
10-
$(LIBYANG) \
11-
$(LIBYANG_CPP) \
12-
$(LIBYANG_PY3) \
1310
$(LIBYANG3) \
1411
$(LIBYANG3_PY3) \
1512
$(SONIC_UTILITIES_DATA) \

‎rules/docker-bmp.mk

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ $(DOCKER_BMP)_PYTHON_WHEELS = $(SONIC_BMPCFGD)
1313
$(DOCKER_BMP)_INSTALL_DEBS = $(LIBSWSSCOMMON) \
1414
$(SONIC_BMPD) \
1515
$(PYTHON3_SWSSCOMMON) \
16-
$(LIBYANG_PY3) \
1716
$(LIBYANG3_PY3)
1817

1918
$(DOCKER_BMP)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)

‎rules/docker-config-engine-bookworm.mk

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BOOKWORM = docker-config-engine-bookworm.gz
44
$(DOCKER_CONFIG_ENGINE_BOOKWORM)_PATH = $(DOCKERS_PATH)/docker-config-engine-bookworm
55

66
$(DOCKER_CONFIG_ENGINE_BOOKWORM)_DEPENDS += $(LIBSWSSCOMMON) \
7-
$(LIBYANG) \
8-
$(LIBYANG_CPP) \
9-
$(LIBYANG_PY3) \
107
$(LIBYANG3) \
118
$(LIBYANG3_PY3) \
129
$(PYTHON3_SWSSCOMMON) \

‎rules/docker-config-engine-bullseye.mk

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BULLSEYE = docker-config-engine-bullseye.gz
44
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_PATH = $(DOCKERS_PATH)/docker-config-engine-bullseye
55

66
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \
7-
$(LIBYANG) \
8-
$(LIBYANG_CPP) \
9-
$(LIBYANG_PY3) \
107
$(LIBYANG3) \
118
$(LIBYANG3_PY3) \
129
$(PYTHON3_SWSSCOMMON) \

‎rules/docker-config-engine-buster.mk

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BUSTER = docker-config-engine-buster.gz
44
$(DOCKER_CONFIG_ENGINE_BUSTER)_PATH = $(DOCKERS_PATH)/docker-config-engine-buster
55

66
$(DOCKER_CONFIG_ENGINE_BUSTER)_DEPENDS += $(LIBSWSSCOMMON) \
7-
$(LIBYANG) \
8-
$(LIBYANG_CPP) \
9-
$(LIBYANG_PY3) \
107
$(LIBYANG3) \
118
$(LIBYANG3_PY3) \
129
$(PYTHON3_SWSSCOMMON) \

‎rules/docker-macsec.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $(DOCKER_MACSEC)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_IMAGE_
1515
$(DOCKER_MACSEC)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
1616

1717
$(DOCKER_MACSEC)_INSTALL_PYTHON_WHEELS = $(SONIC_UTILITIES_PY3)
18-
$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3) $(LIBYANG3_PY3)
18+
$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG3_PY3)
1919

2020
SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC)
2121
SONIC_BOOKWORM_DOCKERS += $(DOCKER_MACSEC)

‎rules/libyang.dep

-10
This file was deleted.

‎rules/libyang.mk

-35
This file was deleted.

‎rules/sonic-utilities.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
1616
$(SONIC_PLATFORM_COMMON_PY3) \
1717
$(SONIC_YANG_MGMT_PY3) \
1818
$(SONIC_YANG_MODELS_PY3)
19-
$(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG) \
20-
$(LIBYANG_CPP) \
21-
$(LIBYANG_PY3) \
22-
$(LIBYANG3) \
19+
$(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG3) \
2320
$(LIBYANG3_PY3) \
2421
$(LIBSWSSCOMMON) \
2522
$(PYTHON3_SWSSCOMMON)

‎rules/sonic_bgpcfgd.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ $(SONIC_BGPCFGD)_SRC_PATH = $(SRC_PATH)/sonic-bgpcfgd
1010
$(SONIC_BGPCFGD)_DEPENDS += $(SONIC_CONFIG_ENGINE_PY3) \
1111
$(SONIC_YANG_MGMT_PY3) \
1212
$(SONIC_YANG_MODELS_PY3)
13-
$(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG) \
14-
$(LIBYANG_CPP) \
15-
$(LIBYANG_PY3) \
16-
$(LIBYANG3) \
13+
$(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG3) \
1714
$(LIBYANG3_PY3) \
1815
$(PYTHON3_SWSSCOMMON)
1916
$(SONIC_BGPCFGD)_PYTHON_VERSION = 3

‎slave.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1733,4 +1733,4 @@ jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \
17331733

17341734
## To build some commonly used libs. Some submodules depend on these libs.
17351735
## It is used in component pipelines. For example: swss needs libnl, libyang
1736-
lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG) $(LIBYANG3) $(PROTOBUF) $(LIB_SONIC_DASH_API))
1736+
lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG3) $(PROTOBUF) $(LIB_SONIC_DASH_API))

‎src/libyang/.gitignore

-3
This file was deleted.

‎src/libyang/Makefile

-27
This file was deleted.

0 commit comments

Comments
 (0)