Fix patch issue

sonic-net · Nov 4, 2024 · 2fcfc37 · 2fcfc37
1 parent 3b935dc
commit 2fcfc37
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -49,7 +49,12 @@ go.mod:
 
 $(GO_DEPS): go.mod $(PATCHES) swsscommon_wrap
 	$(GO) mod vendor
+
+# Apply patch from sonic-mgmt-common, ignore glog.patch because glog version changed
+	sed -i 's/patch -d ${DEST_DIR}\/github.com\/golang\/glog/#patch -d ${DEST_DIR}\/github.com\/golang\/glog/g' $(MGMT_COMMON_DIR)/patches/apply.sh
 	$(MGMT_COMMON_DIR)/patches/apply.sh vendor
+	sed -i 's/#patch -d ${DEST_DIR}\/github.com\/golang\/glog/patch -d ${DEST_DIR}\/github.com\/golang\/glog/g' $(MGMT_COMMON_DIR)/patches/apply.sh
+
 	touch $@
 
 go-deps: $(GO_DEPS)