Simplify kernel directory logic and rework hv-daemons #3565

chewi · 2025-12-15T10:13:12Z

Simplify kernel directory logic and rework hv-daemons

Having too many variables is confusing, so use the ones already provided by upstream. linux-info.eclass uses KERNEL_DIR (if set) as the kernel sources directory and sets KV_DIR to that for use elsewhere. If KERNEL_DIR is unset, it checks the /usr/src/linux symlink. While we could rely on the symlink, we want to be sure that coreos-modules and coreos-kernel are built against the matching kernel version.

KV_OUT_DIR is the kernel output directory. It is automatically set by linux-info.eclass, and it will never leave it empty.

I'd like to follow up these changes with a rename of sys-kernel/coreos-* to flatcar, but I'll do that in a separate step.

hv-daemons essentially a standalone userspace project that happens to live within the kernel sources. It should not be built like the kernel.

How to use

Nothing to use. These are purely build changes.

Testing done

I have built an image manually. Jenkins CI entirely passed with a run that included azure.

Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update) -- N/A
Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.12.61.ebuild

github-actions · 2025-12-15T18:56:12Z

Test report for 4547.0.0+nightly-20251212-2100 / amd64 arm64

Platforms tested : qemu_uefi-amd64 qemu_update-amd64 qemu_uefi-arm64 qemu_update-arm64

bpf.execsnoop 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

bpf.local-gadget 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.basic 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.cloudinit.basic 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.cloudinit.multipart-mime 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.cloudinit.script 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.disk.raid0.data 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.disk.raid0.root 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.disk.raid1.data 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.disk.raid1.root 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.etcd-member.discovery 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.etcd-member.etcdctlv3 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.etcd-member.v2-backup-restore 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.filesystem 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.flannel.udp 🟢 Succeeded: qemu_uefi-amd64 (1)

cl.flannel.vxlan 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.instantiated.enable-unit 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.kargs 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.luks 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.oem.indirect 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.oem.indirect.new 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.oem.regular 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.oem.regular.new 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.oem.reuse 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.oem.wipe 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.partition_on_boot_disk 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.symlink 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.translation 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v1.btrfsroot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v1.ext4root 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v1.groups 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v1.once 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v1.sethostname 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v1.users 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v1.xfsroot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v2.btrfsroot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v2.ext4root 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v2.users 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v2.xfsroot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v2_1.ext4checkexisting 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v2_1.swap 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.ignition.v2_1.vfat 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.install.cloudinit 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.internet 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.locksmith.cluster 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.network.initramfs.second-boot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.network.iptables 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.network.listeners 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.network.nftables 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.network.wireguard 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.omaha.ping 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.osreset.ignition-rerun 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.overlay.cleanup 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.swap_activation 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.sysext.boot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.sysext.fallbackdownload # SKIP 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tang.nonroot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tang.root 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.toolbox.dnf-install 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tpm.eventlog 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tpm.nonroot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tpm.root 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tpm.root-cryptenroll 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tpm.root-cryptenroll-pcr-noupdate 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.tpm.root-cryptenroll-pcr-withupdate 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.update.badverity 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.update.payload 🟢 Succeeded: qemu_update-amd64 (1); qemu_update-arm64 (1)

cl.update.payload-boot-part-too-small 🟢 Succeeded: qemu_update-amd64 (1); qemu_update-arm64 (1)

cl.update.reboot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.users.shells 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

cl.verity 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.auth.verify 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.groups 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.once 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.resource.local 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.resource.remote 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.resource.s3.versioned 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.security.tls 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.sethostname 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.ignition.systemd.enable-service 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.locksmith.reboot 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.locksmith.tls 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.selinux.boolean 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.selinux.enforce 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.tls.fetch-urls 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

coreos.update.badusr 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

devcontainer.docker 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

devcontainer.systemd-nspawn 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.btrfs-storage 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.containerd-restart 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.enable-service.sysext 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.lib-coreos-dockerd-compat 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.network-openbsd-nc 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.selinux 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

docker.userns 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

extra-test.[first_dual].cl.update.docker-btrfs-compat 🟢 Succeeded: qemu_update-amd64 (1, 2, 3, 4, 5); qemu_update-arm64 (1, 2, 3, 4, 5)

extra-test.[first_dual].cl.update.oem ❌ Failed: qemu_update-amd64 (1, 2, 3, 4, 5); qemu_update-arm64 (1, 2, 3, 4, 5)

Diagnostic output for qemu_update-arm64, run 5

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-amd64, run 5

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-arm64, run 4

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-amd64, run 4

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-arm64, run 3

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-amd64, run 3

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-arm64, run 2

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-amd64, run 2

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-arm64, run 1

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

Diagnostic output for qemu_update-amd64, run 1

    L1: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L2: "update.go:428: Triggering update_engine"
    L3: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L4: " "
    L5: " Error: _cluster.go:125: Created symlink /etc/systemd/system/locksmithd.service ??? /dev/null."
    L6: "update.go:428: Triggering update_engine"
    L7: "update.go:444: waiting for UPDATE_STATUS_UPDATED_NEED_REBOOT: time limit exceeded_"
    L8: " "

extra-test.[first_dual].cl.update.payload 🟢 Succeeded: qemu_update-amd64 (1, 2, 3, 4, 5); qemu_update-arm64 (1, 2, 3, 4, 5)

extra-test.[first_dual].cl.update.payload-boot-part-too-small 🟢 Succeeded: qemu_update-amd64 (1, 2, 3, 4, 5); qemu_update-arm64 (1, 2, 3, 4, 5)

kubeadm.v1.32.4.calico.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.32.4.cilium.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.32.4.flannel.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.33.0.calico.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.33.0.cilium.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.33.0.flannel.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.34.1.calico.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.34.1.cilium.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

kubeadm.v1.34.1.flannel.base 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

linux.nfs.v3 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

linux.nfs.v4 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

linux.ntp 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

misc.fips 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

packages 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

sysext.custom-docker.sysext 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

sysext.custom-oem 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

sysext.disable-containerd 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

sysext.disable-docker 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

sysext.simple 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

systemd.journal.remote 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

systemd.journal.user 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

systemd.sysusers.gshadow 🟢 Succeeded: qemu_uefi-amd64 (1); qemu_uefi-arm64 (1)

ader1990

Tested locally with AMD64 Hyper-V both generations, everything working as expected (vss and kvp daemons). Networking data is also present in the Hyper-V Manager.

Having too many variables is confusing, so use the ones already provided by upstream. linux-info.eclass uses KERNEL_DIR (if set) as the kernel sources directory and sets KV_DIR to that for use elsewhere. If KERNEL_DIR is unset, it checks the /usr/src/linux symlink. While we could rely on the symlink, we want to be sure that coreos-modules and coreos-kernel are built against the matching kernel version. KV_OUT_DIR is the kernel output directory. It is automatically set by linux-info.eclass, and it will never leave it empty. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

It doesn't make any sense because there is no 9999 version of coreos-sources. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

It's essentially a standalone userspace project that happens to live within the kernel sources. It should not be built like the kernel. hv_fcopy_daemon was dropped upstream. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

The hv-daemons package has been adjusted instead. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

It's unnecessary and looks weird. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

tormath1 · 2025-12-22T09:51:40Z

Thanks for this PR, I think it needs a follow-up item to update the automation here:

scripts/.github/workflows/kernel-apply-patch.sh

Lines 40 to 46 in b1e362e

    
           if [[ -d app-emulation/hv-daemons ]]; then 
        
               # Update hyperv daemons ebuild soft-link to reflect new kernel version 
        
               find -D exec app-emulation/hv-daemons/ -type l -exec rm '{}' \; 
        
               ln --relative -s app-emulation/hv-daemons/hv-daemons-9999.ebuild \ 
        
                     app-emulation/hv-daemons/hv-daemons-${VERSION_NEW}.ebuild 
        
               extra_pkgs+=( app-emulation/hv-daemons ) 
        
           fi

This currently breaks the CI: #3589

Should we just copy the "previous" ebuild to the "new" ebuild?

chewi · 2025-12-22T09:59:30Z

Am I right in thinking the GHA job is kicked off from main but kernel-apply-patch.sh is run from each branch?

tormath1 · 2025-12-22T10:11:05Z

Am I right in thinking the GHA job is kicked off from main but kernel-apply-patch.sh is run from each branch?

Yes, I think as it fails on main only.

chewi self-assigned this Dec 15, 2025

chewi requested a review from a team as a code owner December 15, 2025 10:13

chewi had a problem deploying to development December 15, 2025 10:13 — with GitHub Actions Error

ader1990 reviewed Dec 15, 2025

View reviewed changes

sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.12.61.ebuild Outdated Show resolved Hide resolved

chewi force-pushed the chewi/kernel-dir branch from f6b334d to 70603eb Compare December 15, 2025 12:45

chewi temporarily deployed to development December 15, 2025 12:45 — with GitHub Actions Inactive

ader1990 approved these changes Dec 16, 2025

View reviewed changes

chewi added 5 commits December 16, 2025 12:01

app-emulation/hv-daemons: Drop 9999 ebuild

3d1a2a4

It doesn't make any sense because there is no 9999 version of coreos-sources. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

app-emulation/hv-daemons: Don't use kmake to build this

71930b7

It's essentially a standalone userspace project that happens to live within the kernel sources. It should not be built like the kernel. hv_fcopy_daemon was dropped upstream. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

sys-kernel/coreos-sources: Drop unnecessary arm64 tools patch

102ffc8

The hv-daemons package has been adjusted instead. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

sys-kernel/coreos-sources: Don't add backslashes to UNIPATCH_LIST

5a0e40a

It's unnecessary and looks weird. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

chewi force-pushed the chewi/kernel-dir branch from 70603eb to 5a0e40a Compare December 16, 2025 12:02

chewi requested a deployment to development December 16, 2025 12:02 — with GitHub Actions Waiting

chewi merged commit 2814ccc into main Dec 16, 2025
1 of 5 checks passed

chewi deleted the chewi/kernel-dir branch December 16, 2025 13:52

github-actions bot mentioned this pull request Dec 22, 2025

Monthly contributions report 2025-11-22 - 2025-12-21 flatcar/Flatcar#1981

Open

chewi mentioned this pull request Dec 22, 2025

github: Fix and simplify kernel-apply-patch.sh regarding hv-daemons #3592

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Simplify kernel directory logic and rework hv-daemons #3565

Simplify kernel directory logic and rework hv-daemons #3565

Uh oh!

chewi commented Dec 15, 2025

Uh oh!

Uh oh!

github-actions bot commented Dec 15, 2025

Uh oh!

ader1990 left a comment

Uh oh!

Uh oh!

tormath1 commented Dec 22, 2025

Uh oh!

chewi commented Dec 22, 2025

Uh oh!

tormath1 commented Dec 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Simplify kernel directory logic and rework hv-daemons #3565

Simplify kernel directory logic and rework hv-daemons #3565

Uh oh!

Conversation

chewi commented Dec 15, 2025

Simplify kernel directory logic and rework hv-daemons

How to use

Testing done

Uh oh!

Uh oh!

github-actions bot commented Dec 15, 2025

Test report for 4547.0.0+nightly-20251212-2100 / amd64 arm64

Uh oh!

ader1990 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tormath1 commented Dec 22, 2025

Uh oh!

chewi commented Dec 22, 2025

Uh oh!

tormath1 commented Dec 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants