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.

Sign up for GitHub

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: Adding Framework power kmod #139

Closed
wants to merge 11 commits into from
Closed

feat: Adding Framework power kmod #139

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26555e8
Attempting to test Framework kmod, probably not good enough for produ…
Mar 5, 2024
5a40542
Taking care of some typos.
Mar 7, 2024
5af3531
Merge branch 'main' into main
KyleGospo Apr 3, 2024
2853174
Filename needs to line up
Apr 3, 2024
d9cfada
Merge branch 'main' of [email protected]:Waffleophagus/akmods.git into main
Apr 3, 2024
4a790fa
Changed file permissions for execution
Apr 3, 2024
2bfe231
removing underscore to simplify everything.
Apr 3, 2024
07eebf3
Another spot to replace underscore with dash.
Apr 3, 2024
7c24d25
Merge branch 'main' into main
bsherman Apr 4, 2024
982f61a
Adding conditional per PR review.
Apr 7, 2024
65da0e2
Merge branch 'main' into main
bsherman Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Containerfile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
/tmp/build-kmod-steamdeck.sh \
; fi && \
/tmp/build-kmod-ayaneo-platform.sh && \
/tmp/build-kmod-framework-laptop-tests.sh && \
/tmp/build-kmod-ayn-platform.sh && \
/tmp/build-kmod-bmi160.sh && \
/tmp/build-kmod-bmi260.sh && \
Expand Down
17 changes: 17 additions & 0 deletions build-kmod-framework-laptop-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/sh

set -oeux pipefail

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

Copy link
Contributor

@bsherman bsherman Apr 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think you should take a look at build-kmod-v4l2loopback.sh and add a similar conditional to this script so that it only runs on main KERNEL_FLAVOR and RELEASE >= 39.

You'll need to move the cp for the COPR repo after the conditional as well.

Copy link
Author

Choose a reason for hiding this comment

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

Ok, so the kernel flavor is just nvidia or main right now yea? Given that frameworks don't have nvidia drivers that's safe to exit as well. So I think the != main is still fine. I've got a commit that will do that, but now that I've taken a look at it, I don't think that this is my only concern. Its very likely "a" concern, but there are other things that are still borked I think.

Copy link
Contributor

Choose a reason for hiding this comment

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

Kernel flavors can be found here: https://github.com/ublue-os/akmods/blob/main/.github/workflows/reusable-build.yml#L30-L34

Copy link
Author

Choose a reason for hiding this comment

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

Fantastic, given that my != main should still stand.

rpm-ostree install \
framework_laptop-*.fc${RELEASE}.${ARCH}
akmods --force --kernels "${KERNEL}" --kmod framework-laptop
modinfo /usr/lib/modules/${KERNEL}/extra/framework-laptop-tests/framework-laptop.ko.xz > /dev/null \
|| (find /var/cache/akmods/framework-laptop-tests/ -name \*.log -print -exec cat {} \; && exit 1)

rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo
Loading