Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added updated darwin support for Apple Silicon Macs and new Software Updates #2

Merged
merged 3 commits into from
Jan 12, 2023
Merged

Conversation

Ishaanahuja7
Copy link

@Ishaanahuja7 Ishaanahuja7 commented Nov 5, 2022

Updates darwin_sigar.c for latest macOS version support.

@Ishaanahuja7
Copy link
Author

rapid7/mettle#237

@jmartin-tech jmartin-tech changed the base branch from master to r7-custom November 7, 2022 13:20
@Ishaanahuja7
Copy link
Author

@busterb @timwr Please take a look at this for merging this PR to update it for Apple Silicon. Mettle for Apple Silicon wont build without these changes.

@usiegl00
Copy link

@Ishaanahuja7 Thank you!
@jmartin-r7 Any update on this?

@space-r7
Copy link

Hi @Ishaanahuja7 and @usiegl00, sorry for the lack of movement on this so far! I'm starting to work on these this week, so I'm hoping we can at least get these sigar changes pulled into mettle. Currently working on setting this up and testing at the moment!

@space-r7 space-r7 self-assigned this Nov 28, 2022
@Ishaanahuja7
Copy link
Author

Ishaanahuja7 commented Dec 10, 2022

Any updates? @space-r7

Copy link

@timwr timwr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@space-r7
Copy link

Hey @Ishaanahuja7, I'm on research at the moment. I'll be able to return to this the first week of January. Sorry for the delay on this!

@busterb
Copy link

busterb commented Dec 14, 2022

I can probably take a look at this in the meantime if you don't mind @space-r7, just got an M1 for this kind of thing.

@space-r7
Copy link

Not at all! Thanks, Brent!

@Ishaanahuja7
Copy link
Author

Thats alright, no worries @space-r7. Thanks @busterb. Let me know if I can help with any testing. I already have an M1 Max.

@busterb busterb mentioned this pull request Dec 26, 2022
@busterb
Copy link

busterb commented Dec 26, 2022

oldimac:examples bcook$ ./sysinfo
name: macOS
version: 10.13.6
arch: x86
machine: x86_64
description: macOS High Sierra
patch_level: unknown
vendor: Apple
vendor_version: 10.13
vendor_name: macOS
vendor_code_name: High Sierra
vendor_uuid:
[email protected]:~/projects/hacking/mettle/eval/sigar (r7-custom *%) $ ./examples/sysinfo
name: macOS
version: 13.1.0
arch: arm64
machine: arm64
description: macOS Ventura
patch_level: unknown
vendor: Apple
vendor_version: 13.1
vendor_name: macOS
vendor_code_name: Ventura
vendor_uuid: 

@Ishaanahuja7
Copy link
Author

@busterb Looks good to me. Can anybody merge this PR?

timwr added a commit that referenced this pull request Jan 12, 2023
@timwr
Copy link

timwr commented Jan 12, 2023

This should be merged now, but I'm not sure why github didn't automatically mark this pull request as merged.
Actually merging this pull request is more of a formality, the key thing would be to ensure that the changes here are added to the libsigar dependency here: https://github.com/rapid7/mettle/blob/master/deps/libsigar-1.6.3.tar.gz in rapid7/mettle#237

@timwr timwr closed this Jan 12, 2023
@Ishaanahuja7
Copy link
Author

Ishaanahuja7 commented Jan 12, 2023

@timwr Can you make a new tag and bump version to 1.6.5 so I can update the tar.gz in mettle?

@jmartin-tech
Copy link

This was landed to the wrong branch, I will rework commits and tag shortly.

@jmartin-tech jmartin-tech reopened this Jan 12, 2023
@jmartin-tech jmartin-tech merged commit bc36684 into rapid7:r7-custom Jan 12, 2023
@jmartin-tech
Copy link

@timwr sorry for the confusion here, we are using r7-custom as the release branch in this fork.

Merges have been sorted and new tag for 1.6.5 exists.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants