Patch to upstream v3.1 - Githubissues

cavaliercoder / dmidecode-osx

An OS X native port of dmidecode

http://cavaliercoder.com/blog/dmidecode-for-apple-osx.html

GNU General Public License v2.0

54 stars 13 forks source link

Patch to upstream v3.1 #4

Closed cavaliercoder closed 7 years ago

cavaliercoder commented 7 years ago

dmidecode v3.1 was recently released and should be merged down.

chicagotripp commented 7 years ago

What is the best way to go about this? git merge, git rebase, git rebase and then git merge the rebase and master, or git revert?

cavaliercoder commented 7 years ago

I'm not sure the best plan. My working plan was to:

create a v3.0 branch at the current HEAD
rebase master onto the upstream
fix any code issues

chicagotripp commented 7 years ago

Ok, the second to last option.

chicagotripp commented 7 years ago

I cloned your fork, performed a pull on the dmidecode master branch to the latest and greatest commit, performed some merge conflict resolutions, created unified diff files, and then packed them all in to this one zip file. I haven't tested it yet. I accepted all suggestions from AUTHORS (with slight modifications) and dmidecode.c since these were the only 2 issues that required a personal touch.

Patches to 3.1.zip

cavaliercoder commented 7 years ago

Thanks for putting some time into. It's really critical that we do test the side-effects of each merge-conflict before proceeding with this.

chicagotripp commented 7 years ago

Ok. I had errors during make and I fix them. They work on my system running Mac OS High Sierra version 3. Here is the patch. I'm including the 5 errors as a screenshot. dmidecode.c.diff.zip

cavaliercoder commented 7 years ago

I've rebased onto the dmidecode-3.1 branch from https://git.savannah.nongnu.org/git/dmidecode.git. Homebrew package upgraded to v3.1.