automatic import of git-lfsopeneuler24.03_LTS

1 files changed, 78 insertions, 0 deletions

diff --git a/0001-use-vendor-dir-for-build.patch b/0001-use-vendor-dir-for-build.patch
new file mode 100644
index 0000000..6ba7f65
--- /dev/null
+++ b/0001-use-vendor-dir-for-build.patch
@@ -0,0 +1,78 @@
+From f17333fb29d81d5061c96931c0cd5135dec0ba02 Mon Sep 17 00:00:00 2001
+From: zhoukang <gameoverboss@163.com>
+Date: Tue, 12 Jul 2022 21:21:58 +0800
+Subject: [PATCH] use vendor dir for build
+
+---
+ Makefile | 20 +++++++-------------
+ 1 file changed, 7 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0b73d9e..a185116 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,7 @@ GO_TEST_EXTRA_ARGS =
+ # BUILTIN_LD_FLAGS are the internal flags used to pass to the linker. By default
+ # the config.GitCommit variable is always set via this variable, and
+ # DWARF-stripping is enabled unless DWARF=YesPlease.
+-BUILTIN_LD_FLAGS =
++BUILTIN_LD_FLAGS = "-linkmode=external"
+ ifneq ("$(VENDOR)","")
+ BUILTIN_LD_FLAGS += -X github.com/git-lfs/git-lfs/config.Vendor=$(VENDOR)
+ endif
+@@ -194,8 +194,8 @@ endif
+ #
+ # It uses BUILD_MAIN as defined above to specify the entrypoint for building Git
+ # LFS.
+-BUILD = GOOS=$(1) GOARCH=$(2) \
+-	$(GO) build \
++BUILD = GO111MODULE=on GOOS=$(1) GOARCH=$(2) \
++	$(GO) build -mod=vendor \
+ 	-ldflags="$(LD_FLAGS)" \
+ 	-gcflags="$(GC_FLAGS)" \
+ 	-trimpath \
+@@ -227,7 +227,7 @@ mangen : commands/mancontent_gen.go
+ # 'commands' of Git LFS. It depends upon the contents of the 'docs' directory
+ # and converts those manpages into code.
+ commands/mancontent_gen.go : $(wildcard docs/man/*.ronn)
+-	GOOS= GOARCH= $(GO) generate github.com/git-lfs/git-lfs/v3/commands
++	@echo "delete this step"
+ 
+ # trgen is a shorthand for ensuring that tr/tr_gen.go is kept up-to-date with
+ # the contents of po/build/*.mo.
+@@ -238,7 +238,7 @@ trgen : tr/tr_gen.go
+ # 'tr' of Git LFS. It depends upon the contents of the 'po' directory
+ # and converts the .mo files.
+ tr/tr_gen.go : $(MO)
+-	GOOS= GOARCH= $(GO) generate github.com/git-lfs/git-lfs/v3/tr
++	@echo "delete this step"
+ 
+ po/build:
+ 	mkdir -p po/build
+@@ -597,7 +597,7 @@ vendor : go.mod
+ .PHONY : fmt
+ ifeq ($(shell test -x "`command -v $(GOIMPORTS)`"; echo $$?),0)
+ fmt : $(SOURCES) | lint
+-	@$(GOIMPORTS) $(GOIMPORTS_EXTRA_OPTS) $?;
++	@echo "delete this step"
+ else
+ fmt : $(SOURCES) | lint
+ 	@echo "git-lfs: skipping fmt, no goimports found at \`$(GOIMPORTS)\` ..."
+@@ -607,13 +607,7 @@ endif
+ # are vendored in via vendor (see: above).
+ .PHONY : lint
+ lint : $(SOURCES)
+-	@! $(GO) list -f '{{ join .Deps "\n" }}' . \
+-	| $(XARGS) $(GO) list -f \
+-		'{{ if and (not .Standard) (not .Module) }} \
+-			{{ .ImportPath }} \
+-		{{ end }}' \
+-	| $(GREP) -v "github.com/git-lfs/git-lfs" \
+-	| $(GREP) "."
++	@echo "delete this step"
+ 
+ # generate index.txt for ronn HTML man page link generation
+ .PHONY : index.txt
+-- 
+2.33.0
+