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

package/cni-plugin: simplify installation

Browse Source 
In all theory, we could iterate over CNI_PLUGINS_INSTALL_BINS, which
already contains the basenames $(notdir) of the binaries to install,
but *_INSTALL_BINS is now an internal implementation detail, and
can't be guaranteed to be stable.

Hence, iterate over the list of targets, and somewhat duplicate the
install commands from the infra, using make's $(notdir) rather than
calling to the shell's to call basename.

Note: we need to stop setting _INSTALL_BINS, as a following commit will
check that it is not explicitly set, and fail otherwise.

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Christian Stewart <christian@aperture.us>
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:51 +02:00
committed by Romain Naour
parent eb007fe2db
commit cfdd4ed4e3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/cni-plugins/cni-plugins.mk
View File

@@ -28,7 +28,6 @@ CNI_PLUGINS_BUILD_TARGETS = \
plugins/meta/sbr \
plugins/meta/tuning \
plugins/meta/vrf
CNI_PLUGINS_INSTALL_BINS = $(CNI_PLUGINS_BUILD_TARGETS)
ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
CNI_PLUGINS_DEPENDENCIES += libapparmor
@@ -47,9 +46,9 @@ endif
define CNI_PLUGINS_INSTALL_TARGET_CMDS
$(INSTALL) -d -m 0755 $(TARGET_DIR)/opt/cni/bin
$(foreach d,$(CNI_PLUGINS_INSTALL_BINS),\
$(INSTALL) -D -m 0755 $(@D)/bin/$$(basename $(d)) \
$(TARGET_DIR)/opt/cni/bin
$(foreach d,$(CNI_PLUGINS_BUILD_TARGETS),\
$(INSTALL) -D -m 0755 $(@D)/bin/$(notdir $(d)) \
$(TARGET_DIR)/opt/cni/bin/$(notdir $(d))
)
endef