Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<!-- Verification test comment -->
3 changes: 2 additions & 1 deletion rules/sonic-mgmt-framework.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
9 changes: 9 additions & 0 deletions src/libnl3/patch/0001-skip-tests.patch
Original file line number Diff line number Diff line change
@@ -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"
1 change: 1 addition & 0 deletions src/libnl3/patch/series
Original file line number Diff line number Diff line change
Expand Up @@ -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