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

feat: add 'extra' akmod stream & facetimehd-kmod to akmod cache #163

Merged
merged 36 commits into from
Apr 27, 2024

Conversation

mulderje
Copy link
Contributor

@mulderje mulderje commented Apr 5, 2024

Copying the below from #158 which was auto-closed/merged since I didn't make the PR from a branch and main got synced. Wanted to also quickly confirm that podman build -f Containerfile.common . works locally with this PR, and appears to add in the facetimehd-kmod RPM.

I have been working on getting an old MacBook Air fully running, and running into things like not being able to just copy firmware files into the base system... :)

One thing missing within the Fedora repos for me was the FacetimeHD Firmware. This led me down a path of creating the below. Please note this was my first time messing around with spec files/copr, and any feedback/suggestions would be much appreciated.

  1. Spec files can be found here.
  2. COPR. Note: I can leverage this to add to my machine locally now via adding the copr and sudo rpm-ostree install akmod-facetimehd facetimehd-firmware, which is already a huge improvement
  3. I would like to figure out how to get the automated builds working with something like Blue build. Note: this is currently failing builds with e.g. permission issues

Open questions:

  • Would you want this to be included here in your main akmod repo or is this too niche?
  • If you would like here, would you also like included in your COPR vs [2] above?
  • If no, any suggestions or recommendations for the spec [1]/copr [2] setup to help get [3] working?
  • Are there any best practices that I should be following with things like packit, bohdi, koji, etc.? It looks like there are a few things that I need to do to make sure things stay up to date, but would love to plug into something you have if possible.

Thanks!
Jon

@mulderje mulderje requested a review from castrojo as a code owner April 5, 2024 17:11
@mulderje
Copy link
Contributor Author

mulderje commented Apr 5, 2024

PR mulderje#5 in my fork passes all builds for f39 & f40.

edit: to confirm this is now also building for f40.

This is the initial commit of the facetimehd firmware for the
integrated camera for older macbook air models.
@bsherman
Copy link
Contributor

bsherman commented Apr 8, 2024

One best practice, please don't force push, especially once feedback starts getting added to the PR. :-) It causes the loss of context.

@mulderje
Copy link
Contributor Author

mulderje commented Apr 8, 2024

Good to know. I was having issues cleaning up some small commits and ended up doing something like git rebase -i HEAD~3 and then needing to do a git push --force to get it to go into github. Is there a way to do that cleanly?

Likewise when updating my fork is there a preferred git incantation to keep things merged/rebased?

E.g. for this pr to pull in your updated, what would you do to update the branch/pr code? I had tried to do a sync in the UI then pull/rebase into my branch but it looks like that's not ideal either based on the way it showed up in the logs.

@mulderje
Copy link
Contributor Author

mulderje commented Apr 8, 2024

Is there a way to re-kick the builds here? Looks like I had some failures due to the v4l2loopback module you are debugging.

@bsherman
Copy link
Contributor

bsherman commented Apr 8, 2024

Is there a way to re-kick the builds here? Looks like I had some failures due to the v4l2loopback module you are debugging.

You just did it! I approved another build attempt.

@bsherman
Copy link
Contributor

bsherman commented Apr 8, 2024

Good to know. I was having issues cleaning up some small commits and ended up doing something like git rebase -i HEAD~3 and then needing to do a git push --force to get it to go into github. Is there a way to do that cleanly?

Doing a local rebase does necessitate at force push, so I would avoid it if possible.

Likewise when updating my fork is there a preferred git incantation to keep things merged/rebased?

E.g. for this pr to pull in your updated, what would you do to update the branch/pr code? I had tried to do a sync in the UI then pull/rebase into my branch but it looks like that's not ideal either based on the way it showed up in the logs.

Yeah I find GitHub's fork sync to be painful. The best solution I've found if you wish to use the web UI, make your fork, then do your dev work/modifications on a branch. Then you'll be able to use "sync fork" in UI to update, and merge from main into your dev branch without blowing away changes.

Merges may conflict but you can fix, and some people don't like the merge commit logs, but do not despair, we squash merge PRs to avoid excessive logs, so no need to try to remove them in the PR itself.

@mulderje
Copy link
Contributor Author

mulderje commented Apr 8, 2024

Thank you! Any other feedback on the PR or things you would like me to cover off on prior to getting this committed? Happy to work with you on a path towards getting this into your copr and I will at least try to get this into rpmfusion (never done before) on the side.

mulderje added a commit to mulderje/ublue-oldair that referenced this pull request Apr 15, 2024
feat: add facetimehd kmod and related files via install script

Much of the build script taken from https://github.com/ublue-os/akmods/ while working through ublue-os/akmods#163
@mulderje mulderje changed the title feat: add facetimehd-kmod to akmod cache feat: add 'extra' akmod stream & facetimehd-kmod to akmod cache Apr 17, 2024
@mulderje
Copy link
Contributor Author

FYI rebased this against #171

Build is successful in my fork at mulderje#5

@bsherman bsherman linked an issue Apr 27, 2024 that may be closed by this pull request
@KyleGospo KyleGospo added this pull request to the merge queue Apr 27, 2024
Copy link
Contributor

@bsherman bsherman left a comment

Choose a reason for hiding this comment

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

LGTM

Merged via the queue into ublue-os:main with commit 734a739 Apr 27, 2024
30 checks passed
KyleGospo added a commit to ublue-os/bazzite that referenced this pull request Apr 27, 2024
@mulderje mulderje deleted the facetimehd-kmod branch April 27, 2024 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

split "extra" kmods into distinct build flow
4 participants