From 7bba404dd5e70bab0c6b63f1839cbaf436874ccc Mon Sep 17 00:00:00 2001 From: Hans-Nikolai Viessmann Date: Fri, 10 Apr 2026 17:27:34 +0200 Subject: [PATCH 1/2] update git-lfs --- Tools/git-lfs/build | 25 ++++++------------------- Tools/git-lfs/files/config.yaml | 18 ++++++++++++++++++ Tools/git-lfs/files/variants.rhel6 | 1 - Tools/git-lfs/modulefile | 2 ++ 4 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 Tools/git-lfs/files/config.yaml delete mode 100644 Tools/git-lfs/files/variants.rhel6 diff --git a/Tools/git-lfs/build b/Tools/git-lfs/build index 7da3182a..86128a11 100755 --- a/Tools/git-lfs/build +++ b/Tools/git-lfs/build @@ -1,24 +1,11 @@ #!/usr/bin/env modbuild -pbuild::set_download_url \ - "https://github.com/git-lfs/git-lfs/archive/refs/tags/v3.2.0.tar.gz" \ - "git-lfs-3.2.0.tar.gz" - -pbuild::compile_in_sourcetree -#pbuild::install_docfiles 'COPYING' 'README.md' -pbuild::add_to_group 'Tools' -unset -f pbuild::configure - +# binary release, we don't need to build it +pbuild::prep() { :; } +pbuild::configure() { :; } +pbuild::compile() { :; } pbuild::install() { install -m 0755 -d "${PREFIX}/bin" - install -m 0755 ./bin/git-lfs "${PREFIX}/bin" - install -m 0755 -d "${PREFIX}/.lib64" - install -m 0755 "${GCC_PREFIX}/lib64/libgo.so.21.0.0" "${PREFIX}/.lib64/libgo.so.21" - patchelf --force-rpath --set-rpath '$ORIGIN/../.lib64' "${PREFIX}/bin/git-lfs" + install -m 0755 ./git-lfs "${PREFIX}/bin" + cp -r ./man "${PREFIX}/" } - -# Local Variables: -# mode: sh -# sh-basic-offset: 8 -# tab-width: 8 -# End: diff --git a/Tools/git-lfs/files/config.yaml b/Tools/git-lfs/files/config.yaml new file mode 100644 index 00000000..91abb1f1 --- /dev/null +++ b/Tools/git-lfs/files/config.yaml @@ -0,0 +1,18 @@ +format: 1 +git-lfs: + defaults: + group: Tools + relstage: stable + docfiles: + - README.md + - CHANGELOG.md + urls: + - url: https://github.com/git-lfs/git-lfs/releases/download/v${V}/${P}-linux-amd64-v${V}.tar.gz + shasums: + git-lfs-linux-amd64-v3.7.1.tar.gz: 1c0b6ee5200ca708c5cebebb18fdeb0e1c98f1af5c1a9cba205a4c0ab5a5ec08 + git-lfs-linux-arm64-v3.3.0.tar.gz: e97c477981a9b6a40026cadc1bf005541d973fc32df2de2f398643b15df6b5c6 + versions: + 3.7.1: + 3.3.0: + config: + relstage: deprecated diff --git a/Tools/git-lfs/files/variants.rhel6 b/Tools/git-lfs/files/variants.rhel6 deleted file mode 100644 index 2ff004b0..00000000 --- a/Tools/git-lfs/files/variants.rhel6 +++ /dev/null @@ -1 +0,0 @@ -git-lfs/3.3.0 stable b:gcc/12.1.0 b:patchelf/0.14.5 diff --git a/Tools/git-lfs/modulefile b/Tools/git-lfs/modulefile index 6f209ff0..3e8a4266 100644 --- a/Tools/git-lfs/modulefile +++ b/Tools/git-lfs/modulefile @@ -11,3 +11,5 @@ videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server like GitHub.com or GitHub Enterprise. " + +prepend-path MANPATH $PREFIX/man From 0003ad486e011e91bdf288f4650624f288d22343 Mon Sep 17 00:00:00 2001 From: Hans-Nikolai Viessmann Date: Fri, 10 Apr 2026 17:41:50 +0200 Subject: [PATCH 2/2] fix missing download stage --- Tools/git-lfs/build | 1 - Tools/git-lfs/files/config.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/git-lfs/build b/Tools/git-lfs/build index 86128a11..3afe90d4 100755 --- a/Tools/git-lfs/build +++ b/Tools/git-lfs/build @@ -1,7 +1,6 @@ #!/usr/bin/env modbuild # binary release, we don't need to build it -pbuild::prep() { :; } pbuild::configure() { :; } pbuild::compile() { :; } pbuild::install() { diff --git a/Tools/git-lfs/files/config.yaml b/Tools/git-lfs/files/config.yaml index 91abb1f1..ed457761 100644 --- a/Tools/git-lfs/files/config.yaml +++ b/Tools/git-lfs/files/config.yaml @@ -3,6 +3,7 @@ git-lfs: defaults: group: Tools relstage: stable + compile_in_sourcetree: true docfiles: - README.md - CHANGELOG.md