From 17672055dc9632b68db14d884fd3f49d89dadf10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 19:35:26 -0400 Subject: [PATCH 01/14] chore(deps): bump ASzc/change-string-case-action from 5 to 6 (#84) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f36079f8..cabcd672 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,7 +140,7 @@ jobs: # https://github.com/macbre/push-to-ghcr/issues/12 - name: Lowercase Registry id: registry_case - uses: ASzc/change-string-case-action@v5 + uses: ASzc/change-string-case-action@v6 with: string: ${{ env.IMAGE_REGISTRY }} From 9216bb208a86319b60e620d2c06676a8ede56261 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Tue, 31 Oct 2023 22:47:14 -0500 Subject: [PATCH 02/14] feat: use official upstream images for kmod builds (#85) --- .github/workflows/build.yml | 19 +++++++++++++++---- Containerfile.common | 3 ++- Containerfile.nvidia | 3 ++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cabcd672..fc65dcf3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,16 +3,15 @@ on: pull_request: merge_group: schedule: - - cron: '0 6 * * *' # 6am everyday (1h after 'config') + - cron: '0 14 * * *' # 2pm UTC everyday (timed against official fedora container pushes, and after 'config') workflow_dispatch: env: IMAGE_NAME: akmods IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - SOURCE_IMAGE: base jobs: push-ghcr: - name: Build and push akmods image + name: akmods image runs-on: ubuntu-22.04 permissions: contents: read @@ -43,6 +42,17 @@ jobs: - name: Checkout Push to Registry action uses: actions/checkout@v4 + - name: Matrix Variables + shell: bash + run: | + if [[ "${{ matrix.major_version }}" -ge "39" ]]; then + echo "SOURCE_IMAGE=fedora-silverblue" >> $GITHUB_ENV + echo "SOURCE_ORG=fedora" >> $GITHUB_ENV + else + echo "SOURCE_IMAGE=base" >> $GITHUB_ENV + echo "SOURCE_ORG=fedora-ostree-desktops" >> $GITHUB_ENV + fi + - name: Generate tags id: generate-tags shell: bash @@ -97,7 +107,7 @@ jobs: - name: Get current versions id: labels run: | - skopeo inspect docker://quay.io/fedora-ostree-desktops/${{ env.SOURCE_IMAGE }}:${{ matrix.major_version }} > inspect.json + skopeo inspect docker://quay.io/${{ env.SOURCE_ORG }}/${{ env.SOURCE_IMAGE }}:${{ matrix.major_version }} > inspect.json version=$(jq -r '.Labels["org.opencontainers.image.version"]' inspect.json) linux=$(jq -r '.Labels["ostree.linux"]' inspect.json) echo "VERSION=$version" >> $GITHUB_OUTPUT @@ -130,6 +140,7 @@ jobs: ${{ steps.generate-tags.outputs.alias_tags }} build-args: | SOURCE_IMAGE=${{ env.SOURCE_IMAGE }} + SOURCE_ORG=${{ env.SOURCE_ORG }} KERNEL_FLAVOR=${{ matrix.kernel_flavor }} FEDORA_MAJOR_VERSION=${{ matrix.major_version }} NVIDIA_MAJOR_VERSION=${{ matrix.nvidia_version }} diff --git a/Containerfile.common b/Containerfile.common index a29d22e3..dc592fc1 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -4,7 +4,8 @@ #Build from base, simpley because it's the smallest image ARG SOURCE_IMAGE="${SOURCE_IMAGE:-base}" -ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}" +ARG SOURCE_ORG="${SOURCE_ORG:-fedora-ostree-desktops}" +ARG BASE_IMAGE="quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder diff --git a/Containerfile.nvidia b/Containerfile.nvidia index f6fd0343..9659a181 100644 --- a/Containerfile.nvidia +++ b/Containerfile.nvidia @@ -4,7 +4,8 @@ #Build from base, simpley because it's the smallest image ARG SOURCE_IMAGE="${SOURCE_IMAGE:-base}" -ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}" +ARG SOURCE_ORG="${SOURCE_ORG:-fedora-ostree-desktops}" +ARG BASE_IMAGE="quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder From c021f50913857ba2f77eb74293799bf5cc05bd09 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 1 Nov 2023 12:50:37 -0700 Subject: [PATCH 03/14] chore: Restore evdi on F39 (#86) --- Containerfile.common | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Containerfile.common b/Containerfile.common index dc592fc1..022e01e5 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -35,6 +35,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ ; else \ export KERNEL_NAME="kernel-surface" \ ; fi && \ + /tmp/build-kmod-evdi.sh && \ /tmp/build-kmod-gasket.sh && \ /tmp/build-kmod-gcadapter_oc.sh && \ /tmp/build-kmod-nct6687d.sh && \ @@ -47,11 +48,8 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-wl.sh && \ /tmp/build-kmod-xpadneo.sh && \ /tmp/build-kmod-xpad-noone.sh && \ - /tmp/build-kmod-xone.sh && \ - if [[ "${FEDORA_MAJOR_VERSION}" -le "38" ]]; then \ - /tmp/build-kmod-evdi.sh \ - ; fi - + /tmp/build-kmod-xone.sh + RUN cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \ /var/cache/rpms/ublue-os/ RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \ From 148c983d60d6a721eccc8b5b6945f5c6502101f0 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 2 Nov 2023 08:38:03 -0600 Subject: [PATCH 04/14] fix(asus): Exclude evdi kmod (#87) --- Containerfile.common | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Containerfile.common b/Containerfile.common index 022e01e5..86b72c7a 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -35,7 +35,9 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ ; else \ export KERNEL_NAME="kernel-surface" \ ; fi && \ - /tmp/build-kmod-evdi.sh && \ + if grep -qv "asus" <<< "${KERNEL_FLAVOR}"; then \ + /tmp/build-kmod-evdi.sh \ + ; fi && \ /tmp/build-kmod-gasket.sh && \ /tmp/build-kmod-gcadapter_oc.sh && \ /tmp/build-kmod-nct6687d.sh && \ @@ -49,7 +51,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-xpadneo.sh && \ /tmp/build-kmod-xpad-noone.sh && \ /tmp/build-kmod-xone.sh - + RUN cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \ /var/cache/rpms/ublue-os/ RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \ From 15eaf4988ce068e8b93ba14e0f7718ab3cb29d90 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 2 Nov 2023 18:25:11 -0600 Subject: [PATCH 05/14] fix: Target Fedora 40 for official images, use ci-test for 39 (#88) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc65dcf3..9da3c642 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: - name: Matrix Variables shell: bash run: | - if [[ "${{ matrix.major_version }}" -ge "39" ]]; then + if [[ "${{ matrix.major_version }}" -ge "40" ]]; then echo "SOURCE_IMAGE=fedora-silverblue" >> $GITHUB_ENV echo "SOURCE_ORG=fedora" >> $GITHUB_ENV else From 129b1987ab65561baf41a718c9b69f7401f4e62a Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Mon, 6 Nov 2023 09:35:04 -0600 Subject: [PATCH 06/14] chore: restore default rpmfusion mirror behavior (#89) --- build-prep.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build-prep.sh b/build-prep.sh index e12c95ee..17b5a346 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -28,14 +28,6 @@ rpm-ostree install \ https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${RELEASE}.noarch.rpm \ fedora-repos-archive -# force use of single rpmfusion mirror -sed -i.bak 's%^metalink=%#metalink=%' /etc/yum.repos.d/rpmfusion-*.repo -sed -i 's%^#baseurl=http://download1.rpmfusion.org%baseurl=http://mirrors.ocf.berkeley.edu/rpmfusion%' /etc/yum.repos.d/rpmfusion-*.repo -# after F39 launches, bump to 40 -if [[ "${FEDORA_MAJOR_VERSION}" -ge 39 ]]; then - sed -i 's%free/fedora/releases%free/fedora/development%' /etc/yum.repos.d/rpmfusion-*.repo -fi - ### PREPARE CUSTOM KERNEL SUPPORT if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then From 2c993d425b4bda272f466152dba54f8c50672090 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sun, 12 Nov 2023 15:00:37 -0700 Subject: [PATCH 07/14] feat: Build akmods for kernel-fsync (#90) --- .github/workflows/build.yml | 6 +++++- Containerfile.common | 4 +++- build-prep.sh | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9da3c642..9d1b934d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - kernel_flavor: [main, asus, surface] + kernel_flavor: [main, asus, fsync, surface] cfile_suffix: [common, nvidia] major_version: [37, 38, 39] nvidia_version: [0, 470, 535] @@ -33,6 +33,10 @@ jobs: nvidia_version: 0 - kernel_flavor: asus major_version: 37 + - kernel_flavor: fsync + major_version: 37 + - kernel_flavor: fsync + major_version: 38 - kernel_flavor: surface major_version: 37 - kernel_flavor: surface diff --git a/Containerfile.common b/Containerfile.common index 86b72c7a..9771d528 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -38,13 +38,15 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ if grep -qv "asus" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-evdi.sh \ ; fi && \ + if grep -qv "fsync" <<< "${KERNEL_FLAVOR}"; then \ + /tmp/build-kmod-steamdeck.sh \ + ; fi && \ /tmp/build-kmod-gasket.sh && \ /tmp/build-kmod-gcadapter_oc.sh && \ /tmp/build-kmod-nct6687d.sh && \ /tmp/build-kmod-openrazer.sh && \ /tmp/build-kmod-openrgb.sh && \ /tmp/build-kmod-ryzen-smu.sh && \ - /tmp/build-kmod-steamdeck.sh && \ /tmp/build-kmod-v4l2loopback.sh && \ /tmp/build-kmod-winesync.sh && \ /tmp/build-kmod-wl.sh && \ diff --git a/build-prep.sh b/build-prep.sh index 17b5a346..63ae7de2 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -44,6 +44,20 @@ if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then kernel-modules \ kernel-modules-core \ kernel-modules-extra +elif [[ "fsync" == "${KERNEL_FLAVOR}" ]]; then + echo "Installing kernel-fsync:" + wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo + rpm-ostree cliwrap install-to-root / + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:sentry:kernel-fsync \ + kernel \ + kernel-core \ + kernel-devel \ + kernel-devel-matched \ + kernel-modules \ + kernel-modules-core \ + kernel-modules-extra elif [[ "surface" == "${KERNEL_FLAVOR}" ]]; then echo "Installing Surface Kernel:" # Add Linux Surface repo From dfc93aec0535b0cc5cb4b34f607672128b0be4ee Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 17 Nov 2023 00:34:10 -0800 Subject: [PATCH 08/14] chore(steamdeck): Don't check for dwc3-pci driver, moved to new package --- build-kmod-steamdeck.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-kmod-steamdeck.sh b/build-kmod-steamdeck.sh index 00933774..70484dc1 100755 --- a/build-kmod-steamdeck.sh +++ b/build-kmod-steamdeck.sh @@ -17,7 +17,5 @@ modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck/steamdeck-hwmon.ko.xz > /dev/ || (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck/{extcon,leds}-steamdeck.ko.xz > /dev/null \ || (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) -modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck/dwc3-pci.ko.xz > /dev/null \ -|| (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo From 34ecdce58f41b7e2e5c638b7c93af19f93292dad Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 17 Nov 2023 01:11:43 -0800 Subject: [PATCH 09/14] feat: Add dwc3 driver for Steam Deck DRD (#93) --- Containerfile.common | 1 + build-kmod-steamdeck-dwc3.sh | 19 +++++++++++++++++++ build-prep.sh | 5 +++++ 3 files changed, 25 insertions(+) create mode 100755 build-kmod-steamdeck-dwc3.sh diff --git a/Containerfile.common b/Containerfile.common index 9771d528..9882d9c4 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -40,6 +40,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ ; fi && \ if grep -qv "fsync" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-steamdeck.sh \ + /tmp/build-kmod-steamdeck-dwc3.sh \ ; fi && \ /tmp/build-kmod-gasket.sh && \ /tmp/build-kmod-gcadapter_oc.sh && \ diff --git a/build-kmod-steamdeck-dwc3.sh b/build-kmod-steamdeck-dwc3.sh new file mode 100755 index 00000000..9a6131f5 --- /dev/null +++ b/build-kmod-steamdeck-dwc3.sh @@ -0,0 +1,19 @@ +#!/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')" + +rpm-ostree install \ + akmod-steamdeck-dwc3-*.fc${RELEASE}.${ARCH} +akmods --force --kernels "${KERNEL}" --kmod steamdeck-dwc3 +modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck-dwc3/dwc3.ko.xz > /dev/null \ +|| (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) +modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck-dwc3/dwc3-{pci,haps}-hwmon.ko.xz > /dev/null \ +|| (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) + +rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo diff --git a/build-prep.sh b/build-prep.sh index 63ae7de2..bc8cb74d 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -14,6 +14,11 @@ else sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo fi +# Disable gpg on negativo until fixed. +if [[ -f /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo ]]; then + sed -i 's@gpgcheck=1@gpgcheck=0@g' /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo +fi + # enable RPMs with alternatives to create them in this image build mkdir -p /var/lib/alternatives From 07a88d0f9f35e51dc5617aa996314ec7868ca157 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 17 Nov 2023 01:19:57 -0800 Subject: [PATCH 10/14] chore: Minor syntax fix --- Containerfile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.common b/Containerfile.common index 9882d9c4..7e17ffdf 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -39,7 +39,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-evdi.sh \ ; fi && \ if grep -qv "fsync" <<< "${KERNEL_FLAVOR}"; then \ - /tmp/build-kmod-steamdeck.sh \ + /tmp/build-kmod-steamdeck.sh && \ /tmp/build-kmod-steamdeck-dwc3.sh \ ; fi && \ /tmp/build-kmod-gasket.sh && \ From 84cda83674ff803dd60d4a18ff89a161038a7e5a Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 17 Nov 2023 01:28:15 -0800 Subject: [PATCH 11/14] chore: Temporarily revert dwc3 change --- Containerfile.common | 3 +-- build-kmod-steamdeck-dwc3.sh | 19 ------------------- build-prep.sh | 5 ----- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100755 build-kmod-steamdeck-dwc3.sh diff --git a/Containerfile.common b/Containerfile.common index 7e17ffdf..9771d528 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -39,8 +39,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-evdi.sh \ ; fi && \ if grep -qv "fsync" <<< "${KERNEL_FLAVOR}"; then \ - /tmp/build-kmod-steamdeck.sh && \ - /tmp/build-kmod-steamdeck-dwc3.sh \ + /tmp/build-kmod-steamdeck.sh \ ; fi && \ /tmp/build-kmod-gasket.sh && \ /tmp/build-kmod-gcadapter_oc.sh && \ diff --git a/build-kmod-steamdeck-dwc3.sh b/build-kmod-steamdeck-dwc3.sh deleted file mode 100755 index 9a6131f5..00000000 --- a/build-kmod-steamdeck-dwc3.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/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')" - -rpm-ostree install \ - akmod-steamdeck-dwc3-*.fc${RELEASE}.${ARCH} -akmods --force --kernels "${KERNEL}" --kmod steamdeck-dwc3 -modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck-dwc3/dwc3.ko.xz > /dev/null \ -|| (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) -modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck-dwc3/dwc3-{pci,haps}-hwmon.ko.xz > /dev/null \ -|| (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) - -rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo diff --git a/build-prep.sh b/build-prep.sh index bc8cb74d..63ae7de2 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -14,11 +14,6 @@ else sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo fi -# Disable gpg on negativo until fixed. -if [[ -f /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo ]]; then - sed -i 's@gpgcheck=1@gpgcheck=0@g' /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo -fi - # enable RPMs with alternatives to create them in this image build mkdir -p /var/lib/alternatives From e1ee0c2368562385d0b7d66394516a2877652927 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:38:00 -0500 Subject: [PATCH 12/14] chore(deps): bump sigstore/cosign-installer from 3.1.2 to 3.2.0 (#92) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d1b934d..989117fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -185,7 +185,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} # Sign container - - uses: sigstore/cosign-installer@v3.1.2 + - uses: sigstore/cosign-installer@v3.2.0 if: github.event_name != 'pull_request' - name: Sign container image From 8b45c49800136acf8fa30980b0096f7542c3f184 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Mon, 20 Nov 2023 09:04:09 -0700 Subject: [PATCH 13/14] fix(xbox): Replace negativo17 fedora-steam repo with fedora-multimedia (#96) --- Containerfile.common | 2 -- build-kmod-xone.sh | 4 ++-- build-kmod-xpadneo.sh | 4 ++-- ublue-os-akmods-addons.spec | 15 +++++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Containerfile.common b/Containerfile.common index 9771d528..e084ceab 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -19,8 +19,6 @@ COPY certs /tmp/certs COPY ublue-os-akmods-addons.spec /tmp/ublue-os-akmods-addons/ublue-os-akmods-addons.spec ADD https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/repo/fedora-${FEDORA_MAJOR_VERSION}/ublue-os-akmods-fedora-${FEDORA_MAJOR_VERSION}.repo \ /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo -ADD https://negativo17.org/repos/fedora-steam.repo \ - /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-steam.repo ADD https://negativo17.org/repos/fedora-multimedia.repo \ /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo diff --git a/build-kmod-xone.sh b/build-kmod-xone.sh index 1c448143..7116060b 100755 --- a/build-kmod-xone.sh +++ b/build-kmod-xone.sh @@ -3,7 +3,7 @@ set -oeux pipefail -cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-steam.repo /etc/yum.repos.d/ +cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/ ARCH="$(rpm -E '%_arch')" KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" @@ -17,4 +17,4 @@ akmods --force --kernels "${KERNEL}" --kmod xone modinfo /usr/lib/modules/${KERNEL}/extra/xone/xone-{dongle,gip-chatpad,gip-gamepad,gip-guitar,gip-headset,gip,wired}.ko.xz > /dev/null \ || (find /var/cache/akmods/xone/ -name \*.log -print -exec cat {} \; && exit 1) -rm -f /etc/yum.repos.d/negativo17-fedora-steam.repo +rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo diff --git a/build-kmod-xpadneo.sh b/build-kmod-xpadneo.sh index d2776d53..59b63590 100755 --- a/build-kmod-xpadneo.sh +++ b/build-kmod-xpadneo.sh @@ -3,7 +3,7 @@ set -oeux pipefail -cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-steam.repo /etc/yum.repos.d/ +cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/ ARCH="$(rpm -E '%_arch')" KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" @@ -17,4 +17,4 @@ akmods --force --kernels "${KERNEL}" --kmod xpadneo modinfo /usr/lib/modules/${KERNEL}/extra/xpadneo/hid-xpadneo.ko.xz > /dev/null \ || (find /var/cache/akmods/xpadneo/ -name \*.log -print -exec cat {} \; && exit 1) -rm -f /etc/yum.repos.d/negativo17-fedora-steam.repo +rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo diff --git a/ublue-os-akmods-addons.spec b/ublue-os-akmods-addons.spec index d057877a..3e6db308 100644 --- a/ublue-os-akmods-addons.spec +++ b/ublue-os-akmods-addons.spec @@ -11,7 +11,7 @@ Supplements: mokutil policycoreutils Source0: public_key.der Source1: _copr_ublue-os-akmods.repo -Source2: negativo17-fedora-steam.repo +Source2: negativo17-fedora-multimedia.repo %description Adds the signing key for importing with mokutil to enable secure boot for kernel modules and repo files required to install akmod dependencies. @@ -24,23 +24,26 @@ Adds the signing key for importing with mokutil to enable secure boot for kernel # Have different name for *.der in case kmodgenca is needed for creating more keys install -Dm0644 %{SOURCE0} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/pki/akmods/certs/akmods-ublue.der install -Dm0644 %{SOURCE1} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/_copr_ublue-os-akmods.repo -install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-steam.repo +install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-multimedia.repo -sed -i 's@enabled=1@enabled=0@g' %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-steam.repo +sed -i 's@enabled=1@enabled=0@g' %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-multimedia.repo install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/pki/akmods/certs/akmods-ublue.der %{buildroot}%{_sysconfdir}/pki/akmods/certs/akmods-ublue.der install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/_copr_ublue-os-akmods.repo %{buildroot}%{_sysconfdir}/yum.repos.d/_copr_ublue-os-akmods.repo -install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-steam.repo %{buildroot}%{_sysconfdir}/yum.repos.d/negativo17-fedora-steam.repo +install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-multimedia.repo %{buildroot}%{_sysconfdir}/yum.repos.d/negativo17-fedora-multimedia.repo %files %attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/pki/akmods/certs/akmods-ublue.der %attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/_copr_ublue-os-akmods.repo -%attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-steam.repo +%attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/negativo17-fedora-multimedia.repo %attr(0644,root,root) %{_sysconfdir}/pki/akmods/certs/akmods-ublue.der %attr(0644,root,root) %{_sysconfdir}/yum.repos.d/_copr_ublue-os-akmods.repo -%attr(0644,root,root) %{_sysconfdir}/yum.repos.d/negativo17-fedora-steam.repo +%attr(0644,root,root) %{_sysconfdir}/yum.repos.d/negativo17-fedora-multimedia.repo %changelog +* Mon Nov 20 2023 RJ Trujillo - 0.4 +- Migrate xpadneo/xone modules from negativo17 fedora-steam to negativo17 fedora-multimedia + * Mon Jul 17 2023 Kyle Gospodnetich - 0.3 - Add ublue-os/akmods copr repo for modules not available upstream/elsewhere From c204fda2cb63f66ef892c878269144bcc28562d4 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Mon, 20 Nov 2023 12:33:48 -0600 Subject: [PATCH 14/14] chore: fix missing ublue-os-akmods-addons version bump (#97) --- ublue-os-akmods-addons.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ublue-os-akmods-addons.spec b/ublue-os-akmods-addons.spec index 3e6db308..8b1b31ff 100644 --- a/ublue-os-akmods-addons.spec +++ b/ublue-os-akmods-addons.spec @@ -1,5 +1,5 @@ Name: ublue-os-akmods-addons -Version: 0.3 +Version: 0.4 Release: 1%{?dist} Summary: Signing key and repos for ublue os akmods