From 3a5aebe9b713e9420c510946e88dbc1cc7cd5771 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Thu, 12 Sep 2024 10:28:31 +0200 Subject: [PATCH] hv-daemons: use symlink, add to kernel update workflow Signed-off-by: Thilo Fromm --- .github/workflows/kernel-apply-patch.sh | 9 +++++++-- .../app-emulation/hv-daemons/hv-daemons-6.6.50.ebuild | 1 + .../{hv-daemons-6.6.48.ebuild => hv-daemons-9999.ebuild} | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.50.ebuild rename sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/{hv-daemons-6.6.48.ebuild => hv-daemons-9999.ebuild} (93%) diff --git a/.github/workflows/kernel-apply-patch.sh b/.github/workflows/kernel-apply-patch.sh index 560e8e7e98f..b84837a070b 100755 --- 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/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.50.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.50.ebuild new file mode 120000 index 00000000000..95dcc24d68a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.50.ebuild @@ -0,0 +1 @@ +hv-daemons-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.48.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-9999.ebuild similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.48.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-9999.ebuild index eac339d8bfe..9b6b44dba91 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.48.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/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