diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51b0b12..a5f3cac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,6 +40,8 @@ jobs: - name: "Checkout" uses: actions/checkout@v3 + with: + submodules: recursive - name: "Build" run: | diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..dee929e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "kernel/linux-t2-patches"] + path = kernel/linux-t2-patches + url = https://github.com/t2linux/linux-t2-patches diff --git a/kernel/kernel.sh b/kernel/kernel.sh index 682d87d..c4bb1fa 100755 --- a/kernel/kernel.sh +++ b/kernel/kernel.sh @@ -1,7 +1,5 @@ #!/usr/bin/bash FEDORA_KERNEL_VERSION=6.5.5-200.fc38 -PATCHES_COMMIT=3aeff9385079f5f362a5447cdb9f4e2b48962c92 - cd /repo/kernel koji download-build --quiet --arch=src "kernel-${FEDORA_KERNEL_VERSION}" rpmdev-extract -q "kernel-${FEDORA_KERNEL_VERSION}".src.rpm @@ -16,9 +14,7 @@ sed -i 's/# define buildid .local/%define buildid .t2/g' kernel.spec # Disable debug kernels sed -i "/%define with_debug /c %define with_debug 0" kernel.spec -git clone --quiet --single-branch --branch main https://github.com/t2linux/linux-t2-patches patches && cd patches -git checkout --quiet ${PATCHES_COMMIT} -cd .. +cat linux-t2-patches/extra_config > kernel-local +cat linux-t2-patches/*.patch > linux-kernel-test.patch -cat patches/extra_config > kernel-local -cat patches/*.patch > linux-kernel-test.patch +cd .. diff --git a/kernel/linux-t2-patches b/kernel/linux-t2-patches new file mode 160000 index 0000000..3aeff93 --- /dev/null +++ b/kernel/linux-t2-patches @@ -0,0 +1 @@ +Subproject commit 3aeff9385079f5f362a5447cdb9f4e2b48962c92