From a2ebd9ceffbaadaec3a6fa6b4868942c45590d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Thu, 28 Jul 2022 10:41:49 -0700 Subject: [PATCH] Rely on upstream kernel configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So far we have relied on the kernel configuration as checked into the this repository. However, a suitable configuration is now included in upstream Linux [0]. With this change we add support for using the configuration from there. [0] https://lore.kernel.org/bpf/165893461358.29339.11641967418379627671.git-patchwork-notify@kernel.org/T/#m2a97b0ea9ef0ddee7a53bbf7919e3f324b233937 Signed-off-by: Daniel Müller --- .github/actions/vmtest/action.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/vmtest/action.yml b/.github/actions/vmtest/action.yml index 1bb52c6..398bb89 100644 --- a/.github/actions/vmtest/action.yml +++ b/.github/actions/vmtest/action.yml @@ -43,7 +43,10 @@ runs: run: | echo "::group::Prepare buidling selftest" cd .kernel - cp ${{ github.workspace }}/travis-ci/vmtest/configs/config-latest.${{ inputs.arch }} .config + cat tools/testing/selftests/bpf/config \ + tools/testing/selftests/bpf/config.${{ inputs.arch }} \ + ${{ github.workspace }}/travis-ci/vmtest/configs/config-latest \ + ${{ github.workspace }}/travis-ci/vmtest/configs/config-latest.${{ inputs.arch }} 2> /dev/null > .config && : make olddefconfig && make prepare cd - echo "::endgroup::"