From eb007fe2db461425d9e6ba70d7542c13bfd58f84 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 1 Jul 2025 15:45:50 +0200 Subject: [PATCH] package: drop default _INSTALL_BINS in golang-package Now that the pkg-golang infra automatically sets _INSTALL_BINS by default to the list of notdir of _BUILD_TARGETS, there is no need to do that in packages anymore. Most packages were already using the notdir construct, so those are trivially fixed; a few had a hard-coded list that matched the built targets list, so they too are trivially fixed. host-mender-artifact was slightly different, in that it explicitly set the _BIN_NAME to mender-artifact, which happens to be the default; it also set _INSTALL_BINS to _BIN_NAME, so again using the default. This package can also be fixed easily. Signed-off-by: Yann E. MORIN Cc: Angelo Compagnucci Cc: Christian Stewart Cc: James Hilliard Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- .../amazon-ecr-credential-helper.mk | 1 - package/containerd/containerd.mk | 1 - package/delve/delve.mk | 2 -- package/distribution-registry/distribution-registry.mk | 1 - package/docker-cli/docker-cli.mk | 2 -- package/docker-engine/docker-engine.mk | 2 -- package/mender-artifact/mender-artifact.mk | 3 --- package/moby-buildkit/moby-buildkit.mk | 4 ---- package/tailscale/tailscale.mk | 1 - 9 files changed, 17 deletions(-) diff --git a/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk index 06bc98bc79..5ac416912c 100644 --- a/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk +++ b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk @@ -15,6 +15,5 @@ AMAZON_ECR_CREDENTIAL_HELPER_SUBDIR = ecr-login AMAZON_ECR_CREDENTIAL_HELPER_GOMOD = ./cli AMAZON_ECR_CREDENTIAL_HELPER_BUILD_TARGETS = docker-credential-ecr-login -AMAZON_ECR_CREDENTIAL_HELPER_INSTALL_BINS = docker-credential-ecr-login $(eval $(golang-package)) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 1f70a26ebf..2ef70ab5d7 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -20,7 +20,6 @@ CONTAINERD_BUILD_TARGETS = \ cmd/containerd-shim-runc-v2 \ cmd/ctr -CONTAINERD_INSTALL_BINS = $(notdir $(CONTAINERD_BUILD_TARGETS)) CONTAINERD_TAGS = no_aufs ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 408286e3b4..8206721fe2 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -12,11 +12,9 @@ DELVE_DEPENDENCIES = host-pkgconf DELVE_TAGS = cgo DELVE_BUILD_TARGETS = cmd/dlv -DELVE_INSTALL_BINS = $(notdir $(DELVE_BUILD_TARGETS)) HOST_DELVE_TAGS = cgo HOST_DELVE_BUILD_TARGETS = cmd/dlv -HOST_DELVE_INSTALL_BINS = $(notdir $(HOST_DELVE_BUILD_TARGETS)) $(eval $(golang-package)) $(eval $(host-golang-package)) diff --git a/package/distribution-registry/distribution-registry.mk b/package/distribution-registry/distribution-registry.mk index 901b9c40e5..a01a3c1710 100644 --- a/package/distribution-registry/distribution-registry.mk +++ b/package/distribution-registry/distribution-registry.mk @@ -18,7 +18,6 @@ DISTRIBUTION_REGISTRY_BUILD_TARGETS = cmd/registry # distribution-registry builds and installs the 'registry' executable, but # that name is a bit too generic. Rename it to match the package name. DISTRIBUTION_REGISTRY_BIN_NAME = distribution-registry -DISTRIBUTION_REGISTRY_INSTALL_BINS = distribution-registry # Inject the version as if done by upstream's wrapper Makefile define DISTRIBUTION_REGISTRY_SET_VERSION diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 511ec1c8dd..abe0aac348 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -38,6 +38,4 @@ define DOCKER_CLI_FIX_VENDORING endef DOCKER_CLI_POST_EXTRACT_HOOKS += DOCKER_CLI_FIX_VENDORING -DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) - $(eval $(golang-package)) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 28905b28d6..37d42edaea 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -70,8 +70,6 @@ define DOCKER_ENGINE_FIX_VENDORING endef DOCKER_ENGINE_POST_EXTRACT_HOOKS += DOCKER_ENGINE_FIX_VENDORING -DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) - define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index bcab91890a..7d6f0929e2 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -115,7 +115,4 @@ HOST_MENDER_ARTIFACT_GO_ENV += \ HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION) -HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact -HOST_MENDER_ARTIFACT_INSTALL_BINS = $(HOST_MENDER_ARTIFACT_BIN_NAME) - $(eval $(host-golang-package)) diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 91560c1ed1..4ae1abde3a 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -17,12 +17,8 @@ MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd MOBY_BUILDKIT_LDFLAGS = \ -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" -MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) - HOST_MOBY_BUILDKIT_TAGS = cgo HOST_MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd -HOST_MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(HOST_MOBY_BUILDKIT_BUILD_TARGETS)) - $(eval $(golang-package)) $(eval $(host-golang-package)) diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk index c63710c131..3c6c7bce1e 100644 --- a/package/tailscale/tailscale.mk +++ b/package/tailscale/tailscale.mk @@ -11,7 +11,6 @@ TAILSCALE_LICENSE_FILES = LICENSE TAILSCALE_GOMOD = tailscale.com TAILSCALE_CPE_ID_VENDOR = tailscale TAILSCALE_BUILD_TARGETS = cmd/tailscale cmd/tailscaled -TAILSCALE_INSTALL_BINS = tailscale tailscaled TAILSCALE_LDFLAGS = \ -X tailscale.com/version.longStamp=$(TAILSCALE_VERSION) \ -X tailscale.com/version.shortStamp=$(TAILSCALE_VERSION)