From 60f240303ad8d4c759ef186dcbafa571b510c5fa Mon Sep 17 00:00:00 2001
From: Pat Somaru <patso@likewhatevs.io>
Date: Wed, 27 Nov 2024 01:12:09 -0500
Subject: [PATCH] misc package path cleanup and disable build_id

(cherry picked from commit 31c6c7089dfa0330c505f515cd72362266920e91)
---
 rust/scx_utils/src/lib.rs         |  4 ++--
 scheds/rust/scx_rusty/src/main.rs | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rust/scx_utils/src/lib.rs b/rust/scx_utils/src/lib.rs
index 9c9b813f7..110f79be9 100644
--- a/rust/scx_utils/src/lib.rs
+++ b/rust/scx_utils/src/lib.rs
@@ -35,7 +35,7 @@ pub use paste::paste;
 
 mod clang_info;
 
-mod bindings;
+pub mod bindings;
 
 mod bpf_builder;
 pub use bpf_builder::BpfBuilder;
@@ -52,7 +52,7 @@ pub use user_exit_info::SCX_ECODE_ACT_RESTART;
 pub use user_exit_info::SCX_ECODE_RSN_HOTPLUG;
 pub use user_exit_info::UEI_DUMP_PTR_MUTEX;
 
-pub mod build_id;
+//pub mod build_id;
 pub mod compat;
 
 mod libbpf_logger;
diff --git a/scheds/rust/scx_rusty/src/main.rs b/scheds/rust/scx_rusty/src/main.rs
index 9fbd5f1cf..107cd0140 100644
--- a/scheds/rust/scx_rusty/src/main.rs
+++ b/scheds/rust/scx_rusty/src/main.rs
@@ -46,7 +46,7 @@ use libbpf_rs::MapCore as _;
 use libbpf_rs::OpenObject;
 use log::info;
 use scx_stats::prelude::*;
-use scx_utils::build_id;
+// use scx_utils::build_id;
 use scx_utils::compat;
 use scx_utils::import_enums;
 use scx_utils::init_libbpf_logging;
@@ -359,10 +359,10 @@ impl<'a> Scheduler<'a> {
         let mut skel_builder = BpfSkelBuilder::default();
         skel_builder.obj_builder.debug(opts.verbose > 0);
         init_libbpf_logging(None);
-        info!(
-            "Running scx_rusty (build ID: {})",
-            *build_id::SCX_FULL_VERSION
-        );
+        // info!(
+        //     "Running scx_rusty (build ID: {})",
+        //     *build_id::SCX_FULL_VERSION
+        // );
         let mut skel = scx_ops_open!(skel_builder, open_object, rusty).unwrap();
 
         // Initialize skel according to @opts.
@@ -628,7 +628,7 @@ fn main() -> Result<()> {
     let opts = Opts::parse();
 
     if opts.version {
-        println!("scx_rusty: {}", *build_id::SCX_FULL_VERSION);
+        // println!("scx_rusty: {}", *build_id::SCX_FULL_VERSION);
         return Ok(());
     }