Skip to content

Commit

Permalink
Makefile: fix report-licenses target
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Lehtonen <[email protected]>
  • Loading branch information
marquiz authored and klihub committed Jan 16, 2024
1 parent 5d072b5 commit bec36f7
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ SHELL := /bin/bash
# Kubernetes version we pull in as modules and our external API versions.
KUBERNETES_VERSION := $(shell grep 'k8s.io/kubernetes ' go.mod | sed 's/^.* //')

# Directories (in cmd) with go code we'll want to create Docker images from.
IMAGE_DIRS = $(shell find cmd -name Dockerfile | sed 's:cmd/::g;s:/.*::g' | uniq)
IMAGE_VERSION := $(shell git describe --dirty 2> /dev/null || echo v0.0.0-unknown)
ifdef IMAGE_REPO
override IMAGE_REPO := $(IMAGE_REPO)/
Expand Down Expand Up @@ -392,9 +390,7 @@ install-ginkgo:

report-licenses:
$(Q)mkdir -p $(LICENSE_PATH) && \
for cmd in $(IMAGE_DIRS); do \
LICENSE_PKGS="$$LICENSE_PKGS ./cmd/$$cmd"; \
done && \
LICENSE_PKGS=`find ./cmd -name Dockerfile | xargs -l dirname`; \
go-licenses report $$LICENSE_PKGS \
--ignore github.com/containers/nri-plugins \
> $(LICENSE_PATH)/licenses.csv && \
Expand Down

0 comments on commit bec36f7

Please sign in to comment.