Merge pull request #1802 from flatcar-linux/coreos-overlay

GCP gVNIC support
flatcar-archive · Apr 20, 2022 · 899e8de · 899e8de
2 parents 4ce048f + a194e12
commit 899e8de
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/changelog/changes/2022-04-07-google-gve.md b/changelog/changes/2022-04-07-google-gve.md
@@ -0,0 +1 @@
+- GCE: Enabled GVE kernel driver, which adds support for Google Virtual NIC on GCP ([PR#1802](https://github.com/flatcar-linux/coreos-overlay/pull/1802))
diff --git a/...coreos-init/coreos-init-0.0.1-r174.ebuild → ...coreos-init/coreos-init-0.0.1-r175.ebuild b/...coreos-init/coreos-init-0.0.1-r174.ebuild → ...coreos-init/coreos-init-0.0.1-r175.ebuild
diff --git a/coreos-base/coreos-init/coreos-init-9999.ebuild b/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="656181fd8e80fd10f44b8e0ec64998cfd1ff8901" # flatcar-master
+	CROS_WORKON_COMMIT="538e67b821846b788dab5563203d9ce9dba5c0cf" # flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 

diff --git a/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 b/sys-kernel/coreos-modules/files/amd64_defconfig-5.15
@@ -46,6 +46,7 @@ CONFIG_FCOE_FNIC=m
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_GART_IOMMU=y
+CONFIG_GVE=m
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_HID=m
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- GCE: Enabled GVE kernel driver, which adds support for Google Virtual NIC on GCP ([PR#1802](https://github.com/flatcar-linux/coreos-overlay/pull/1802))