From df4f3301ae1f8ef7da1a8970895680b64e014866 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Sun, 14 Jan 2024 18:24:03 +0100 Subject: [PATCH 1/2] feat: Add akmods module (#212) * feat: Add kmods installer module Credits: @C0dePlayer This is not ideal as it does not support custom kernels & it involves editing Containerfile. I believe there is no other way but to make users edit Containerfile for those files to be even pulled of. I would like this to be through the recipe only, so I will put this as a draft until some better ideas come. * Update Containerfile Related to this: https://github.com/ublue-os/bling/blob/d76cca4f3abc7e0730c45e3d820d36b236194c89/modules/akmods/README.md * Clarify change of akmod version better Part of adding support for Surface & Asus images. --- Containerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Containerfile b/Containerfile index 735aa5d1e1..645cfab205 100644 --- a/Containerfile +++ b/Containerfile @@ -42,6 +42,9 @@ COPY modules /tmp/modules/ # It is copied from the official container image since it's not available as an RPM. COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq +# Change this if you want different version/tag of akmods. +COPY --from=ghcr.io/ublue-os/akmods:main-39 /rpms /tmp/rpms + # Run the build script, then clean up temp files and finalize container build. RUN chmod +x /tmp/build.sh && /tmp/build.sh && \ rm -rf /tmp/* /var/* && ostree container commit From 5cf7429540ffe2fe3fae5d712c70e03f93cfc00b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:04:37 +0000 Subject: [PATCH 2/2] build(deps): bump ublue-os/isogenerator from 2.3.0 to 2.3.1 (#227) Bumps [ublue-os/isogenerator](https://github.com/ublue-os/isogenerator) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/ublue-os/isogenerator/releases) - [Changelog](https://github.com/ublue-os/isogenerator/blob/main/CHANGELOG.md) - [Commits](https://github.com/ublue-os/isogenerator/compare/v2.3.0...v2.3.1) --- updated-dependencies: - dependency-name: ublue-os/isogenerator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 4ad0a4fbf9..899f934cfe 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Generate ISO - uses: ublue-os/isogenerator@v2.3.0 + uses: ublue-os/isogenerator@v2.3.1 id: isogenerator with: image-name: ${{ github.event.repository.name }}