From 26bd80f6f0b6e732d37aa62c860c071c6fd349ab Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Fri, 24 Sep 2021 08:33:51 +0530 Subject: [PATCH 1/4] oem-azure-pro: Add the arm64 keyword to the OEM Signed-off-by: Sayan Chowdhury --- .../coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild index 66586de476..4885a2e24f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 arm64" IUSE="" # no source directory @@ -20,7 +20,7 @@ S="${WORKDIR}" # would result in the conflict of `base.ign` RDEPEND=" ~app-emulation/wa-linux-agent-${PV} - x11-drivers/nvidia-drivers + amd64? ( x11-drivers/nvidia-drivers ) " src_prepare() { From 20be55473f3cb8018aabeab4be998beeed1ad87e Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 23 Aug 2021 16:24:24 +0000 Subject: [PATCH 2/4] coreos-base/oem-azure: refactor grub.cfg to apply console override only on PC We always want the 'flatcar.autologin' parameter, but the ttyS0 setting is x86 PC specific. Move the generic part to linux_append variable and hide the generic part behind a check for grub_platform. For EFI platforms the default grub.cfg has the correct arch specific console configuration. The console specification for grub itself is needed in either case Signed-off-by: Jeremi Piotrowski --- .../coreos-base/oem-azure-pro/files/grub.cfg | 7 ++++++- .../coreos-overlay/coreos-base/oem-azure/files/grub.cfg | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg index 5e5449f25a..9fa2f0e55c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg @@ -2,8 +2,13 @@ set oem_id="azure" +set linux_append="flatcar.autologin" + # Azure only has a serial console. -set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 flatcar.autologin" serial com0 --speed=115200 --word=8 --parity=no terminal_input serial_com0 terminal_output serial_com0 + +if [ "$grub_platform" = "pc" ]; then + set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200" +fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg index 5e5449f25a..9fa2f0e55c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg @@ -2,8 +2,13 @@ set oem_id="azure" +set linux_append="flatcar.autologin" + # Azure only has a serial console. -set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 flatcar.autologin" serial com0 --speed=115200 --word=8 --parity=no terminal_input serial_com0 terminal_output serial_com0 + +if [ "$grub_platform" = "pc" ]; then + set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200" +fi From e75a68962359f092068e7a37844d99090abc678b Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 24 Nov 2021 16:18:38 +0100 Subject: [PATCH 3/4] sys-kernel/coreos-modules: move HYPERV config options to commonconfig Kernel 5.15 contains enablement patches for linux as a hyper-v guest, so move the configs to the common config so that they're enabled for both arches. PCI patches didn't make it. Signed-off-by: Jeremi Piotrowski --- .../sys-kernel/coreos-modules/files/amd64_defconfig-5.15 | 6 ------ .../sys-kernel/coreos-modules/files/commonconfig-5.15 | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 index 4d23e37143..625fac72f8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 @@ -41,7 +41,6 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_SBRIDGE=m CONFIG_EDAC_X38=m CONFIG_EFI_VARS=m -CONFIG_FB_HYPERV=m CONFIG_FB_VESA=y CONFIG_FCOE_FNIC=m CONFIG_FTRACE_SYSCALLS=y @@ -50,17 +49,12 @@ CONFIG_GART_IOMMU=y CONFIG_HANGCHECK_TIMER=m CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_HID=m -CONFIG_HID_HYPERV_MOUSE=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HPET=y CONFIG_HW_RANDOM_AMD=y CONFIG_HW_RANDOM_INTEL=y CONFIG_HW_RANDOM_VIA=y -CONFIG_HYPERV=m CONFIG_HYPERVISOR_GUEST=y -CONFIG_HYPERV_BALLOON=m -CONFIG_HYPERV_NET=m -CONFIG_HYPERV_UTILS=m CONFIG_IA32_EMULATION=y CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USNIC=m diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 index 58ba46ab8d..24ef5ab99e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 @@ -183,6 +183,7 @@ CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FB=y CONFIG_FB_EFI=y +CONFIG_FB_HYPERV=m CONFIG_FCOE=m # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_FORCEDETH=m @@ -213,6 +214,7 @@ CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_EZKEY=m +CONFIG_HID_HYPERV_MOUSE=m CONFIG_HID_LOGITECH=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m @@ -226,6 +228,10 @@ CONFIG_HWMON=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_HYPERV=m +CONFIG_HYPERV_BALLOON=m +CONFIG_HYPERV_NET=m +CONFIG_HYPERV_UTILS=m CONFIG_HZ_1000=y CONFIG_I2C_AMD756=m CONFIG_I2C_AMD8111=m From ace70601c4e64c9c704d44dd12280f5f1e65d3c6 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 1 Dec 2021 09:24:43 +0000 Subject: [PATCH 4/4] sys-kernel/coreos-modules: enable Microsoft MANA driver for amd64 New networking driver present in 5.15 that might be useful some day. Signed-off-by: Jeremi Piotrowski --- .../sys-kernel/coreos-modules/files/amd64_defconfig-5.15 | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 index 625fac72f8..e9b5d8a28f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 @@ -81,6 +81,7 @@ CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_MEM_SOFT_DIRTY=y CONFIG_MICROCODE_AMD=y +CONFIG_MICROSOFT_MANA=m CONFIG_MLXSW_CORE=m CONFIG_MLXSW_SPECTRUM=m CONFIG_MMC_SDHCI_ACPI=m