From 65de03fa7ef480ade8e1338e8ac2516c0369b2de Mon Sep 17 00:00:00 2001 From: Yury Sannikov Date: Tue, 20 Feb 2024 04:45:33 +0300 Subject: [PATCH] rebuild kernel tools --- .github/workflows/build-module.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-module.yml b/.github/workflows/build-module.yml index ab24cc3..a0dcb83 100644 --- a/.github/workflows/build-module.yml +++ b/.github/workflows/build-module.yml @@ -42,12 +42,12 @@ jobs: id: cache-tools-kernel uses: actions/cache@v3 env: - cache-name: "cache-tools-kernel-v${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}" + cache-name: "cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}" with: path: . key: ${{ runner.os }}-build-${{ env.cache-name }} restore-keys: | - ${{ runner.os }}-build-cache-tools-kernel-v${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}- + ${{ runner.os }}-build-cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}- - name: Building kernel and tools if: ${{ steps.cache-tools-kernel.outputs.cache-hit != 'true' }} @@ -58,12 +58,11 @@ jobs: echo "pkgarch: ${pkgarch}, target: ${target}, subtarget: ${subtarget}" - wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${target}/${subtarget}/config.buildinfo -O .config + wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config - echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config @@ -100,16 +99,11 @@ jobs: echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config - echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config - echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config - echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config make defconfig - # - make target/linux/compile || true - echo "Kernel vermagic AFTER:" - cat ./build_dir/target-*/linux-*/linux-*/.vermagic + echo "Final Kernel vermagic:" + cat ./build_dir/target-*/linux-*/linux-*/.vermagic - name: Build amneziawg-tools run: |