Skip to content

Commit 43b2e52

Browse files
bradh352bradh352
committed
IGNORE THIS COMMIT: merge libyang3 step 4 (PR sonic-net#21718)
1 parent 80c65f8 commit 43b2e52

11 files changed

+24
-11
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SYNCD_VS) \
1010
$(LIBYANG) \
1111
$(LIBYANG_CPP) \
1212
$(LIBYANG_PY3) \
13+
$(LIBYANG3) \
14+
$(LIBYANG3_PY3) \
1315
$(SONIC_UTILITIES_DATA) \
1416
$(SONIC_HOST_SERVICES_DATA)
1517

‎rules/docker-bmp.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ $(DOCKER_BMP)_PYTHON_WHEELS = $(SONIC_BMPCFGD)
1313
$(DOCKER_BMP)_INSTALL_DEBS = $(LIBSWSSCOMMON) \
1414
$(SONIC_BMPD) \
1515
$(PYTHON3_SWSSCOMMON) \
16-
$(LIBYANG_PY3)
16+
$(LIBYANG_PY3) \
17+
$(LIBYANG3_PY3)
1718

1819
$(DOCKER_BMP)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
1920

@@ -43,4 +44,4 @@ $(DOCKER_BMP)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro
4344
$(DOCKER_BMP)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw
4445

4546
$(DOCKER_BMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
46-
$(DOCKER_BMP)_BASE_IMAGE_FILES += monit_bmp:/etc/monit/conf.d
47+
$(DOCKER_BMP)_BASE_IMAGE_FILES += monit_bmp:/etc/monit/conf.d

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ $(DOCKER_CONFIG_ENGINE_BOOKWORM)_DEPENDS += $(LIBSWSSCOMMON) \
77
$(LIBYANG) \
88
$(LIBYANG_CPP) \
99
$(LIBYANG_PY3) \
10+
$(LIBYANG3) \
11+
$(LIBYANG3_PY3) \
1012
$(PYTHON3_SWSSCOMMON) \
1113
$(SONIC_DB_CLI) \
1214
$(SONIC_EVENTD)

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \
77
$(LIBYANG) \
88
$(LIBYANG_CPP) \
99
$(LIBYANG_PY3) \
10+
$(LIBYANG3) \
11+
$(LIBYANG3_PY3) \
1012
$(PYTHON3_SWSSCOMMON) \
1113
$(SONIC_DB_CLI) \
1214
$(SONIC_EVENTD)

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ $(DOCKER_CONFIG_ENGINE_BUSTER)_DEPENDS += $(LIBSWSSCOMMON) \
77
$(LIBYANG) \
88
$(LIBYANG_CPP) \
99
$(LIBYANG_PY3) \
10+
$(LIBYANG3) \
11+
$(LIBYANG3_PY3) \
1012
$(PYTHON3_SWSSCOMMON) \
1113
$(SONIC_DB_CLI)
1214
$(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \

‎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)
18+
$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3) $(LIBYANG3_PY3)
1919

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

‎rules/sonic-config.mk

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ $(SONIC_CONFIG_ENGINE_PY3)_SRC_PATH = $(SRC_PATH)/sonic-config-engine
1616
$(SONIC_CONFIG_ENGINE_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
1717
$(SONIC_YANG_MGMT_PY3) \
1818
$(SONIC_YANG_MODELS_PY3)
19-
$(SONIC_CONFIG_ENGINE_PY3)_DEBS_DEPENDS += $(LIBYANG) \
20-
$(LIBYANG_CPP) \
21-
$(LIBYANG_PY3) \
22-
$(PYTHON3_SWSSCOMMON)
19+
$(SONIC_CONFIG_ENGINE_PY3)_DEBS_DEPENDS += $(LIBYANG3) \
20+
$(LIBYANG3_PY3) \
21+
$(PYTHON3_SWSSCOMMON)
2322
ifeq ($(ENABLE_PY2_MODULES), y)
2423
# Synthetic dependency to avoid building the Python 2 and 3 packages
2524
# simultaneously and any potential conflicts which may arise

‎rules/sonic-mgmt-common.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
MGMT_COMMON_VERSION = 1.0.0
44
SONIC_MGMT_COMMON = sonic-mgmt-common_$(MGMT_COMMON_VERSION)_$(CONFIGURED_ARCH).deb
55
$(SONIC_MGMT_COMMON)_SRC_PATH = $(SRC_PATH)/sonic-mgmt-common
6-
$(SONIC_MGMT_COMMON)_DEPENDS = $(LIBYANG_DEV) $(LIBYANG)
7-
$(SONIC_MGMT_COMMON)_RDEPENDS = $(LIBYANG)
6+
$(SONIC_MGMT_COMMON)_DEPENDS = $(LIBYANG_DEV) $(LIBYANG) $(LIBYANG3)
7+
$(SONIC_MGMT_COMMON)_RDEPENDS = $(LIBYANG) $(LIBYANG3)
88
$(SONIC_MGMT_COMMON)_WHEEL_DEPENDS = $(SONIC_YANG_MODELS_PY3)
99
SONIC_DPKG_DEBS += $(SONIC_MGMT_COMMON)
1010

‎rules/sonic-utilities.mk

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
1919
$(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG) \
2020
$(LIBYANG_CPP) \
2121
$(LIBYANG_PY3) \
22+
$(LIBYANG3) \
23+
$(LIBYANG3_PY3) \
2224
$(LIBSWSSCOMMON) \
2325
$(PYTHON3_SWSSCOMMON)
2426
ifeq ($(CONFIGURED_PLATFORM),nvidia-bluefield)

‎rules/sonic_bgpcfgd.mk

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ $(SONIC_BGPCFGD)_DEPENDS += $(SONIC_CONFIG_ENGINE_PY3) \
1313
$(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG) \
1414
$(LIBYANG_CPP) \
1515
$(LIBYANG_PY3) \
16+
$(LIBYANG3) \
17+
$(LIBYANG3_PY3) \
1618
$(PYTHON3_SWSSCOMMON)
1719
$(SONIC_BGPCFGD)_PYTHON_VERSION = 3
1820
SONIC_PYTHON_WHEELS += $(SONIC_BGPCFGD)

‎rules/swss-common.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ $(LIBSWSSCOMMON)_VERSION = $(LIBSWSSCOMMON_VERSION)
99
$(LIBSWSSCOMMON)_NAME = $(LIBSWSSCOMMON_NAME)
1010
$(LIBSWSSCOMMON)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \
1111
$(LIBNL_ROUTE3_DEV) $(LIBNL_NF3_DEV) \
12-
$(LIBNL_CLI_DEV) $(LIBYANG_DEV) $(LIBYANG)
12+
$(LIBNL_CLI_DEV) $(LIBYANG_DEV) $(LIBYANG) $(LIBYANG3)
1313
$(LIBSWSSCOMMON)_RDEPENDS += $(LIBNL3) $(LIBNL_GENL3) \
14-
$(LIBNL_ROUTE3) $(LIBNL_NF3) $(LIBNL_CLI) $(LIBYANG)
14+
$(LIBNL_ROUTE3) $(LIBNL_NF3) $(LIBNL_CLI) $(LIBYANG) \
15+
$(LIBYANG3)
1516
SONIC_DPKG_DEBS += $(LIBSWSSCOMMON)
1617

1718
LIBSWSSCOMMON_DEV = $(LIBSWSSCOMMON_NAME)-dev_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb

0 commit comments

Comments
 (0)