From bbb5894c9b0972622f818515ac71bf404487bb95 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Sun, 22 Sep 2024 14:27:03 +0200 Subject: [PATCH 01/13] linux v6.11 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index bd3a9e5..98f7e32 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit bd3a9e5771a8b332f466d06f7c130a69cab0d526 +Subproject commit 98f7e32f20d28ec452afb208f9cffc08448a2652 From f124f26a32a09d8e13f428c1ab34352dd1e29cfa Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Sat, 19 Oct 2024 22:03:12 +0200 Subject: [PATCH 02/13] linux v6.11.4 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index 98f7e32..17365d6 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 98f7e32f20d28ec452afb208f9cffc08448a2652 +Subproject commit 17365d66f1c6aa6bf4f4cb9842f5edeac027bcfb From ba296dbb41b2fead7633dd3b63156c4b3b55de18 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Thu, 24 Oct 2024 21:36:23 +0200 Subject: [PATCH 03/13] linux v6.11.5 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index 17365d6..05b1367 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 17365d66f1c6aa6bf4f4cb9842f5edeac027bcfb +Subproject commit 05b1367d372aca98a4e09c1a0e7ff0b9d721b2bc From 0bf5f0901feebcf6c2d0f921eaf76508c5ce6de9 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Tue, 29 Oct 2024 06:34:34 +0100 Subject: [PATCH 04/13] CI: cross compile on GitHub runner --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5dca53f..351cf06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,15 +12,15 @@ jobs: strategy: matrix: platform: ["x86_64", "arm64"] - runs-on: ${{ matrix.platform == 'x86_64' && 'ubuntu-latest' || 'ARM64' }} + runs-on: ubuntu-latest container: - image: registry.fedoraproject.org/fedora-minimal:39 + image: registry.fedoraproject.org/fedora-minimal:40 steps: - name: Install dependencies run: | dnf5 update -y - dnf5 install -y git make gcc ccache flex bison elfutils-devel parted vboot-utils golang xz bc tar openssl-devel python3-pip uboot-tools + dnf5 install -y git make gcc ccache flex bison elfutils-devel parted vboot-utils golang xz bc tar openssl-devel python3-pip uboot-tools ${{ matrix.platform == 'arm64' && 'gcc-aarch64-linux-gnu' || '' }} pip3 install depthcharge-tools - uses: actions/checkout@v3 @@ -63,7 +63,7 @@ jobs: run: cp configs/kernel.${{ matrix.platform == 'x86_64' && 'x86' || 'a64' }} kernel/.config - name: Build submarine - run: make CC="ccache gcc" -j$(nproc) ${{ matrix.platform }} + run: make ${{ matrix.platform == 'x86_64' && 'CC="ccache gcc"' || '' }} -j$(nproc) ${{ matrix.platform }} - name: Upload build artifacts uses: actions/upload-artifact@v3 From 0079ce109c623c6000b19ee5610f4679c9f4b9cb Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 8 Nov 2024 17:08:39 -0800 Subject: [PATCH 05/13] use f41 --- .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 351cf06..cbedf89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: platform: ["x86_64", "arm64"] runs-on: ubuntu-latest container: - image: registry.fedoraproject.org/fedora-minimal:40 + image: registry.fedoraproject.org/fedora-minimal:41 steps: - name: Install dependencies From eca2fa24b6973f8b7d622fe765b509ce280657c9 Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 8 Nov 2024 17:16:26 -0800 Subject: [PATCH 06/13] upgrade action versions --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbedf89..28289b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: dnf5 install -y git make gcc ccache flex bison elfutils-devel parted vboot-utils golang xz bc tar openssl-devel python3-pip uboot-tools ${{ matrix.platform == 'arm64' && 'gcc-aarch64-linux-gnu' || '' }} pip3 install depthcharge-tools - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true @@ -40,7 +40,7 @@ jobs: echo "KERNEL_COMMIT=$(git rev-parse HEAD:kernel)" >> $GITHUB_ENV - name: Setup Go cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.GOCACHE }} key: go-${{ matrix.platform }}-${{ env.UROOT_COMMIT }} @@ -48,7 +48,7 @@ jobs: go-${{ matrix.platform }}- - name: Setup ccache cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.CCACHE_DIR }} key: ccache-${{ matrix.platform }}-${{ env.KERNEL_COMMIT }}-${{ hashFiles('kernel.config') }} @@ -66,7 +66,7 @@ jobs: run: make ${{ matrix.platform == 'x86_64' && 'CC="ccache gcc"' || '' }} -j$(nproc) ${{ matrix.platform }} - name: Upload build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: submarine-${{ matrix.platform }} path: build From c7d11e21c5fb279f885b4cc7815f34eb9a64332f Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 8 Nov 2024 18:13:56 -0800 Subject: [PATCH 07/13] pull in engine --- .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 28289b2..c3692cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | dnf5 update -y - dnf5 install -y git make gcc ccache flex bison elfutils-devel parted vboot-utils golang xz bc tar openssl-devel python3-pip uboot-tools ${{ matrix.platform == 'arm64' && 'gcc-aarch64-linux-gnu' || '' }} + dnf5 install -y git make gcc ccache flex bison elfutils-devel parted vboot-utils golang xz bc tar openssl-devel openssl-engine-devel python3-pip uboot-tools ${{ matrix.platform == 'arm64' && 'gcc-aarch64-linux-gnu' || '' }} pip3 install depthcharge-tools - uses: actions/checkout@v4 From 028afa85fb63320e666618c9c1adede463baf250 Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 8 Nov 2024 18:15:18 -0800 Subject: [PATCH 08/13] oops --- .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 c3692cd..e66509c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | dnf5 update -y - dnf5 install -y git make gcc ccache flex bison elfutils-devel parted vboot-utils golang xz bc tar openssl-devel openssl-engine-devel python3-pip uboot-tools ${{ matrix.platform == 'arm64' && 'gcc-aarch64-linux-gnu' || '' }} + dnf5 install -y git make gcc ccache flex bison elfutils-devel parted vboot-utils golang xz bc tar openssl-devel openssl-devel-engine python3-pip uboot-tools ${{ matrix.platform == 'arm64' && 'gcc-aarch64-linux-gnu' || '' }} pip3 install depthcharge-tools - uses: actions/checkout@v4 From de6185ded39bb70214cfb5ed923155cf9f4bf36a Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Mon, 11 Nov 2024 23:26:27 +0100 Subject: [PATCH 09/13] linux v6.11.7 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index 05b1367..b1cbf91 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 05b1367d372aca98a4e09c1a0e7ff0b9d721b2bc +Subproject commit b1cbf9151204cd222ac09efa193a02d0dc9f6ce3 From 45982425047978ef6cd044e0a6ddfa2420596e2f Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Tue, 19 Nov 2024 20:37:29 +0100 Subject: [PATCH 10/13] linux v6.12 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index b1cbf91..adc2186 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit b1cbf9151204cd222ac09efa193a02d0dc9f6ce3 +Subproject commit adc218676eef25575469234709c2d87185ca223a From a25210371aa3ed5e297e6f8140bd379ec2aba1c2 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Wed, 27 Nov 2024 23:56:25 +0100 Subject: [PATCH 11/13] linux v6.12.1 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index adc2186..d390303 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit adc218676eef25575469234709c2d87185ca223a +Subproject commit d390303b28dabbb91b2d32016a4f72da478733b9 From 2db49f67c6ad14c714cc30a78c64186067f8b2eb Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Thu, 5 Dec 2024 14:51:44 +0100 Subject: [PATCH 12/13] linux v6.12.2 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index d390303..fa10f34 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit d390303b28dabbb91b2d32016a4f72da478733b9 +Subproject commit fa10f348fd80c7ea7b7c0a7763ba7c0bf1a16be3 From e5d3f0d73d872c15f2504d953aa6a3480be2c760 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Mon, 30 Dec 2024 01:35:51 +0100 Subject: [PATCH 13/13] linux v6.12.7 --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index fa10f34..319addc 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit fa10f348fd80c7ea7b7c0a7763ba7c0bf1a16be3 +Subproject commit 319addc2ad901dac4d6cc931d77ef35073e0942f