From 4872252855e265c002e9a29913a451d04df436eb Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 3 Aug 2022 17:43:59 +0200 Subject: [PATCH 1/3] git: use YAML config file --- Tools/git/build | 1 - Tools/git/files/{variants.rhel6 => variants.yaml} | 0 2 files changed, 1 deletion(-) rename Tools/git/files/{variants.rhel6 => variants.yaml} (100%) diff --git a/Tools/git/build b/Tools/git/build index 9a8f435..0bb3c26 100755 --- a/Tools/git/build +++ b/Tools/git/build @@ -1,7 +1,6 @@ #!/usr/bin/env modbuild pbuild::set_download_url "http://www.kernel.org/pub/software/scm/$P/$P-${V_PKG}.tar.gz" -pbuild::add_to_group 'Tools' pbuild::compile_in_sourcetree pbuild::install_docfiles 'COPYING' 'README.md' diff --git a/Tools/git/files/variants.rhel6 b/Tools/git/files/variants.yaml similarity index 100% rename from Tools/git/files/variants.rhel6 rename to Tools/git/files/variants.yaml From cc3cb2d6849042f3fa3e5cdf1ef553a608fb761d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 3 Aug 2022 17:44:53 +0200 Subject: [PATCH 2/3] git: YAML config file edited --- Tools/git/files/variants.yaml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Tools/git/files/variants.yaml b/Tools/git/files/variants.yaml index 74c7389..44de42f 100644 --- a/Tools/git/files/variants.yaml +++ b/Tools/git/files/variants.yaml @@ -1,6 +1,19 @@ -git/2.3.3 stable Tcl/8.6.4 Tk/8.6.4 -git/2.8.1 stable Tcl/8.6.4 Tk/8.6.4 -git/2.21.0 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 -git/2.22.0 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 -git/2.30.0 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 -git/2.33.1 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 +overlay: base +relstage: stable +group: Tools + +git/2.3.3: + - dependencies: Tcl/8.6.4 Tk/8.6.4 +git/2.8.1: + - dependencies: Tcl/8.6.4 Tk/8.6.4 +git/2.21.0: + - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 +git/2.22.0: + - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 +git/2.30.0: + - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 +git/2.33.1: + - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 +git/2.37.0: + - dependencies: TclTk/8.6.9 + build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8 From 4a31efabad09c2704d4f1a7365ac6421dc7b5ee6 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 3 Aug 2022 17:45:24 +0200 Subject: [PATCH 3/3] git: wrong prefix fixed in build-script --- Tools/git/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/git/build b/Tools/git/build index 0bb3c26..1c63eaf 100755 --- a/Tools/git/build +++ b/Tools/git/build @@ -20,7 +20,7 @@ pbuild::pre_configure() { } pbuild::post_compile() { - make -C contrib/subtree prefix="${prefix}" + make -C contrib/subtree prefix="${PREFIX}" } pbuild::post_install() {