From d6806f9327c84406d4f63c3d7c533b55c858e589 Mon Sep 17 00:00:00 2001 From: xyny <60004820+xynydev@users.noreply.github.com> Date: Wed, 27 Dec 2023 10:20:53 +0000 Subject: [PATCH 1/7] chore: migrate justfile to import https://github.com/ublue-os/config/issues/178 --- config/files/usr/share/ublue-os/just/60-custom.just | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/files/usr/share/ublue-os/just/60-custom.just b/config/files/usr/share/ublue-os/just/60-custom.just index bd38c97020..b077bd3224 100644 --- a/config/files/usr/share/ublue-os/just/60-custom.just +++ b/config/files/usr/share/ublue-os/just/60-custom.just @@ -1,2 +1,2 @@ -!include 100-bling.just +import 100-bling.just # Include some of your custom scripts here! From f35d3c25445c4963e99c35b043d154a68998f971 Mon Sep 17 00:00:00 2001 From: xyny <60004820+xynydev@users.noreply.github.com> Date: Sun, 31 Dec 2023 10:39:17 +0000 Subject: [PATCH 2/7] fix: add single quotes for paths --- config/files/usr/share/ublue-os/just/60-custom.just | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/files/usr/share/ublue-os/just/60-custom.just b/config/files/usr/share/ublue-os/just/60-custom.just index b077bd3224..9fbf49282e 100644 --- a/config/files/usr/share/ublue-os/just/60-custom.just +++ b/config/files/usr/share/ublue-os/just/60-custom.just @@ -1,2 +1,2 @@ -import 100-bling.just +import '100-bling.just' # Include some of your custom scripts here! From 4963395cd11a91753ae5c356f35a4614da4cf9d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:25:34 +0000 Subject: [PATCH 3/7] build(deps): bump EyeCantCU/cosign-action from 0.2.1 to 0.2.2 (#220) Bumps [EyeCantCU/cosign-action](https://github.com/eyecantcu/cosign-action) from 0.2.1 to 0.2.2. - [Release notes](https://github.com/eyecantcu/cosign-action/releases) - [Changelog](https://github.com/EyeCantCU/cosign-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/eyecantcu/cosign-action/compare/v0.2.1...v0.2.2) --- updated-dependencies: - dependency-name: EyeCantCU/cosign-action 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/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34638af9d7..e8f2c16368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: echo "BASE_IMAGE_NAME=$(echo $BASE_IMAGE | sed 's/.*\/.*\///')" >> $GITHUB_ENV - name: Verify base image - uses: EyeCantCU/cosign-action/verify@v0.2.1 + uses: EyeCantCU/cosign-action/verify@v0.2.2 with: containers: ${{ env.BASE_IMAGE_NAME }}:${{ env.IMAGE_MAJOR_VERSION }} From 6b2584ff0cc73b82984bbc3b5ed7ce2cd5f5add6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:32:57 +0000 Subject: [PATCH 4/7] build(deps): bump AdityaGarg8/remove-unwanted-software from 1 to 2 (#219) Bumps [AdityaGarg8/remove-unwanted-software](https://github.com/adityagarg8/remove-unwanted-software) from 1 to 2. - [Release notes](https://github.com/adityagarg8/remove-unwanted-software/releases) - [Commits](https://github.com/adityagarg8/remove-unwanted-software/compare/v1...v2) --- updated-dependencies: - dependency-name: AdityaGarg8/remove-unwanted-software dependency-type: direct:production update-type: version-update:semver-major ... 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 e8f2c16368..74d86e1419 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,7 +159,7 @@ jobs: string: ${{ env.IMAGE_NAME }} - name: Maximize build space - uses: AdityaGarg8/remove-unwanted-software@v1 + uses: AdityaGarg8/remove-unwanted-software@v2 with: remove-dotnet: 'true' remove-android: 'true' From 80b3ac0ffdf8624086ea95ce7a1181a1bc5f08ce Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:23:15 +0100 Subject: [PATCH 5/7] feat: Bump ISO generator to v2.3.0 (#221) Installs secure boot/akmod key on all images --- .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 90afd21cf5..4ad0a4fbf9 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.2.0 + uses: ublue-os/isogenerator@v2.3.0 id: isogenerator with: image-name: ${{ github.event.repository.name }} 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 6/7] 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 7/7] 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 }}