hv-daemons: use symlink, add to kernel update workflow

Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
flatcar · Sep 12, 2024 · 3a5aebe · 3a5aebe
1 parent d8a6288
commit 3a5aebe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/kernel-apply-patch.sh b/.github/workflows/kernel-apply-patch.sh
@@ -31,7 +31,11 @@ for pkg in sources modules kernel; do
     popd
 done
 
-popd
+# Update hyperv daemons ebuild soft-link to reflect new kernel version
+find -D exec app-emulation/hv-daemons/ -type l -exec rm '{}' \;
+ln -s app-emulation/hv-daemons/hv-daemons-9999.ebuild \
+	  app-emulation/hv-daemons/hv-daemons-${VERSION_NEW}.ebuild
+
 
 function get_lwn_link() {
     local LINUX_VERSION="${1}"; shift
@@ -72,7 +76,8 @@ generate_update_changelog 'Linux' "${VERSION_NEW}" "${URL}" 'linux' "${OLD_VERSI
 
 commit_changes sys-kernel/coreos-sources "${VERSION_OLD}" "${VERSION_NEW}" \
                sys-kernel/coreos-modules \
-               sys-kernel/coreos-kernel
+               sys-kernel/coreos-kernel \
+               app-emulation/hv-daemons
 
 cleanup_repo
 

diff --git a/...ontainer/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.50.ebuild b/...ontainer/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.50.ebuild
@@ -0,0 +1 @@
+hv-daemons-9999.ebuild
diff --git a/...ation/hv-daemons/hv-daemons-6.6.48.ebuild → ...ulation/hv-daemons/hv-daemons-9999.ebuild b/...ation/hv-daemons/hv-daemons-6.6.48.ebuild → ...ulation/hv-daemons/hv-daemons-9999.ebuild
@@ -2,11 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit coreos-kernel savedconfig systemd
 
 DESCRIPTION="HyperV guest support daemons."
 KEYWORDS="amd64 arm64"
 
+if [[ "${PV}" == 9999 ]]; then
+    KEYWORDS="~amd64 ~arm64"
+fi
+
 src_compile() {
     # Build hv_vss_daemon, hv_kvp_daemon, hv_fcopy_daemon 
     kmake tools/hv