diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 3aa96e443f..d33f9e3356 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -7,9 +7,7 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hv-fcopy-daemon/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hv-kvp-daemon/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hv-vss-daemon/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hyperv-daemons/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/vbox-guest/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/containerd-bin/Config.in" diff --git a/deploy/iso/minikube-iso/package/hv-fcopy-daemon/Config.in b/deploy/iso/minikube-iso/package/hv-fcopy-daemon/Config.in deleted file mode 100644 index 4f5d080bae..0000000000 --- a/deploy/iso/minikube-iso/package/hv-fcopy-daemon/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_HV_FCOPY_DAEMON - bool "hv-fcopy-daemon" - default y - depends on BR2_x86_64 diff --git a/deploy/iso/minikube-iso/package/hv-fcopy-daemon/hv_fcopy_daemon.mk b/deploy/iso/minikube-iso/package/hv-fcopy-daemon/hv_fcopy_daemon.mk deleted file mode 100644 index a246f596ac..0000000000 --- a/deploy/iso/minikube-iso/package/hv-fcopy-daemon/hv_fcopy_daemon.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# hv-fcopy-daemon -# -################################################################################ - -HV_FCOPY_DAEMON_VERSION = 4.15.1 -HV_FCOPY_DAEMON_SITE = https://www.kernel.org/pub/linux/kernel/v${HV_FCOPY_DAEMON_VERSION%%.*}.x -HV_FCOPY_DAEMON_SOURCE = linux-$(HV_FCOPY_DAEMON_VERSION).tar.xz - -define HV_FCOPY_DAEMON_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/tools/hv/ -endef - -define HV_FCOPY_DAEMON_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 \ - $(@D)/tools/hv/hv_fcopy_daemon \ - $(TARGET_DIR)/usr/sbin/hv_fcopy_daemon -endef - -define HV_FCOPY_DAEMON_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 \ - $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hv-fcopy-daemon/70-hv_fcopy.rules \ - $(TARGET_DIR)/etc/udev/rules.d/70-hv_fcopy.rules - - $(INSTALL) -D -m 644 \ - $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hv-fcopy-daemon/hv_fcopy_daemon.service \ - $(TARGET_DIR)/usr/lib/systemd/system/hv_fcopy_daemon.service - - ln -fs /usr/lib/systemd/system/hv_fcopy_daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/hv-kvp-daemon/Config.in b/deploy/iso/minikube-iso/package/hv-kvp-daemon/Config.in deleted file mode 100644 index b3c164b3b8..0000000000 --- a/deploy/iso/minikube-iso/package/hv-kvp-daemon/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_HV_KVP_DAEMON - bool "hv-kvp-daemon" - default y - depends on BR2_x86_64 diff --git a/deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.mk b/deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.mk deleted file mode 100644 index 9938b8fde0..0000000000 --- a/deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# hv-kvp-daemon -# -################################################################################ - -HV_KVP_DAEMON_VERSION = 4.15.1 -HV_KVP_DAEMON_SITE = https://www.kernel.org/pub/linux/kernel/v${HV_KVP_DAEMON_VERSION%%.*}.x -HV_KVP_DAEMON_SOURCE = linux-$(HV_KVP_DAEMON_VERSION).tar.xz - -define HV_KVP_DAEMON_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/tools/hv/ -endef - -define HV_KVP_DAEMON_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 \ - $(@D)/tools/hv/hv_kvp_daemon \ - $(TARGET_DIR)/usr/sbin/hv_kvp_daemon - $(INSTALL) -D -m 0755 \ - $(@D)/tools/hv/hv_get_dhcp_info.sh \ - $(TARGET_DIR)/usr/libexec/hypervkvpd/hv_get_dhcp_info - $(INSTALL) -D -m 0755 \ - $(@D)/tools/hv/hv_get_dns_info.sh \ - $(TARGET_DIR)/usr/libexec/hypervkvpd/hv_get_dns_info - $(INSTALL) -D -m 0755 \ - $(@D)/tools/hv/hv_set_ifconfig.sh \ - $(TARGET_DIR)/usr/libexec/hypervkvpd/hv_set_ifconfig -endef - -define HV_KVP_DAEMON_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 \ - $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hv-kvp-daemon/70-hv_kvp.rules \ - $(TARGET_DIR)/etc/udev/rules.d/70-hv_kvp.rules - - $(INSTALL) -D -m 644 \ - $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hv-kvp-daemon/hv_kvp_daemon.service \ - $(TARGET_DIR)/usr/lib/systemd/system/hv_kvp_daemon.service - - ln -fs /usr/lib/systemd/system/hv_kvp_daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/hv-vss-daemon/Config.in b/deploy/iso/minikube-iso/package/hv-vss-daemon/Config.in deleted file mode 100644 index f3d91e5278..0000000000 --- a/deploy/iso/minikube-iso/package/hv-vss-daemon/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_HV_VSS_DAEMON - bool "hv-vss-daemon" - default y - depends on BR2_x86_64 diff --git a/deploy/iso/minikube-iso/package/hv-vss-daemon/hv_vss_daemon.mk b/deploy/iso/minikube-iso/package/hv-vss-daemon/hv_vss_daemon.mk deleted file mode 100644 index 7cecad18b8..0000000000 --- a/deploy/iso/minikube-iso/package/hv-vss-daemon/hv_vss_daemon.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# hv-vss-daemon -# -################################################################################ - -HV_VSS_DAEMON_VERSION = 4.15.1 -HV_VSS_DAEMON_SITE = https://www.kernel.org/pub/linux/kernel/v${HV_VSS_DAEMON_VERSION%%.*}.x -HV_VSS_DAEMON_SOURCE = linux-$(HV_VSS_DAEMON_VERSION).tar.xz - -define HV_VSS_DAEMON_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/tools/hv/ -endef - -define HV_VSS_DAEMON_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 \ - $(@D)/tools/hv/hv_vss_daemon \ - $(TARGET_DIR)/usr/sbin/hv_vss_daemon -endef - -define HV_VSS_DAEMON_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 \ - $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hv-vss-daemon/70-hv_vss.rules \ - $(TARGET_DIR)/etc/udev/rules.d/70-hv_vss.rules - - $(INSTALL) -D -m 644 \ - $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hv-vss-daemon/hv_vss_daemon.service \ - $(TARGET_DIR)/usr/lib/systemd/system/hv_vss_daemon.service - - ln -fs /usr/lib/systemd/system/hv_vss_daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/hv-fcopy-daemon/70-hv_fcopy.rules b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_fcopy.rules similarity index 100% rename from deploy/iso/minikube-iso/package/hv-fcopy-daemon/70-hv_fcopy.rules rename to deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_fcopy.rules diff --git a/deploy/iso/minikube-iso/package/hv-kvp-daemon/70-hv_kvp.rules b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_kvp.rules similarity index 100% rename from deploy/iso/minikube-iso/package/hv-kvp-daemon/70-hv_kvp.rules rename to deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_kvp.rules diff --git a/deploy/iso/minikube-iso/package/hv-vss-daemon/70-hv_vss.rules b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_vss.rules similarity index 100% rename from deploy/iso/minikube-iso/package/hv-vss-daemon/70-hv_vss.rules rename to deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_vss.rules diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in b/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in new file mode 100644 index 0000000000..834b31bdcb --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HYPERV_DAEMONS + bool "hyperv-daemons" + default y + depends on BR2_x86_64 diff --git a/deploy/iso/minikube-iso/package/hv-fcopy-daemon/hv_fcopy_daemon.service b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_fcopy_daemon.service similarity index 100% rename from deploy/iso/minikube-iso/package/hv-fcopy-daemon/hv_fcopy_daemon.service rename to deploy/iso/minikube-iso/package/hyperv-daemons/hv_fcopy_daemon.service diff --git a/deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.service b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_kvp_daemon.service similarity index 100% rename from deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.service rename to deploy/iso/minikube-iso/package/hyperv-daemons/hv_kvp_daemon.service diff --git a/deploy/iso/minikube-iso/package/hv-vss-daemon/hv_vss_daemon.service b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_vss_daemon.service similarity index 100% rename from deploy/iso/minikube-iso/package/hv-vss-daemon/hv_vss_daemon.service rename to deploy/iso/minikube-iso/package/hyperv-daemons/hv_vss_daemon.service diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk b/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk new file mode 100644 index 0000000000..d0fadf5b1c --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk @@ -0,0 +1,67 @@ +################################################################################ +# +# hyperv-daemons +# +################################################################################ + +HYPERV_DAEMONS_VERSION = 4.15.1 +HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v${HYPERV_DAEMONS_VERSION%%.*}.x +HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz + +define HYPERV_DAEMONS_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/tools/hv/ +endef + +define HYPERV_DAEMONS_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 \ + $(@D)/tools/hv/hv_fcopy_daemon \ + $(TARGET_DIR)/usr/sbin/hv_fcopy_daemon + + $(INSTALL) -D -m 0755 \ + $(@D)/tools/hv/hv_kvp_daemon \ + $(TARGET_DIR)/usr/sbin/hv_kvp_daemon + $(INSTALL) -D -m 0755 \ + $(@D)/tools/hv/hv_get_dhcp_info.sh \ + $(TARGET_DIR)/usr/libexec/hypervkvpd/hv_get_dhcp_info + $(INSTALL) -D -m 0755 \ + $(@D)/tools/hv/hv_get_dns_info.sh \ + $(TARGET_DIR)/usr/libexec/hypervkvpd/hv_get_dns_info + $(INSTALL) -D -m 0755 \ + $(@D)/tools/hv/hv_set_ifconfig.sh \ + $(TARGET_DIR)/usr/libexec/hypervkvpd/hv_set_ifconfig + + $(INSTALL) -D -m 0755 \ + $(@D)/tools/hv/hv_vss_daemon \ + $(TARGET_DIR)/usr/sbin/hv_vss_daemon +endef + +define HYPERV_DAEMONS_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 \ + $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hyperv-daemons/70-hv_fcopy.rules \ + $(TARGET_DIR)/etc/udev/rules.d/70-hv_fcopy.rules + $(INSTALL) -D -m 644 \ + $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hyperv-daemons/70-hv_kvp.rules \ + $(TARGET_DIR)/etc/udev/rules.d/70-hv_kvp.rules + $(INSTALL) -D -m 644 \ + $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hyperv-daemons/70-hv_vss.rules \ + $(TARGET_DIR)/etc/udev/rules.d/70-hv_vss.rules + + $(INSTALL) -D -m 644 \ + $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hyperv-daemons/hv_fcopy_daemon.service \ + $(TARGET_DIR)/usr/lib/systemd/system/hv_fcopy_daemon.service + $(INSTALL) -D -m 644 \ + $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hyperv-daemons/hv_kvp_daemon.service \ + $(TARGET_DIR)/usr/lib/systemd/system/hv_kvp_daemon.service + $(INSTALL) -D -m 644 \ + $(BR2_EXTERNAL_MINIKUBE_PATH)/package/hyperv-daemons/hv_vss_daemon.service \ + $(TARGET_DIR)/usr/lib/systemd/system/hv_vss_daemon.service + + ln -fs /usr/lib/systemd/system/hv_fcopy_daemon.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service + ln -fs /usr/lib/systemd/system/hv_kvp_daemon.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service + ln -fs /usr/lib/systemd/system/hv_vss_daemon.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service +endef + +$(eval $(generic-package))