Skip to content

Commit 4f79e44

Browse files
Fix conflist name
Maintain same conflict name on windows and Linux.
1 parent 0ddedd8 commit 4f79e44

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ publish-azure-vnet-plugin-image:
151151
# Create a CNI archive for the target platform.
152152
.PHONY: cni-archive
153153
cni-archive:
154-
cp cni/azure-$(GOOS).conflist $(CNI_BUILD_DIR)/10-azure-$(GOOS).conflist
154+
cp cni/azure-$(GOOS).conflist $(CNI_BUILD_DIR)/10-azure.conflist
155155
chmod 0755 $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT)
156156
cd $(CNI_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) 10-azure.conflist
157157
chown $(BUILD_USER):$(BUILD_USER) $(CNI_BUILD_DIR)/$(CNI_ARCHIVE_NAME)

0 commit comments

Comments
 (0)