From 6ebd4438f30ad86a03195aceae43b23a1072a4b3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 2 Nov 2023 17:09:22 +0100 Subject: [PATCH] package/pkg-golang: don't expand license info when empty The golang infrastructure automatically expands the list of licenses with a little blurb that the licenses for vendored dependencies might be missing in the list. However, when a package does not define a license, the resulting text is sub-optimal, resulting in a manifest that contains (with a leading comma, yes): , vendored dependencies licenses probably not listed In that case, pointing out some unkown licensing terms may be part of unkonwn licensing terms is superfluous. Instead, just let the legal infra do its job, and report an "unkown" license altogether. Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit 01a4614d10b90540bbab76c823d8fb2faea87a27) Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 7ba82284f3..1fa0b001e0 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -92,8 +92,12 @@ $(2)_DL_ENV += \ $$($(2)_GO_ENV) # Due to vendoring, it is pretty likely that not all licenses are -# listed in _LICENSE. +# listed in _LICENSE. If the license is unset, it is "unknown" +# so adding unknowns to some unknown is still some other unkown, +# so don't append the blurb in that case. +ifneq ($$($(2)_LICENSE),) $(2)_LICENSE += , vendored dependencies licenses probably not listed +endif # Build step. Only define it if not already defined by the package .mk # file.