| Message ID | 3f662e3b4ded36d982ff04ed5cdfdd8e36f83594.1707499278.git.oleksii.kurochko@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce generic headers | expand |
Hi Oleksii, On 09/02/2024 19:00, Oleksii Kurochko wrote: > > > This patch introduces the file riscv-fixed-randconfig.yaml, > which includes all configurations that should be disabled for > randconfig builds. > > Suggested-by: Stefano Stabellini <sstabellini@kernel.org> > Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com> > --- > The patch were introduced after discussion in a topic: > https://lore.kernel.org/xen-devel/cover.1701966261.git.oleksii.kurochko@gmail.com/ > --- > Changes in V8: > - Nothing changed. Only rebase > --- > Changes in V7: > - Nothing changed. Only rebase > --- > Changes in V6: > - The patch was introduced in this version of patch series. > --- > automation/gitlab-ci/build.yaml | 8 ++++---- > automation/gitlab-ci/riscv-fixed-randconfig.yaml | 7 +++++++ > 2 files changed, 11 insertions(+), 4 deletions(-) > create mode 100644 automation/gitlab-ci/riscv-fixed-randconfig.yaml > > diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml > index 6d2cb18b88..376eb17f9c 100644 > --- a/automation/gitlab-ci/build.yaml > +++ b/automation/gitlab-ci/build.yaml > @@ -512,6 +512,8 @@ alpine-3.18-gcc-debug-arm64-boot-cpupools: > CONFIG_BOOT_TIME_CPUPOOLS=y > > # RISC-V 64 cross-build > +include: 'automation/gitlab-ci/riscv-fixed-randconfig.yaml' I don't think there is a need to create a new file for that. You could define an anchor in build.yaml: # RISC-V 64 cross-build .riscv-fixed-randconfig: variables: &riscv-fixed-randconfig EXTRA_FIXED_RANDCONFIG: | CONFIG_COVERAGE=n CONFIG_EXPERT=y CONFIG_GRANT_TABLE=n CONFIG_MEM_ACCESS=n and reference it in the job: archlinux-current-gcc-riscv64-randconfig: extends: .gcc-riscv64-cross-build variables: CONTAINER: archlinux:current-riscv64 KBUILD_DEFCONFIG: tiny64_defconfig RANDCONFIG: y <<: *riscv-fixed-randconfig ~Michal
On Mon, 2024-02-12 at 09:39 +0100, Michal Orzel wrote: > Hi Oleksii, Hi Michal, > > On 09/02/2024 19:00, Oleksii Kurochko wrote: > > > > > > This patch introduces the file riscv-fixed-randconfig.yaml, > > which includes all configurations that should be disabled for > > randconfig builds. > > > > Suggested-by: Stefano Stabellini <sstabellini@kernel.org> > > Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com> > > --- > > The patch were introduced after discussion in a topic: > > > > https://lore.kernel.org/xen-devel/cover.1701966261.git.oleksii.kurochko@gmail.com > > / > > --- > > Changes in V8: > > - Nothing changed. Only rebase > > --- > > Changes in V7: > > - Nothing changed. Only rebase > > --- > > Changes in V6: > > - The patch was introduced in this version of patch series. > > --- > > automation/gitlab-ci/build.yaml | 8 ++++---- > > automation/gitlab-ci/riscv-fixed-randconfig.yaml | 7 +++++++ > > 2 files changed, 11 insertions(+), 4 deletions(-) > > create mode 100644 automation/gitlab-ci/riscv-fixed- > > randconfig.yaml > > > > diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab- > > ci/build.yaml > > index 6d2cb18b88..376eb17f9c 100644 > > --- a/automation/gitlab-ci/build.yaml > > +++ b/automation/gitlab-ci/build.yaml > > @@ -512,6 +512,8 @@ alpine-3.18-gcc-debug-arm64-boot-cpupools: > > CONFIG_BOOT_TIME_CPUPOOLS=y > > > > # RISC-V 64 cross-build > > +include: 'automation/gitlab-ci/riscv-fixed-randconfig.yaml' > I don't think there is a need to create a new file for that. > You could define an anchor in build.yaml: > > # RISC-V 64 cross-build > .riscv-fixed-randconfig: > variables: &riscv-fixed-randconfig > EXTRA_FIXED_RANDCONFIG: | > CONFIG_COVERAGE=n > CONFIG_EXPERT=y > CONFIG_GRANT_TABLE=n > CONFIG_MEM_ACCESS=n > > and reference it in the job: > > archlinux-current-gcc-riscv64-randconfig: > extends: .gcc-riscv64-cross-build > variables: > CONTAINER: archlinux:current-riscv64 > KBUILD_DEFCONFIG: tiny64_defconfig > RANDCONFIG: y > <<: *riscv-fixed-randconfig I've created a new file just for convenience, build.yaml. It is pretty large, and it's not always easy to navigate, especially when you don't remember a specific name. This is not directly related to this patch, but it seems to me that it would be better to create arch-specific files and include them in build.yaml. If it would be better not to create a new file, I am okay to drop it and add everything to build.yaml. Thanks. ~ Oleksii
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 6d2cb18b88..376eb17f9c 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -512,6 +512,8 @@ alpine-3.18-gcc-debug-arm64-boot-cpupools: CONFIG_BOOT_TIME_CPUPOOLS=y # RISC-V 64 cross-build +include: 'automation/gitlab-ci/riscv-fixed-randconfig.yaml' + archlinux-current-gcc-riscv64: extends: .gcc-riscv64-cross-build variables: @@ -532,8 +534,7 @@ archlinux-current-gcc-riscv64-randconfig: CONTAINER: archlinux:current-riscv64 KBUILD_DEFCONFIG: tiny64_defconfig RANDCONFIG: y - EXTRA_FIXED_RANDCONFIG: - CONFIG_COVERAGE=n + EXTRA_FIXED_RANDCONFIG: !reference [.riscv-fixed-randconfig, variables, EXTRA_FIXED_RANDCONFIG] archlinux-current-gcc-riscv64-debug-randconfig: extends: .gcc-riscv64-cross-build-debug @@ -541,8 +542,7 @@ archlinux-current-gcc-riscv64-debug-randconfig: CONTAINER: archlinux:current-riscv64 KBUILD_DEFCONFIG: tiny64_defconfig RANDCONFIG: y - EXTRA_FIXED_RANDCONFIG: - CONFIG_COVERAGE=n + EXTRA_FIXED_RANDCONFIG: !reference [.riscv-fixed-randconfig, variables, EXTRA_FIXED_RANDCONFIG] # Power cross-build debian-bullseye-gcc-ppc64le: diff --git a/automation/gitlab-ci/riscv-fixed-randconfig.yaml b/automation/gitlab-ci/riscv-fixed-randconfig.yaml new file mode 100644 index 0000000000..f1282b40c9 --- /dev/null +++ b/automation/gitlab-ci/riscv-fixed-randconfig.yaml @@ -0,0 +1,7 @@ +.riscv-fixed-randconfig: + variables: + EXTRA_FIXED_RANDCONFIG: + CONFIG_COVERAGE=n + CONFIG_EXPERT=y + CONFIG_GRANT_TABLE=n + CONFIG_MEM_ACCESS=n
This patch introduces the file riscv-fixed-randconfig.yaml, which includes all configurations that should be disabled for randconfig builds. Suggested-by: Stefano Stabellini <sstabellini@kernel.org> Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com> --- The patch were introduced after discussion in a topic: https://lore.kernel.org/xen-devel/cover.1701966261.git.oleksii.kurochko@gmail.com/ --- Changes in V8: - Nothing changed. Only rebase --- Changes in V7: - Nothing changed. Only rebase --- Changes in V6: - The patch was introduced in this version of patch series. --- automation/gitlab-ci/build.yaml | 8 ++++---- automation/gitlab-ci/riscv-fixed-randconfig.yaml | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 automation/gitlab-ci/riscv-fixed-randconfig.yaml