diff --git a/.github/workflows/fedora-32.yml b/.github/workflows/fedora-32.yml deleted file mode 100644 index 6c630a606..000000000 --- a/.github/workflows/fedora-32.yml +++ /dev/null @@ -1,128 +0,0 @@ -on: - push: - tags: - - 'fedora-32-*' - -name: Fedora 32 - -env: - GPG_KEY_ID: 56C464BAAC421453 - -jobs: - build: - name: Build Kernel - runs-on: ubuntu-latest - container: fedora:32 - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Install build dependencies - run: | - dnf distro-sync -y - dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)' - dnf builddep -y pkg/fedora/kernel-surface/kernel-surface.spec - - - name: Setup secureboot certificate - env: - SB_KEY: ${{ secrets.SURFACE_SB_KEY }} - run: | - cd pkg - - # Install the surface secureboot certificate - echo "$SB_KEY" | base64 -d > fedora/kernel-surface/surface.key - cp keys/surface.crt fedora/kernel-surface/surface.crt - - - name: Build packages - run: | - cd pkg/fedora/kernel-surface - - # Build the .rpm packages - ../makerpm -- --with=signkernel -ba - - - name: Sign packages - env: - GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }} - run: | - cd pkg/fedora/kernel-surface/out/x86_64 - - # import GPG key - echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes - - # sign packages - rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID" - - - name: Upload artifacts - uses: actions/upload-artifact@v1 - with: - name: fedora-32-latest - path: pkg/fedora/kernel-surface/out/x86_64 - - release: - name: Publish release - needs: [build] - runs-on: ubuntu-latest - steps: - - name: Download artifacts - uses: actions/download-artifact@v1 - with: - name: fedora-32-latest - - - name: Upload assets - uses: svenstaro/upload-release-action@v1-release - with: - repo_token: ${{ secrets.GITHUB_BOT_TOKEN }} - file: ./*-latest/* - tag: ${{ github.ref }} - overwrite: true - file_glob: true - - repo: - name: Update package repository - needs: [release] - runs-on: ubuntu-latest - container: fedora:32 - steps: - - name: Install dependencies - run: | - dnf install -y git findutils - - - name: Download artifacts - uses: actions/download-artifact@v1 - with: - name: fedora-32-latest - - - name: Update repository - env: - SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }} - BRANCH_STAGING: u/staging - GIT_REF: ${{ github.ref }} - run: | - repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git" - - # clone package repository - git clone -b "${BRANCH_STAGING}" "${repo}" repo - - # copy packages - cp fedora-32-latest/* repo/fedora/f32 - cd repo/fedora/f32 - - # parse git tag from ref - GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g') - - # convert packages into references - for pkg in $(find . -name '*.rpm'); do - echo "linux-surface:$GIT_TAG/$(basename $pkg)" > $pkg.blob - rm $pkg - done - - # set git identity - git config --global user.email "surfacebot@users.noreply.github.com" - git config --global user.name "surfacebot" - - # commit and push - update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" - git checkout -b "${update_branch}" - git add . - git commit -m "Update Fedora 32 kernel" - git push --set-upstream origin "${update_branch}" diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec index 2b7e19220..8cbf893a7 100755 --- a/pkg/fedora/kernel-surface/kernel-surface.spec +++ b/pkg/fedora/kernel-surface/kernel-surface.spec @@ -4,18 +4,15 @@ %global kernel_tag_fc34 kernel-5.12.12-300.fc34 %global kernel_tag_fc33 kernel-5.12.12-200.fc33 -%global kernel_tag_fc32 kernel-5.11.22-100.fc32 %global kernel_release_fc34 1 %global kernel_release_fc33 1 -%global kernel_release_fc32 2 # This is what is printed in the GRUB menu. These cannot be fetched from the # buildhost, because in a container this will also say container. To get the # same text as the default kernels, just hardcode it. Hey, this is important! %global fedora_title_fc34 34 (Thirty Four) %global fedora_title_fc33 33 (Thirty Three) -%global fedora_title_fc32 32 (Thirty Two) %global ls_patches_commit 7deb5ff4d270016e22b2520afb83e6983984dfae @@ -97,8 +94,6 @@ Source21: %{sb_key} Source100: mod-sign.sh Source101: parallel_xz.sh -%if "%{kernel_majorver}" == "5.12" - Patch0: %{surface_source}/%{kernel_patches}/0001-surface3-oemb.patch Patch1: %{surface_source}/%{kernel_patches}/0002-mwifiex.patch Patch2: %{surface_source}/%{kernel_patches}/0003-ath10k.patch @@ -110,21 +105,6 @@ Patch7: %{surface_source}/%{kernel_patches}/0008-surface-go-touchscreen.patc Patch8: %{surface_source}/%{kernel_patches}/0009-cameras.patch Patch9: %{surface_source}/%{kernel_patches}/0010-s0ix-amd.patch -%else - -Patch0: %{surface_source}/%{kernel_patches}/0001-surface3-oemb.patch -Patch1: %{surface_source}/%{kernel_patches}/0002-wifi.patch -Patch2: %{surface_source}/%{kernel_patches}/0003-ipts.patch -Patch3: %{surface_source}/%{kernel_patches}/0004-surface-sam-over-hid.patch -Patch4: %{surface_source}/%{kernel_patches}/0005-surface-sam.patch -Patch5: %{surface_source}/%{kernel_patches}/0006-surface-hotplug.patch -Patch6: %{surface_source}/%{kernel_patches}/0007-surface-typecover.patch -Patch7: %{surface_source}/%{kernel_patches}/0008-surface-sensors.patch -Patch8: %{surface_source}/%{kernel_patches}/0009-cameras.patch -Patch9: %{surface_source}/%{kernel_patches}/0010-ath10k-firmware-override.patch - -%endif - Patch100: 0001-Add-secureboot-pre-signing-to-the-kernel.patch ExclusiveArch: x86_64