diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 05fc5aac..993f07c5 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -25,7 +25,6 @@ body: - All Images - Bazzite - Kinoite - - LXQt - Mate - Silverblue - Ubuntu diff --git a/.github/workflows/build-38.yml b/.github/workflows/build-38.yml deleted file mode 100644 index 0496f426..00000000 --- a/.github/workflows/build-38.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: ublue akmods 38 -on: - pull_request: - merge_group: - schedule: - - cron: '10 14 * * *' # 2pm-ish UTC everyday (timed against official fedora container pushes, and after 'config') - workflow_dispatch: - -jobs: - build: - name: build - uses: ./.github/workflows/reusable-build.yml - secrets: inherit - with: - fedora_version: 38 \ No newline at end of file diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index fa182089..3ffa42ff 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -3,7 +3,7 @@ on: workflow_call: inputs: fedora_version: - description: 'The Fedora release version: 38, 39, 40, etc' + description: 'The Fedora release version: 39, 40, etc' required: true type: string env: @@ -38,14 +38,6 @@ jobs: - extra - nvidia exclude: - - kernel_flavor: asus - fedora_version: 38 - - kernel_flavor: surface - fedora_version: 38 - - fedora_version: 38 - kernel_flavor: fsync # kernel-fsync not required for ublue-os F38 - - fedora_version: 38 - kernel_flavor: fsync-lts - fedora_version: 40 kernel_flavor: fsync-lts # kernel-ba packages are not being built for F40 yet. steps: diff --git a/README.md b/README.md index 41019625..3fadc3ad 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ublue-os akmods -[![build-38](https://github.com/ublue-os/akmods/actions/workflows/build-38.yml/badge.svg)](https://github.com/ublue-os/akmods/actions/workflows/build-38.yml) [![build-39](https://github.com/ublue-os/akmods/actions/workflows/build-39.yml/badge.svg)](https://github.com/ublue-os/akmods/actions/workflows/build-39.yml) [![build-40](https://github.com/ublue-os/akmods/actions/workflows/build-40.yml/badge.svg)](https://github.com/ublue-os/akmods/actions/workflows/build-40.yml) +[![build-39](https://github.com/ublue-os/akmods/actions/workflows/build-39.yml/badge.svg)](https://github.com/ublue-os/akmods/actions/workflows/build-39.yml) [![build-40](https://github.com/ublue-os/akmods/actions/workflows/build-40.yml/badge.svg)](https://github.com/ublue-os/akmods/actions/workflows/build-40.yml) A layer for adding extra kernel modules to your image. Use for better hardware support and a few other features! @@ -53,14 +53,13 @@ Feel free to PR more kmod build scripts into this repo! ## Notes We do our best to support all current builds of Fedora, current versions of the kernel modules listed, and the latest NVIDIA driver. -**Note: NVIDIA legacy driver version 470 is no longer provided as RPMfusion has ceased updates to the package and it no longer builds with kernel 6.8 which has now released for Fedora 38 and 39. Also the `-550` extra driver version tag has been removed as the latest driver will always be included.** +**Note: NVIDIA legacy driver version 470 is no longer provided as RPMfusion has ceased updates to the package and it no longer builds with kernel 6.8 which has now released for Fedora 39. Also the `-550` extra driver version tag has been removed as the latest driver will always be included.** The majority of the drivers are tagged with `KERNEL_TYPE-FEDORA_RELEASE`. NVIDIA drivers are bundled distinctly with tag `KERNEL_TYPE-FEDORA_RELEASE-NVIDIA_VERSION`. | KERNEL_TYPE | FEDORA_RELEASE | TAG | | - | - | - | -| Fedora stock kernel | 38 | `main-38` | -| | 39 | `main-39` | +| Fedora stock kernel | 39 | `main-39` | | | 40 | `main-40` | | [patched for ASUS devices](https://copr.fedorainfracloud.org/coprs/lukenukem/asus-kernel) | 39 | `asus-39`| | | 40 | `asus-40` | @@ -104,7 +103,7 @@ If you have a kmod you want to contribute send a pull request by adding a script ## Verification -These images are signed with sisgstore's [cosign](https://docs.sigstore.dev/cosign/overview/). You can verify the signature by downloading the `cosign.pub` key from this repo and running the following command, replacing `RELEASE` with either `38` or `39`: +These images are signed with sisgstore's [cosign](https://docs.sigstore.dev/cosign/overview/). You can verify the signature by downloading the `cosign.pub` key from this repo and running the following command, replacing `RELEASE` with either `39` or `40`: cosign verify --key cosign.pub ghcr.io/ublue-os/akmods:RELEASE diff --git a/build-prep.sh b/build-prep.sh index d535a893..5afcb3b4 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -7,12 +7,7 @@ set -oeux pipefail ARCH="$(rpm -E '%_arch')" RELEASE="$(rpm -E '%fedora')" -# Modularity repositories are not available on Fedora 39 and above, so don't try to disable them -if [[ "${RELEASE}" -le 38 ]]; then - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo -else - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo -fi +sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo # enable RPMs with alternatives to create them in this image build mkdir -p /var/lib/alternatives