chore: remove Fedora 38 & kmods images (#562)

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -36,7 +36,6 @@ body:
         - All Images
         - Bazzite
         - Kinoite
-        - LXQt
         - Mate
         - Silverblue
         - Ubuntu

.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, 41 etc'
         required: true
         type: string
 env:
@@ -32,32 +32,14 @@ jobs:
           - sericea
           - onyx
           - base
-          - lxqt
           - lazurite
           - mate
           - vauxite
-        build_target: [nokmods, kmods]
         exclude:
-          # There is no Fedora 38 version of onyx or lazurite
-          - image_name: onyx
-            fedora_version: 38
-          - image_name: lazurite
-            fedora_version: 38
-          # There is no Fedora 39+ version of lxqt as it was replaced by lazurite
-          - image_name: lxqt
-            fedora_version: 39
-          - image_name: lxqt
-            fedora_version: 40
           # There is currently no Fedora 40 version of mate
           - image_name: mate
             fedora_version: 40
-          # THE FOLLOWING EXCLUDE IS MESSY BUT TEMPORARY UNTIL F38 IS GONE
-          # see: https://github.com/ublue-os/main/issues/369
-          # Fedora 39+ images do not include custom kmods (legacy)
-          - build_target: kmods
-            fedora_version: 39
-          - build_target: kmods
-            fedora_version: 40
+
     steps:
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
@@ -66,27 +48,13 @@ jobs:
       - name: Matrix Variables
         shell: bash
         run: |
-          if [[ "${{ matrix.image_name }}" == "lxqt" || "${{ matrix.image_name }}" == "mate" ]]; then
+          if [[ "${{ matrix.image_name }}" == "mate" ]]; then
               echo "SOURCE_IMAGE=base" >> $GITHUB_ENV
           else
               echo "SOURCE_IMAGE=${{ matrix.image_name }}" >> $GITHUB_ENV
           fi
           echo "SOURCE_ORG=fedora-ostree-desktops" >> $GITHUB_ENV
-
-          # THE FOLLOWING IS MESSY BUT TEMPORARY UNTIL F38 IS GONE
-          # see: https://github.com/ublue-os/main/issues/369
-          # Fedora 39+ images do not include custom kmods (legacy)
-          if [[ "${{ matrix.fedora_version}}" -ge "39" && "${{ matrix.build_target }}" == "nokmods" ]]; then
-              export IMAGE_FLAVOR=main
-          elif [[ "${{ matrix.fedora_version}}" -lt "39" && "${{ matrix.build_target }}" == "nokmods" ]]; then
-              export IMAGE_FLAVOR=nokmods
-          elif [[ "${{ matrix.fedora_version}}" -lt "39" && "${{ matrix.build_target }}" == "kmods" ]]; then
-              export IMAGE_FLAVOR=main
-          else
-              echo "ERROR: invalid workflow request - ${{ matrix.fedora_version }} - ${{ matrix.build_target }}"
-              exit 1
-          fi
-          echo "IMAGE_NAME=${{ matrix.image_name }}-${IMAGE_FLAVOR}" >> $GITHUB_ENV
+          echo "IMAGE_NAME=${{ matrix.image_name }}-main" >> $GITHUB_ENV
 
       - name: Generate tags
         id: generate-tags
@@ -96,11 +64,7 @@ jobs:
           TIMESTAMP="$(date +%Y%m%d)"
           VARIANT="${{ matrix.fedora_version }}"
 
-          if [[ "${{ matrix.fedora_version }}" -eq "38" ]]; then
-            IS_LATEST_VERSION=false
-            IS_STABLE_VERSION=true
-            IS_GTS_VERSION=false
-          elif [[ "${{ matrix.fedora_version }}" -eq "39" ]]; then
+          if [[ "${{ matrix.fedora_version }}" -eq "39" ]]; then
             IS_LATEST_VERSION=false
             IS_STABLE_VERSION=true
             IS_GTS_VERSION=true
@@ -218,8 +182,6 @@ jobs:
             RPMFUSION_MIRROR=${{ vars.RPMFUSION_MIRROR }}
           labels: ${{ steps.meta.outputs.labels }}
           oci: false
-          extra-args: |
-            --target=${{ matrix.build_target }}
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
       # https://github.com/macbre/push-to-ghcr/issues/12

Containerfile

@@ -4,7 +4,7 @@ ARG SOURCE_ORG="${SOURCE_ORG:-fedora-ostree-desktops}"
 ARG BASE_IMAGE="quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 
-FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS nokmods
+FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}
 
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
@@ -30,24 +30,3 @@ RUN mkdir -p /var/lib/alternatives && \
     mkdir -p /var/lib && mv /staged-alternatives /var/lib/alternatives && \
     mkdir -p /tmp /var/tmp && \
     chmod -R 1777 /tmp /var/tmp
-
-
-# !!! WARNING - KMODS IN MAIN IMAGES ARE DEPRECATED !!!
-
-# Only "legacy" (Fedora 38 and older) have custom kmods included in the "main" images.
-FROM nokmods AS kmods
-
-ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
-ARG RPMFUSION_MIRROR=""
-
-COPY kmods-install.sh /tmp/kmods-install.sh
-COPY kmods-sys_files /tmp/kmods-files
-
-COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
-
-# kmods-install.sh will error if running in Fedora 39 or newer.
-RUN /tmp/kmods-install.sh && \
-    rm -rf /tmp/* /var/* && \
-    ostree container commit && \
-    mkdir -p /var/tmp && chmod -R 1777 /var/tmp

README.md

@@ -1,11 +1,12 @@
 # Main
 
-[![build-38](https://github.com/ublue-os/main/actions/workflows/build-38.yml/badge.svg)](https://github.com/ublue-os/main/actions/workflows/build-38.yml) [![build-39](https://github.com/ublue-os/main/actions/workflows/build-39.yml/badge.svg)](https://github.com/ublue-os/main/actions/workflows/build-39.yml) [![build-40](https://github.com/ublue-os/main/actions/workflows/build-40.yml/badge.svg)](https://github.com/ublue-os/main/actions/workflows/build-40.yml)
+[![build-39](https://github.com/ublue-os/main/actions/workflows/build-39.yml/badge.svg)](https://github.com/ublue-os/main/actions/workflows/build-39.yml) 
+[![build-40](https://github.com/ublue-os/main/actions/workflows/build-40.yml/badge.svg)](https://github.com/ublue-os/main/actions/workflows/build-40.yml)
 
 A common main image for all other uBlue images, with minimal (but important) adjustments to Fedora. <3  
 
 # Documentation
 
 - [Main website](https://universal-blue.org)
 - [Documentation](https://universal-blue.discourse.group/docs?category=4)
-- [Scope document](https://universal-blue.discourse.group/t/universal-blue-project-governance/51)
+- [Scope document](https://universal-blue.discourse.group/t/universal-blue-project-governance/51)

packages.json

@@ -61,43 +61,6 @@
                 "kio-admin",
                 "ksshaskpass"
             ],
-            "lxqt": [
-                "breeze-cursor-theme",
-                "breeze-gtk",
-                "breeze-icon-theme",
-                "falkon",
-                "firewall-config",
-                "initial-setup-gui",
-                "libqtxdg",
-                "lxqt-about",
-                "lxqt-archiver",
-                "lxqt-config",
-                "lxqt-globalkeys",
-                "lxqt-notificationd",
-                "lxqt-openssh-askpass",
-                "lxqt-panel",
-                "lxqt-policykit",
-                "lxqt-powermanagement",
-                "lxqt-qtplugin",
-                "lxqt-runner",
-                "lxqt-session",
-                "lxqt-themes",
-                "lxqt-themes-fedora",
-                "network-manager-applet",
-                "nm-connection-editor",
-                "notification-daemon",
-                "obconf",
-                "openbox",
-                "pcmanfm-qt",
-                "perl-File-MimeInfo",
-                "qt5-qtimageformats",
-                "qterminal",
-                "sddm",
-                "sddm-themes",
-                "upower",
-                "xdg-desktop-portal-kde",
-                "xdg-user-dirs"
-            ],
             "mate": [
                 "NetworkManager-adsl",
                 "NetworkManager-openconnect-gnome",
@@ -227,32 +190,6 @@
             ]
         }
     },
-    "38": {
-        "include": {
-            "all": [
-                "bootc"
-            ],
-            "silverblue": [
-                "raw-thumbnailer"
-            ],
-            "mate": [
-                "f38-backgrounds-base",
-                "f38-backgrounds-extras-base",
-                "f38-backgrounds-extras-mate",
-                "f38-backgrounds-mate",
-                "raw-thumbnailer"
-            ],
-            "vauxite": [
-                "raw-thumbnailer"
-            ],
-            "kinoite": [
-                "xwaylandvideobridge"
-            ]
-        },
-        "exclude": {
-            "all": []
-        }
-    },
     "39": {
         "include": {
             "all": [