From 4d5b84599c7bf3620a0409944835845350a45750 Mon Sep 17 00:00:00 2001 From: Brad House Date: Wed, 12 Feb 2025 11:03:16 -0500 Subject: [PATCH] IGNORE THIS COMMIT: merge libyang3 step 4 (PR sonic-net#21718) --- dockers/docker-config-engine-bookworm/Dockerfile.j2 | 3 ++- dockers/docker-config-engine-bullseye/Dockerfile.j2 | 3 ++- dockers/docker-config-engine-buster/Dockerfile.j2 | 3 ++- dockers/docker-config-engine/Dockerfile.j2 | 2 +- files/build_templates/sonic_debian_extension.j2 | 2 +- platform/vs/docker-sonic-vs.mk | 2 ++ rules/docker-bmp.mk | 5 +++-- rules/docker-config-engine-bookworm.mk | 2 ++ rules/docker-config-engine-bullseye.mk | 2 ++ rules/docker-config-engine-buster.mk | 2 ++ rules/docker-macsec.mk | 2 +- rules/sonic-config.mk | 7 +++---- rules/sonic-mgmt-common.mk | 4 ++-- rules/sonic-utilities.mk | 2 ++ rules/sonic_bgpcfgd.mk | 2 ++ rules/swss-common.mk | 5 +++-- 16 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dockers/docker-config-engine-bookworm/Dockerfile.j2 b/dockers/docker-config-engine-bookworm/Dockerfile.j2 index c7c1d9cdc825..d437b7c91794 100644 --- a/dockers/docker-config-engine-bookworm/Dockerfile.j2 +++ b/dockers/docker-config-engine-bookworm/Dockerfile.j2 @@ -9,7 +9,8 @@ RUN apt-get update && \ apt-utils \ build-essential \ python3-dev \ - python3-yaml + python3-yaml \ + python3-cffi {%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %} RUN apt-get install -y \ diff --git a/dockers/docker-config-engine-bullseye/Dockerfile.j2 b/dockers/docker-config-engine-bullseye/Dockerfile.j2 index 700af660a91d..9bf79443c33d 100644 --- a/dockers/docker-config-engine-bullseye/Dockerfile.j2 +++ b/dockers/docker-config-engine-bullseye/Dockerfile.j2 @@ -8,7 +8,8 @@ RUN apt-get update && \ apt-get install -y \ apt-utils \ build-essential \ - python3-dev + python3-dev \ + python3-cffi {%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %} RUN apt-get install -y \ diff --git a/dockers/docker-config-engine-buster/Dockerfile.j2 b/dockers/docker-config-engine-buster/Dockerfile.j2 index cfa61bc0ba8c..df713b3d1b7b 100644 --- a/dockers/docker-config-engine-buster/Dockerfile.j2 +++ b/dockers/docker-config-engine-buster/Dockerfile.j2 @@ -8,7 +8,8 @@ RUN apt-get update && \ apt-get install -y \ apt-utils \ build-essential \ - python3-dev + python3-dev \ + python3-cffi {%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %} RUN apt-get install -y \ diff --git a/dockers/docker-config-engine/Dockerfile.j2 b/dockers/docker-config-engine/Dockerfile.j2 index c470102fa4c4..0f78efeed481 100644 --- a/dockers/docker-config-engine/Dockerfile.j2 +++ b/dockers/docker-config-engine/Dockerfile.j2 @@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update # Dependencies for sonic-cfggen -RUN apt-get install -y build-essential python-dev +RUN apt-get install -y build-essential python-dev python3-cffi # Install python-redis RUN pip install redis>=3.5.3 diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index f071df8c46aa..5a75c9571727 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -162,7 +162,7 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then fi # Install sonic-yang-models Python 3 package, install dependencies -sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libyang_*.deb $debs_path/libyang-cpp_*.deb $debs_path/python3-yang_*.deb || \ +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 || \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f SONIC_YANG_MODEL_PY3_WHEEL_NAME=$(basename {{sonic_yang_models_py3_wheel_path}}) sudo cp {{sonic_yang_models_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_YANG_MODEL_PY3_WHEEL_NAME diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk index 3e66e94546ad..878163078a60 100644 --- a/platform/vs/docker-sonic-vs.mk +++ b/platform/vs/docker-sonic-vs.mk @@ -10,6 +10,8 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SYNCD_VS) \ $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY3) \ + $(LIBYANG3) \ + $(LIBYANG3_PY3) \ $(SONIC_UTILITIES_DATA) \ $(SONIC_HOST_SERVICES_DATA) diff --git a/rules/docker-bmp.mk b/rules/docker-bmp.mk index 95ad79799e65..48501efcfa68 100644 --- a/rules/docker-bmp.mk +++ b/rules/docker-bmp.mk @@ -13,7 +13,8 @@ $(DOCKER_BMP)_PYTHON_WHEELS = $(SONIC_BMPCFGD) $(DOCKER_BMP)_INSTALL_DEBS = $(LIBSWSSCOMMON) \ $(SONIC_BMPD) \ $(PYTHON3_SWSSCOMMON) \ - $(LIBYANG_PY3) + $(LIBYANG_PY3) \ + $(LIBYANG3_PY3) $(DOCKER_BMP)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS) @@ -43,4 +44,4 @@ $(DOCKER_BMP)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_BMP)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw $(DOCKER_BMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -$(DOCKER_BMP)_BASE_IMAGE_FILES += monit_bmp:/etc/monit/conf.d \ No newline at end of file +$(DOCKER_BMP)_BASE_IMAGE_FILES += monit_bmp:/etc/monit/conf.d diff --git a/rules/docker-config-engine-bookworm.mk b/rules/docker-config-engine-bookworm.mk index 35145d890614..60606ab70b6c 100644 --- a/rules/docker-config-engine-bookworm.mk +++ b/rules/docker-config-engine-bookworm.mk @@ -7,6 +7,8 @@ $(DOCKER_CONFIG_ENGINE_BOOKWORM)_DEPENDS += $(LIBSWSSCOMMON) \ $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY3) \ + $(LIBYANG3) \ + $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) \ $(SONIC_DB_CLI) \ $(SONIC_EVENTD) diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk index aa91a56279ce..2211519c873a 100644 --- a/rules/docker-config-engine-bullseye.mk +++ b/rules/docker-config-engine-bullseye.mk @@ -7,6 +7,8 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \ $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY3) \ + $(LIBYANG3) \ + $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) \ $(SONIC_DB_CLI) \ $(SONIC_EVENTD) diff --git a/rules/docker-config-engine-buster.mk b/rules/docker-config-engine-buster.mk index 9f4035d6aa24..1f9b2f533b4e 100644 --- a/rules/docker-config-engine-buster.mk +++ b/rules/docker-config-engine-buster.mk @@ -7,6 +7,8 @@ $(DOCKER_CONFIG_ENGINE_BUSTER)_DEPENDS += $(LIBSWSSCOMMON) \ $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY3) \ + $(LIBYANG3) \ + $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) \ $(SONIC_DB_CLI) $(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \ diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk index 682ef619e9be..f7f319cbbb95 100644 --- 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) +$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3) $(LIBYANG3_PY3) SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC) SONIC_BOOKWORM_DOCKERS += $(DOCKER_MACSEC) diff --git a/rules/sonic-config.mk b/rules/sonic-config.mk index ba146df70577..d65805bc96c5 100644 --- a/rules/sonic-config.mk +++ b/rules/sonic-config.mk @@ -16,10 +16,9 @@ $(SONIC_CONFIG_ENGINE_PY3)_SRC_PATH = $(SRC_PATH)/sonic-config-engine $(SONIC_CONFIG_ENGINE_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \ $(SONIC_YANG_MGMT_PY3) \ $(SONIC_YANG_MODELS_PY3) -$(SONIC_CONFIG_ENGINE_PY3)_DEBS_DEPENDS += $(LIBYANG) \ - $(LIBYANG_CPP) \ - $(LIBYANG_PY3) \ - $(PYTHON3_SWSSCOMMON) +$(SONIC_CONFIG_ENGINE_PY3)_DEBS_DEPENDS += $(LIBYANG3) \ + $(LIBYANG3_PY3) \ + $(PYTHON3_SWSSCOMMON) ifeq ($(ENABLE_PY2_MODULES), y) # Synthetic dependency to avoid building the Python 2 and 3 packages # simultaneously and any potential conflicts which may arise diff --git a/rules/sonic-mgmt-common.mk b/rules/sonic-mgmt-common.mk index 41441ab3ee94..1764e423175b 100644 --- a/rules/sonic-mgmt-common.mk +++ b/rules/sonic-mgmt-common.mk @@ -3,8 +3,8 @@ MGMT_COMMON_VERSION = 1.0.0 SONIC_MGMT_COMMON = sonic-mgmt-common_$(MGMT_COMMON_VERSION)_$(CONFIGURED_ARCH).deb $(SONIC_MGMT_COMMON)_SRC_PATH = $(SRC_PATH)/sonic-mgmt-common -$(SONIC_MGMT_COMMON)_DEPENDS = $(LIBYANG_DEV) $(LIBYANG) -$(SONIC_MGMT_COMMON)_RDEPENDS = $(LIBYANG) +$(SONIC_MGMT_COMMON)_DEPENDS = $(LIBYANG_DEV) $(LIBYANG) $(LIBYANG3) +$(SONIC_MGMT_COMMON)_RDEPENDS = $(LIBYANG) $(LIBYANG3) $(SONIC_MGMT_COMMON)_WHEEL_DEPENDS = $(SONIC_YANG_MODELS_PY3) SONIC_DPKG_DEBS += $(SONIC_MGMT_COMMON) diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk index d0dec73e90e5..1217c7cd951a 100644 --- a/rules/sonic-utilities.mk +++ b/rules/sonic-utilities.mk @@ -19,6 +19,8 @@ $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \ $(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY3) \ + $(LIBYANG3) \ + $(LIBYANG3_PY3) \ $(LIBSWSSCOMMON) \ $(PYTHON3_SWSSCOMMON) ifeq ($(CONFIGURED_PLATFORM),nvidia-bluefield) diff --git a/rules/sonic_bgpcfgd.mk b/rules/sonic_bgpcfgd.mk index 9abab06800c8..8881fb67caf6 100644 --- a/rules/sonic_bgpcfgd.mk +++ b/rules/sonic_bgpcfgd.mk @@ -13,6 +13,8 @@ $(SONIC_BGPCFGD)_DEPENDS += $(SONIC_CONFIG_ENGINE_PY3) \ $(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY3) \ + $(LIBYANG3) \ + $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) $(SONIC_BGPCFGD)_PYTHON_VERSION = 3 SONIC_PYTHON_WHEELS += $(SONIC_BGPCFGD) diff --git a/rules/swss-common.mk b/rules/swss-common.mk index 5d657d5e500b..12a10b3186ee 100644 --- a/rules/swss-common.mk +++ b/rules/swss-common.mk @@ -9,9 +9,10 @@ $(LIBSWSSCOMMON)_VERSION = $(LIBSWSSCOMMON_VERSION) $(LIBSWSSCOMMON)_NAME = $(LIBSWSSCOMMON_NAME) $(LIBSWSSCOMMON)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \ $(LIBNL_ROUTE3_DEV) $(LIBNL_NF3_DEV) \ - $(LIBNL_CLI_DEV) $(LIBYANG_DEV) $(LIBYANG) + $(LIBNL_CLI_DEV) $(LIBYANG_DEV) $(LIBYANG) $(LIBYANG3) $(LIBSWSSCOMMON)_RDEPENDS += $(LIBNL3) $(LIBNL_GENL3) \ - $(LIBNL_ROUTE3) $(LIBNL_NF3) $(LIBNL_CLI) $(LIBYANG) + $(LIBNL_ROUTE3) $(LIBNL_NF3) $(LIBNL_CLI) $(LIBYANG) \ + $(LIBYANG3) SONIC_DPKG_DEBS += $(LIBSWSSCOMMON) LIBSWSSCOMMON_DEV = $(LIBSWSSCOMMON_NAME)-dev_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb