From 39e9b7e5555e2c0fb404c6f6e9441bdd99463625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 5 Aug 2023 23:11:06 +0200 Subject: [PATCH] Add option to ignore directories in go_generate_buildrequires --- rpm/macros.d/macros.go-rpm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/rpm/macros.d/macros.go-rpm b/rpm/macros.d/macros.go-rpm index 8890023..5a73720 100644 --- a/rpm/macros.d/macros.go-rpm +++ b/rpm/macros.d/macros.go-rpm @@ -169,11 +169,14 @@ end # -z calls # -i use the specified import path value instead of the one # found in %{goipath} -%go_generate_buildrequires(z:ai:) %{lua: -local fedora = require "fedora.common" -local processall = (rpm.expand("%{-a}") ~= "") and (rpm.expand("%{-z}") == "") -local forcedgoipath = rpm.expand("%{?-i}") -local golistargs = "" +%go_generate_buildrequires(z:ai:d*:t*:r*:) %{lua: +local fedora = require "fedora.common" +local processall = (rpm.expand("%{-a}") ~= "") and (rpm.expand("%{-z}") == "") +local forcedgoipath = rpm.expand("%{?-i}") +local golistargs = "" +local ignore_directory = rpm.expand("%{?-d}") +local ignore_directory_tree = rpm.expand("%{?-t}") +local ignore_regex = rpm.expand("%{?-r}") if processall then for _, s in pairs(fedora.getsuffixes("goipath")) do golistargs = golistargs .. " --package-path %{goipath" .. s .. "}" @@ -184,6 +187,15 @@ elseif forcedgoipath ~= "" then else golistargs = "--package-path %{goipath" .. rpm.expand("%{?-z*}") .. "}" end +if ignore_directory ~= "" then + golistargs = golistargs .. " " .. ignore_directory +end +if ignore_directory_tree ~= "" then + golistargs = golistargs .. " " .. ignore_directory_tree +end +if ignore_regex ~= "" then + golistargs = golistargs .. " " .. ignore_regex +end print(rpm.expand('GOPATH="%{?gobuilddir:%{gobuilddir}:}${GOPATH:+${GOPATH}:}%{?gopath}" ' .. 'GO111MODULE=off ' .. "golist --imported " .. golistargs .. -- 2.41.0