diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 2205935bac97..d33f9e33565a 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -7,7 +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-kvp-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-kvp-daemon/Config.in b/deploy/iso/minikube-iso/package/hv-kvp-daemon/Config.in deleted file mode 100644 index b3c164b3b85f..000000000000 --- 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 632bf36fc30c..000000000000 --- a/deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# hv-kvp-daemon -# -################################################################################ - -HV_KVP_DAEMON_VERSION = 4.4.27 -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 -endef - -define HV_KVP_DAEMON_INSTALL_INIT_SYSTEMD - $(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-kvp-daemon/hv_kvp_daemon.service b/deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.service deleted file mode 100644 index 8dc1336cfdd6..000000000000 --- a/deploy/iso/minikube-iso/package/hv-kvp-daemon/hv_kvp_daemon.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Hyper-V Key Value Pair Daemon -Documentation=https://technet.microsoft.com/en-us/library/dn798287(v=ws.11).aspx -ConditionVirtualization=microsoft - - -[Service] -Type=simple -Restart=always -RestartSec=3 - -ExecStart=/usr/sbin/hv_kvp_daemon -n - -[Install] -WantedBy=multi-user.target diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_fcopy.rules b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_fcopy.rules new file mode 100644 index 000000000000..a186817c38f6 --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_fcopy.rules @@ -0,0 +1 @@ +SUBSYSTEM=="misc", KERNEL=="vmbus/hv_fcopy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hv_fcopy_daemon.service" diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_kvp.rules b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_kvp.rules new file mode 100644 index 000000000000..7193fdda4593 --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_kvp.rules @@ -0,0 +1 @@ +SUBSYSTEM=="misc", KERNEL=="vmbus/hv_kvp", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hv_kvp_daemon.service" diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_vss.rules b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_vss.rules new file mode 100644 index 000000000000..1274dec1ebc9 --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_vss.rules @@ -0,0 +1 @@ +SUBSYSTEM=="misc", KERNEL=="vmbus/hv_vss", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hv_vss_daemon.service" 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 000000000000..834b31bdcb64 --- /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/hyperv-daemons/hv_fcopy_daemon.service b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_fcopy_daemon.service new file mode 100644 index 000000000000..88fed6f5ada0 --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_fcopy_daemon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Hyper-V FCOPY Daemon +Documentation=https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/integration-services#hyper-v-guest-service-interface +BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device + +[Service] +ExecStart=/usr/sbin/hv_fcopy_daemon -n + +[Install] +WantedBy=multi-user.target diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hv_kvp_daemon.service b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_kvp_daemon.service new file mode 100644 index 000000000000..6cd7e9d6c127 --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_kvp_daemon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Hyper-V Key Value Pair Daemon +Documentation=https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/integration-services#hyper-v-data-exchange-service-kvp +BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device + +[Service] +ExecStart=/usr/sbin/hv_kvp_daemon -n + +[Install] +WantedBy=multi-user.target diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hv_vss_daemon.service b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_vss_daemon.service new file mode 100644 index 000000000000..d12aa1dded2c --- /dev/null +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/hv_vss_daemon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Hyper-V VSS Daemon +Documentation=https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/integration-services#hyper-v-volume-shadow-copy-requestor +BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device + +[Service] +ExecStart=/usr/sbin/hv_vss_daemon -n + +[Install] +WantedBy=multi-user.target 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 000000000000..d0fadf5b1c72 --- /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))