From dd14b451e921497c01456f51f7bdf55c08ef24cb Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 3 Jun 2026 23:04:05 -0400 Subject: [PATCH] build: Add NVMM, but commented out, to image definitions. At present, it can boot TinyCore Linux to a GUI, but a Haiku image reaches the rocket before crashing with an NVMM error, when tested under nested virtualization in VMware. (It seems my Intel device is a few generations too old and doesn't have all required features, so I wasn't able to test there.) So, some more work is still required, it seems. --- build/jam/images/definitions/regular | 1 + build/jam/packages/Haiku | 1 + build/jam/packages/HaikuDevel | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index a10fd0e612..c772b4ace3 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -129,6 +129,7 @@ rule HaikuImageGetSystemLibs libmidi.so libmidi2.so libnetwork.so + #libnvmm.so@x86_64 libpackage.so libscreensaver.so libtextencoding.so diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index 472e06025c..ae768e4be9 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -194,6 +194,7 @@ AddDriversToPackage input : AddDriversToPackage misc : poke mem + #nvmm@x86_64 ; AddDriversToPackage net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ; diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel index ed242b3c97..8c2fc4a55a 100644 --- a/build/jam/packages/HaikuDevel +++ b/build/jam/packages/HaikuDevel @@ -79,6 +79,12 @@ CopyDirectoryToPackage develop headers private libs compat : [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : : -x *.c -x Jamfile ; +CopyDirectoryToPackage develop headers private libs + : [ FDirName $(HAIKU_TOP) headers libs nvmm ] ; +CopyDirectoryToPackage develop headers private libs nvmm + : [ FDirName $(HAIKU_TOP) src add-ons kernel drivers nvmm ] + : driver : -x *.c -x *.cpp -x include -x Jamfile ; + # create be -> os symlink for now AddSymlinkToPackage develop headers : os : be ;