From: John Wolfe Date: Tue, 21 Dec 2021 20:48:50 +0000 (-0800) Subject: Adding Alma and Rocky Linux for x86 and Arm architectures. X-Git-Tag: stable-12.0.0~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d33c816998b8680b67b39a096f44e95d5019e1ab;p=thirdparty%2Fopen-vm-tools.git Adding Alma and Rocky Linux for x86 and Arm architectures. --- diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h index d38d6886f..acf7485c5 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h @@ -223,16 +223,18 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define ALL5XLINUX64 BS(OTHER5XLINUX_64), BS(OTHER5XLINUX_ARM_64), \ BS(DEBIAN_ARM_64), BS(UBUNTU_ARM_64), \ - BS(RHEL9_64), BS(RHEL9_ARM_64) + BS(RHEL9_64), BS(RHEL9_ARM_64), \ + BS(ROCKY_LINUX_64), BS(ROCKY_LINUX_ARM_64), \ + BS(ALMA_LINUX_64), BS(ALMA_LINUX_ARM_64) #define ALL6XLINUX32 BS(OTHER6XLINUX) #define ALL6XLINUX64 BS(OTHER6XLINUX_64), BS(OTHER6XLINUX_ARM_64) -#define ALLVMKERNEL BS(VMKERNEL), BS(VMKERNEL5), BS(VMKERNEL6), \ - BS(VMKERNEL65), \ - BS(VMKERNEL7), BS(VMKERNEL7_ARM), \ - BS(VMKERNEL8), BS(VMKERNEL8_ARM) +#define ALLVMKERNEL BS(VMKERNEL), BS(VMKERNEL5), \ + BS(VMKERNEL6), BS(VMKERNEL65), \ + BS(VMKERNEL7), BS(VMKERNEL7_ARM), \ + BS(VMKERNEL8), BS(VMKERNEL8_ARM) #define ALLLINUX32 BS(VMKERNEL), BS(OTHERLINUX), \ BS(OTHER24XLINUX), ALL26XLINUX32, \ @@ -277,18 +279,16 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); BS(VMKERNEL7_ARM), BS(VMKERNEL8_ARM), \ BS(OTHER_ARM_64), BS(OTHER5XLINUX_ARM_64), \ BS(OTHER6XLINUX_ARM_64), BS(DEBIAN_ARM_64), \ - BS(FREEBSD13_ARM_64), BS(FREEBSD14_ARM_64) + BS(FREEBSD13_ARM_64), BS(FREEBSD14_ARM_64), \ + BS(ALMA_LINUX_ARM_64), BS(ROCKY_LINUX_ARM_64) -/* - * These constants are generated by GuestInfoGetOSName which is in - * the bora-vmsoft subtree. - */ +#define STR_OS_ARM_PREFIX "arm-" /* vmkernel (ESX) */ #define STR_OS_VMKERNEL "vmkernel" -#define STR_OS_ARM_VMKERNEL "arm-vmkernel" /* Linux */ +#define STR_OS_ALMA_LINUX "almaLinux" #define STR_OS_AMAZON_LINUX "amazonlinux" #define STR_OS_ANNVIX "Annvix" #define STR_OS_ARCH "Arch" @@ -302,9 +302,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_COBALT "Cobalt" #define STR_OS_CONECTIVA "Conectiva" #define STR_OS_DEBIAN "debian" -#define STR_OS_ARM_DEBIAN "arm-debian" #define STR_OS_FEDORA "Fedora" -#define STR_OS_ARM_FEDORA "arm-Fedora" #define STR_OS_FLATCAR "flatcar" #define STR_OS_GENTOO "Gentoo" #define STR_OS_IMMUNIX "Immunix" @@ -324,7 +322,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_OTHER_LINUX_FULL "Other Linux" #define STR_OS_OTHER "other" #define STR_OS_OTHER_FULL "Other OSes" -#define STR_OS_ARM_OTHER "arm-other" #define STR_OS_ARM_OTHER_FULL "Other OSes Arm" #define STR_OS_OTHER_LINUX "otherlinux" #define STR_OS_OTHER_LINUXFULL "Other Linux" @@ -340,18 +337,15 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_OTHER_5X_FULL "Other Linux 5.x kernel" #define STR_OS_OTHER_6X "other6xlinux" #define STR_OS_OTHER_6X_FULL "Other Linux 6.x and later kernel" -#define STR_OS_ARM_OTHER_5X "arm-other5xlinux" #define STR_OS_ARM_OTHER_5X_FULL "Other Linux 5.x kernel Arm" -#define STR_OS_ARM_OTHER_6X "arm-other6xlinux" #define STR_OS_ARM_OTHER_6X_FULL "Other Linux 6.x and later kernel Arm" #define STR_OS_PHOTON "vmware-photon" -#define STR_OS_ARM_PHOTON "arm-vmware-photon" #define STR_OS_PHOTON_FULL "VMware Photon OS" #define STR_OS_PLD "PLD" #define STR_OS_RED_HAT "redhat" #define STR_OS_RED_HAT_EN "rhel" -#define STR_OS_ARM_RED_HAT_EN "arm-rhel" #define STR_OS_RED_HAT_FULL "Red Hat Linux" +#define STR_OS_ROCKY_LINUX "rockyLinux" #define STR_OS_SLACKWARE "Slackware" #define STR_OS_SLES "sles" #define STR_OS_SUSE "suse" @@ -364,7 +358,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_TURBO "turbolinux" #define STR_OS_TURBO_FULL "Turbolinux" #define STR_OS_UBUNTU "ubuntu" -#define STR_OS_ARM_UBUNTU "arm-ubuntu" #define STR_OS_ULTRAPENGUIN "UltraPenguin" #define STR_OS_UNITEDLINUX "UnitedLinux" #define STR_OS_VALINUX "VALinux" @@ -495,8 +488,10 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* Windows 7 */ -#define STR_OS_WIN_SEVEN "windows7" -#define STR_OS_WIN_SEVEN_X64 "windows7-64" +#define STR_OS_WINDOWS "windows" + +#define STR_OS_WIN_SEVEN STR_OS_WINDOWS "7" +#define STR_OS_WIN_SEVEN_X64 STR_OS_WINDOWS "7-64" #define STR_OS_WIN_SEVEN_GENERIC "Windows 7" #define STR_OS_WIN_SEVEN_STARTER_FULL "Windows 7 Starter" @@ -508,7 +503,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* Windows Server 2008 R2 (based on Windows 7) */ -#define STR_OS_WIN_2008R2_X64 "windows7srv-64" +#define STR_OS_WIN_2008R2_X64 STR_OS_WINDOWS "7srv-64" #define STR_OS_WIN_2008R2_FOUNDATION_FULL "Windows Server 2008 R2 Foundation Edition" #define STR_OS_WIN_2008R2_STANDARD_FULL "Windows Server 2008 R2 Standard Edition" @@ -518,8 +513,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* Windows 8 */ -#define STR_OS_WIN_EIGHT "windows8" -#define STR_OS_WIN_EIGHT_X64 "windows8-64" +#define STR_OS_WIN_EIGHT STR_OS_WINDOWS "8" +#define STR_OS_WIN_EIGHT_X64 STR_OS_WINDOWS "8-64" #define STR_OS_WIN_EIGHT_GENERIC_FULL "Windows 8%s" #define STR_OS_WIN_EIGHTSERVER_GENERIC_FULL "Windows Server%s 2012" @@ -530,7 +525,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* Windows Server 2012 */ -#define STR_OS_WIN_EIGHTSERVER_X64 "windows8srv-64" +#define STR_OS_WIN_EIGHTSERVER_X64 STR_OS_WINDOWS "8srv-64" #define STR_OS_WIN_2012_FOUNDATION_FULL "Windows Server 2012%s Foundation Edition" #define STR_OS_WIN_2012_ESSENTIALS_FULL "Windows Server 2012%s Essentials Edition" @@ -549,8 +544,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); * Window on Arm support starts with Windows 10. */ -#define STR_OS_ARM_WIN "arm-windows" - /* * Windows 10 * @@ -559,8 +552,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); * Windows 10 to ensure that things continue to work. */ -#define STR_OS_WIN_10 "windows9" -#define STR_OS_WIN_10_X64 "windows9-64" +#define STR_OS_WIN_10 STR_OS_WINDOWS "9" +#define STR_OS_WIN_10_X64 STR_OS_WINDOWS "9-64" #define STR_OS_WIN_10_GENERIC_FULL "Windows 10" #define STR_OS_WIN_10_HOME_FULL "Windows 10 Home" @@ -572,13 +565,10 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* * Windows 11 - * - * No 32-bit support. */ -#define STR_OS_WIN_11 "windows11" -#define STR_OS_WIN_11_X64 "windows11-64" - +#define STR_OS_WIN_11 STR_OS_WINDOWS "11" +#define STR_OS_WIN_11_X64 STR_OS_WINDOWS "11-64" #define STR_OS_WIN_11_GENERIC_FULL "Windows 11" #define STR_OS_WIN_11_HOME_FULL "Windows 11 Home" @@ -590,30 +580,28 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* * Windows 12 - * - * No 32-bit support. */ -#define STR_OS_WIN_12 "windows12" -#define STR_OS_WIN_12_X64 "windows12-64" +#define STR_OS_WIN_12 STR_OS_WINDOWS "12" +#define STR_OS_WIN_12_X64 STR_OS_WINDOWS "12-64" /* No full names known yet */ /* Windows Server 2016 */ -#define STR_OS_WIN_2016SRV_X64 "windows9srv-64" +#define STR_OS_WIN_2016SRV_X64 STR_OS_WINDOWS "9srv-64" /* Windows Server 2019 */ -#define STR_OS_WIN_2019SRV_X64 "windows2019srv-64" +#define STR_OS_WIN_2019SRV_X64 STR_OS_WINDOWS "2019srv-64" /* Windows Server 2022 */ -#define STR_OS_WIN_2022SRV_X64 "windows2019srvNext-64" +#define STR_OS_WIN_2022SRV_X64 STR_OS_WINDOWS "2019srvNext-64" /* Windows Server 2025 */ -#define STR_OS_WIN_2025SRV_X64 "windows2022srvNext-64" +#define STR_OS_WIN_2025SRV_X64 STR_OS_WINDOWS "2022srvNext-64" /* THIS SPACE FOR RENT (Windows 10 and later official server variant names) */ @@ -638,7 +626,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); /* FreeBSD */ #define STR_OS_FREEBSD "freeBSD" -#define STR_OS_ARM_FREEBSD "arm-freeBSD" /* Solaris */ #define STR_OS_SOLARIS "solaris" diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index c51d856d1..ebb8b756a 100644 --- a/open-vm-tools/lib/include/guest_os_tables.h +++ b/open-vm-tools/lib/include/guest_os_tables.h @@ -169,7 +169,11 @@ extern "C" { GOT(GUEST_OS_AMAZONLINUX3_64) \ GOT(GUEST_OS_CRXSYS1_64) /* VMware CRX system VM 1.0 64-bit */ \ GOT(GUEST_OS_CRXPOD1_64) /* VMware CRX pod VM 1.0 64-bit */ \ - GOT(GUEST_OS_LINUX_MINT_64) + GOT(GUEST_OS_LINUX_MINT_64) \ + GOT(GUEST_OS_ROCKY_LINUX_64) \ + GOT(GUEST_OS_ROCKY_LINUX_ARM_64) \ + GOT(GUEST_OS_ALMA_LINUX_64) \ + GOT(GUEST_OS_ALMA_LINUX_ARM_64) /* diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c index 2d873b093..f27fb463a 100644 --- a/open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c @@ -905,7 +905,7 @@ static const char * HostinfoArchString(void) { #if defined(VM_ARM_ANY) - return "arm-"; + return STR_OS_ARM_PREFIX; #elif defined(VM_X86_ANY) return ""; #else