Skip to content

Commit 830fe57

Browse files
p5p5
authored
chore: enable Fedora 42 akmods (#308)
1 parent b94ff3a commit 830fe57

14 files changed

+59
-31
lines changed

‎.github/actions/get-kernel-version/action.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Get Kernel Version
33
inputs:
44
fedora_version:
5-
description: "The Fedora release version: 40, 41, etc"
5+
description: "The Fedora release version: 41, 42, etc"
66
required: true
77
type: string
88
kernel_flavor:
@@ -30,6 +30,8 @@ runs:
3030
id: kernel
3131
shell: bash
3232
run: |
33+
set -x
34+
3335
if [[ ${{ inputs.kernel_flavor }} =~ asus|surface ]]; then
3436
build_image="quay.io/fedora/fedora:${{ inputs.fedora_version }}"
3537
podman pull "$build_image"

‎.github/workflows/build-40.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
paths-ignore:
88
- '**.md'
99
schedule:
10-
- cron: '25 0 * * *' # 0025 UTC everyday (20 minutes after 41)
10+
- cron: '45 0 * * *' # 0045 UTC everyday (20 minutes after 41)
1111
workflow_dispatch:
1212

1313

‎.github/workflows/build-41.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
paths-ignore:
88
- '**.md'
99
schedule:
10-
- cron: '5 0 * * *' # 0005 UTC everyday
10+
- cron: '25 0 * * *' # 0025 UTC everyday (20 minutes after 42)
1111
workflow_dispatch:
1212

1313
jobs:

‎.github/workflows/build-42.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: ublue akmods 42
2+
on:
3+
merge_group:
4+
pull_request:
5+
branches:
6+
- main
7+
paths-ignore:
8+
- '**.md'
9+
schedule:
10+
- cron: '5 0 * * *' # 0005 UTC everyday
11+
workflow_dispatch:
12+
13+
jobs:
14+
kernel-akmods:
15+
uses: ./.github/workflows/reusable-build.yml
16+
secrets: inherit
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
fedora_version:
21+
- 42
22+
kernel_flavor:
23+
- main
24+
with:
25+
fedora_version: ${{ matrix.fedora_version }}
26+
kernel_flavor: ${{ matrix.kernel_flavor }}

‎.github/workflows/reusable-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_call:
44
inputs:
55
fedora_version:
6-
description: "The Fedora release version: 40, 41, etc"
6+
description: "The Fedora release version: 41, 42, etc"
77
required: true
88
type: string
99
kernel_flavor:

‎Containerfile.common

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
### Containerfile.common - used to build ONLY NON-nvidia kmods
33
###
44

5-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
5+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
66
ARG BUILDER_IMAGE="${BUILDER_IMAGE:-quay.io/fedora/fedora}"
77
ARG BUILDER_BASE="${BUILDER_IMAGE}:${FEDORA_MAJOR_VERSION}"
88
FROM ${BUILDER_BASE} AS builder
99

10-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
10+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
1111
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}"
1212
ARG RPMFUSION_MIRROR=""
1313
ARG DUAL_SIGN="true"

‎Containerfile.extra

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
### Containerfile.extra - used to build extra kmods
33
###
44

5-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
5+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
66
ARG BUILDER_IMAGE="${BUILDER_IMAGE:-quay.io/fedora/fedora}"
77
ARG BUILDER_BASE="${BUILDER_IMAGE}:${FEDORA_MAJOR_VERSION}"
88
FROM ${BUILDER_BASE} AS builder
99

10-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
10+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
1111
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}"
1212
ARG RPMFUSION_MIRROR=""
1313
ARG DUAL_SIGN="true"

‎Containerfile.nvidia

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
### Containerfile.nvidia - used to build ONLY NVIDIA kmods
33
###
44

5-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
5+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
66
ARG BUILDER_IMAGE="${BUILDER_IMAGE:-quay.io/fedora/fedora}"
77
ARG BUILDER_BASE="${BUILDER_IMAGE}:${FEDORA_MAJOR_VERSION}"
88
FROM ${BUILDER_BASE} AS builder
99

10-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
10+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
1111
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}"
1212
ARG RPMFUSION_MIRROR=""
1313
ARG DUAL_SIGN="true"

‎Containerfile.nvidia-open

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
### Containerfile.nvidia - used to build ONLY NVIDIA kmods
33
###
44

5-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
5+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
66
ARG BUILDER_IMAGE="${BUILDER_IMAGE:-quay.io/fedora/fedora}"
77
ARG BUILDER_BASE="${BUILDER_IMAGE}:${FEDORA_MAJOR_VERSION}"
88
FROM ${BUILDER_BASE} AS builder
99

10-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
10+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
1111
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}"
1212
ARG RPMFUSION_MIRROR=""
1313
ARG DUAL_SIGN="true"

‎Containerfile.test

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
### Containerfile.test - used to test akmods
33
###
44

5-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
5+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
66
ARG BUILDER_IMAGE="${BUILDER_IMAGE:-quay.io/fedora/fedora}"
77
ARG BUILDER_BASE="${BUILDER_IMAGE}:${FEDORA_MAJOR_VERSION}"
88
ARG INPUT_AKMODS="${INPUT_AKMODS:-akmods}"
@@ -11,7 +11,7 @@ ARG INPUT_BASE="${INPUT_AKMODS}:${INPUT_TAG}"
1111
FROM ${INPUT_BASE} AS akmods_cache
1212
FROM ${BUILDER_BASE} AS tester
1313

14-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
14+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
1515
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}"
1616
ARG RPMFUSION_MIRROR=""
1717
ARG DUAL_SIGN="true"

‎Containerfile.zfs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
### Containerfile.zfs - used to build ONLY ZFS kmod
33
###
44

5-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
5+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
66
ARG BUILDER_IMAGE="${BUILDER_IMAGE:-quay.io/fedora/fedora}"
77
ARG BUILDER_BASE="${BUILDER_IMAGE}:${FEDORA_MAJOR_VERSION}"
88
FROM ${BUILDER_BASE} AS builder
99

10-
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
10+
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-42}"
1111
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-coreos-stable}"
1212
ARG DUAL_SIGN="true"
1313
ARG RPMFUSION_MIRROR=""

‎build_files/common/build-kmod-openrazer.sh

+13-8
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,24 @@ ARCH="$(rpm -E '%_arch')"
66
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
77
RELEASE="$(rpm -E '%fedora')"
88

9+
# OpenRazer builds are broken on Fedora 42
10+
if [[ "${FEDORA_MAJOR_VERSION}" -eq 42 ]]; then
11+
exit 0
12+
fi
13+
914
cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
1015

1116
### BUILD openrazer (succeed or fail-fast with debug output)
1217
dnf install -y \
1318
akmod-openrazer-*.fc${RELEASE}.${ARCH}
1419
akmods --force --kernels "${KERNEL}" --kmod openrazer
15-
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razerkbd.ko.xz > /dev/null \
16-
|| (find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
17-
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razermouse.ko.xz > /dev/null \
18-
|| (find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
19-
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razerkraken.ko.xz > /dev/null \
20-
|| (find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
21-
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razeraccessory.ko.xz > /dev/null \
22-
|| (find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
20+
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razerkbd.ko.xz >/dev/null ||
21+
(find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
22+
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razermouse.ko.xz >/dev/null ||
23+
(find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
24+
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razerkraken.ko.xz >/dev/null ||
25+
(find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
26+
modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razeraccessory.ko.xz >/dev/null ||
27+
(find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1)
2328

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

‎build_files/extra/build-kmod-vhba.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ ARCH="$(rpm -E '%_arch')"
77
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
88
RELEASE="$(rpm -E '%fedora')"
99

10-
if [[ "$RELEASE" -lt 39 ]]; then
11-
echo "SKIPPED BUILD of vhba on Fedora $RELEASE"
12-
exit 0
13-
fi
14-
15-
if [[ "${RELEASE}" -ge 42 ]]; then
10+
if [[ "${RELEASE}" -ge 43 ]]; then
1611
COPR_RELEASE="rawhide"
1712
else
1813
COPR_RELEASE="${RELEASE}"

‎fetch-kernel.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ elif [[ "${kernel_flavor}" == "bazzite" ]]; then
7171
# curl -LO https://github.com/bazzite-org/kernel-bazzite/releases/download/"$build_tag"/kernel-uki-virt-addons-"$kernel_version".rpm
7272
else
7373
KERNEL_MAJOR_MINOR_PATCH=$(echo "$kernel_version" | cut -d '-' -f 1)
74-
KERNEL_RELEASE="$(echo "$kernel_version" | cut -d - -f 2 | cut -d . -f 1).$(echo "$kernel_version" | cut -d - -f 2 | cut -d . -f 2)"
74+
KERNEL_RELEASE="$(echo "$kernel_version" | cut -d - -f 2 | rev | cut -d . -f 2- | rev)"
7575
ARCH=$(uname -m)
7676

7777
# Using curl instead of dnf download for https links

0 commit comments

Comments
 (0)