@@ -120,10 +120,10 @@ all-binaries-platforms: ## Make all platform binaries
120
120
121
121
# OS specific binaries/images
122
122
ifeq ($(GOOS ) ,linux)
123
- all-binaries : acncli azure-cnm-plugin azure- cni-plugin azure-cns azure-npm azure-ipam
123
+ all-binaries : acncli azure-cni-plugin azure-cns azure-npm azure-ipam
124
124
all-images : npm-image cns-image cni-manager-image
125
125
else
126
- all-binaries : azure-cnm-plugin azure- cni-plugin azure-cns azure-npm
126
+ all-binaries : azure-cni-plugin azure-cns azure-npm
127
127
all-images :
128
128
@echo " Nothing to build. Skip."
129
129
endif
@@ -662,14 +662,14 @@ ifeq ($(GOOS),linux)
662
662
endif
663
663
cd $(CNI_MULTITENANCY_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_MULTITENANCY_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) azure-vnet-telemetry$(EXE_EXT) 10-azure.conflist azure-vnet-telemetry.config
664
664
665
+ ifeq ($(GOOS ) ,linux)
665
666
$(MKDIR) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
666
667
cp cni/azure-$(GOOS)-multitenancy-transparent-vlan.conflist $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/10-azure.conflist
667
- cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
668
- ifeq ($(GOOS ) ,linux)
668
+ cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
669
669
cp telemetry/azure-vnet-telemetry.config $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/azure-vnet-telemetry.config
670
670
cp $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
671
+ cd $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-telemetry$(EXE_EXT) 10-azure.conflist azure-vnet-telemetry.config
671
672
endif
672
- cd $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) azure-vnet-telemetry$(EXE_EXT) 10-azure.conflist azure-vnet-telemetry.config
673
673
674
674
$(MKDIR) $(CNI_SWIFT_BUILD_DIR)
675
675
cp cni/azure-$(GOOS)-swift.conflist $(CNI_SWIFT_BUILD_DIR)/10-azure.conflist
0 commit comments