From 2fcfc371e5a018400d70b82040972b8aadcd3ece Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Mon, 4 Nov 2024 02:59:35 +0000 Subject: [PATCH] Fix patch issue --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 17832fa8..740f166d 100644 --- 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)