ignore __MAC resources for the OUTPUT EFI

Author: rusty-bits

src/build.rs

@@ -270,7 +270,7 @@ pub fn build_output(
     if missing_files.len() > 0 {
         write!(
             stdout,
-            "\x1B[31;7mWARNING:\x1B[0m the following file(s) are unknown by octool\x1B[33m\r\n"
+            "\x1B[31;7mWARNING:\x1B[0m the following file(s) are missing or unknown by octool\x1B[33m\r\n"
         )?;
         for f in missing_files.iter() {
             write!(stdout, "{}\x1B[0K\r\n", f)?;
@@ -279,6 +279,8 @@ pub fn build_output(
             stdout,
             "\x1B[31mIf you want octool to include them automatically,\r\n\
             they need to be placed in the \x1B[32mINPUT\x1B[31m folder before building.\r\n\
+            If you feel octool should know this file, then there may be an issue with the\r\n\
+            resources folder.  You can delete that folder and try running octool again.\r\n\
             Otherwise, they will need to be placed into your EFI manually\x1B[0m\r\n\n"
         )?;
         stdout.flush()?;

src/res.rs

@@ -425,6 +425,9 @@ pub fn show_res_info(resources: &mut Resources, settings: &mut Settings, stdout:
                 .into_iter()
                 .filter_map(Result::ok)
             {
+                if entry.path().to_string_lossy().contains("_MAC") { //ignore
+                    continue;
+                }
                 let f_name = String::from(entry.file_name().to_string_lossy());
                 if f_name == ind_res {
                     out = Some(entry);
@@ -695,6 +698,9 @@ pub fn get_res_path(
                 .into_iter()
                 .filter_map(Result::ok)
             {
+                if entry.path().to_string_lossy().contains("_MAC") { //ignore
+                    continue;
+                }
                 let f_name = String::from(entry.file_name().to_string_lossy());
                 if f_name == ind_res {
                     out = Some(entry);

tool_config_files/octool_config.json

@@ -32,7 +32,7 @@
   "reset_res_versions": true,
 
   "//comm_clob_local": "replace local res list with updated list when octool is run",
-  "clobber_local_dyn_res_list": true,
+  "clobber_local_dyn_res_list": false,
 
   "//comm_use_latest": "use latest version of OpenCore that fits the format of the config.plist being used",
   "use_latest_oc_on_guess": true,

tool_config_files/other.json

@@ -110,5 +110,24 @@
         }
       }
     ]
+  },
+  "VoodooSMBus": {
+          "versions": [
+                  {
+                          "version": "2.2",
+                          "links": {
+                                  "debug": "https://github.com/VoodooSMBus/VoodooSMBus/releases/download/v2.2/VoodooSMBus-v2.2.zip",
+                                  "release": "https://github.com/VoodooSMBus/VoodooSMBus/releases/download/v2.2/VoodooSMBus-v2.2.zip"
+                          },
+                          "hashes": {
+                                  "debug": {
+                                          "sha256": "a65d68b112ef89e262cb713af1f821d7eaa5978d3ef1a47f9d4d2338cbc6aa8e"
+                                  },
+                                  "release": {
+                                          "sha256": "a65d68b112ef89e262cb713af1f821d7eaa5978d3ef1a47f9d4d2338cbc6aa8e"
+                                  }
+                          }
+                  }
+          ]
   }
 }

tool_config_files/resource_list.json

@@ -451,6 +451,9 @@
   "VoodooRMI.kext": {
     "parent": "VoodooRMI"
   },
+  "VoodooSMBus.kext": {
+          "parent": "VoodooSMBus"
+  },
   "RMII2C.kext": {
     "parent": "VoodooRMI"
   },