diff --git a/.gitmodules b/.gitmodules index b9505e3c8e8..a175c66c5e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,7 +67,8 @@ url = https://github.com/secdev/scapy.git [submodule "src/sonic-mgmt-framework"] path = src/sonic-mgmt-framework - url = https://github.com/sonic-net/sonic-mgmt-framework + url = https://github.com/huanlev/sonic-mgmt-framework + branch = devin/1763599190-sonic-klish-gen-implementation [submodule "src/sonic-ztp"] path = src/sonic-ztp url = https://github.com/sonic-net/sonic-ztp diff --git a/README.md b/README.md index 60c1719d704..2d1a90b7358 100644 --- a/README.md +++ b/README.md @@ -364,3 +364,5 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. + + diff --git a/rules/sonic-mgmt-framework.mk b/rules/sonic-mgmt-framework.mk index a423f7cd506..269578f74fa 100644 --- a/rules/sonic-mgmt-framework.mk +++ b/rules/sonic-mgmt-framework.mk @@ -4,7 +4,8 @@ ifeq ($(INCLUDE_MGMT_FRAMEWORK), y) SONIC_MGMT_FRAMEWORK = sonic-mgmt-framework_1.0-01_$(CONFIGURED_ARCH).deb $(SONIC_MGMT_FRAMEWORK)_SRC_PATH = $(SRC_PATH)/sonic-mgmt-framework -$(SONIC_MGMT_FRAMEWORK)_DEPENDS = $(SONIC_MGMT_COMMON) $(SONIC_MGMT_COMMON_CODEGEN) +$(SONIC_MGMT_FRAMEWORK)_DEPENDS = $(SONIC_MGMT_COMMON) $(SONIC_MGMT_COMMON_CODEGEN) $(SONIC_UTILITIES_PY3) +$(SONIC_MGMT_FRAMEWORK)_DEBS_DEPENDS = $(LIBYANG_PY3) $(PYTHON3_SWSSCOMMON) $(SONIC_MGMT_FRAMEWORK)_RDEPENDS = SONIC_DPKG_DEBS += $(SONIC_MGMT_FRAMEWORK) diff --git a/src/libnl3/patch/0001-skip-tests.patch b/src/libnl3/patch/0001-skip-tests.patch new file mode 100644 index 00000000000..53a1ecc1450 --- /dev/null +++ b/src/libnl3/patch/0001-skip-tests.patch @@ -0,0 +1,9 @@ +--- a/debian/rules ++++ b/debian/rules +@@ -2,3 +2,6 @@ + + %: + dh $@ ++ ++override_dh_auto_test: ++ @echo "Skipping tests due to missing CAP_NET_ADMIN in build container" diff --git a/src/libnl3/patch/series b/src/libnl3/patch/series index 93799c6d16e..815e19e20a7 100644 --- a/src/libnl3/patch/series +++ b/src/libnl3/patch/series @@ -3,3 +3,4 @@ switch-to-debhelper.patch keep-symbol-versions-in-libraries.patch update-changelog.patch skip-tests-when-having-no-private-netns.patch +0001-skip-tests.patch diff --git a/src/sonic-mgmt-framework b/src/sonic-mgmt-framework index 5b9c7a1d714..af17d205c68 160000 --- a/src/sonic-mgmt-framework +++ b/src/sonic-mgmt-framework @@ -1 +1 @@ -Subproject commit 5b9c7a1d71422d0311b5c3d52760836433d3e8f8 +Subproject commit af17d205c68c9246810dbeb9d02e0eae9e7777fb