Projetos/rpi-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package: drop default _INSTALL_BINS in golang-package

Browse Source 
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 <yann.morin@orange.com>
Cc: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Cc: Christian Stewart <christian@aperture.us>
Cc: James Hilliard <james.hilliard1@gmail.com>
Reviewed-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Yann E. MORIN
2025-07-01 15:45:50 +02:00
committed by Romain Naour
parent fd4ece3151
commit eb007fe2db
9 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk
View File

@@ -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))

1
package/containerd/containerd.mk
View File

@@ -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)

2
package/delve/delve.mk
View File

@@ -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))

1
package/distribution-registry/distribution-registry.mk
View File

@@ -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

2
package/docker-cli/docker-cli.mk
View File

@@ -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))

2
package/docker-engine/docker-engine.mk
View File

@@ -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

3
package/mender-artifact/mender-artifact.mk
View File

@@ -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))

4
package/moby-buildkit/moby-buildkit.mk
View File

@@ -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))

1
package/tailscale/tailscale.mk
View File

@@ -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)