diff mbox series

[v3,1/2] automation: Change build script to use arch defconfig

Message ID 5baa15904c5bb5f8d668c67519ad08293c32982d.1695767747.git.sanastasio@raptorengineering.com (mailing list archive)
State New, archived
Headers show
Series Fix Power CI build | expand

Commit Message

Shawn Anastasio Sept. 26, 2023, 10:37 p.m. UTC
Change automation build script to call the make defconfig target before
setting CONFIG_DEBUG and extra options. This fixes issues on Power where
the build fails without using the ppc64_defconfig.

Reported-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Shawn Anastasio <sanastasio@raptorengineering.com>
---
v3: Drop unnecessary sed.

v2: No changes.

 automation/scripts/build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--
2.30.2

Comments

Henry Wang Sept. 26, 2023, 11:45 p.m. UTC | #1
Hi Shawn,

> On Sep 27, 2023, at 06:37, Shawn Anastasio <sanastasio@raptorengineering.com> wrote:
> 
> Change automation build script to call the make defconfig target before
> setting CONFIG_DEBUG and extra options. This fixes issues on Power where
> the build fails without using the ppc64_defconfig.
> 
> Reported-by: Jan Beulich <jbeulich@suse.com>
> Signed-off-by: Shawn Anastasio <sanastasio@raptorengineering.com>

As discussed in v1, CI fixes should be included in 4.18, so:

Release-acked-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry


> ---
> v3: Drop unnecessary sed.
> 
> v2: No changes.
> 
> automation/scripts/build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/automation/scripts/build b/automation/scripts/build
> index b4edcf010e..b3c71fb6fb 100755
> --- a/automation/scripts/build
> +++ b/automation/scripts/build
> @@ -22,7 +22,10 @@ if [[ "${RANDCONFIG}" == "y" ]]; then
>     # RANDCONFIG implies HYPERVISOR_ONLY
>     HYPERVISOR_ONLY="y"
> else
> -    echo "CONFIG_DEBUG=${debug}" > xen/.config
> +    # Start off with arch's defconfig
> +    make -C xen defconfig
> +
> +    echo "CONFIG_DEBUG=${debug}" >> xen/.config
> 
>     if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then
>         echo "${EXTRA_XEN_CONFIG}" >> xen/.config
> --
> 2.30.2
> 
>
Stefano Stabellini Sept. 26, 2023, 11:56 p.m. UTC | #2
On Tue, 26 Sep 2023, Shawn Anastasio wrote:
> Change automation build script to call the make defconfig target before
> setting CONFIG_DEBUG and extra options. This fixes issues on Power where
> the build fails without using the ppc64_defconfig.
> 
> Reported-by: Jan Beulich <jbeulich@suse.com>
> Signed-off-by: Shawn Anastasio <sanastasio@raptorengineering.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
> v3: Drop unnecessary sed.
> 
> v2: No changes.
> 
>  automation/scripts/build | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/automation/scripts/build b/automation/scripts/build
> index b4edcf010e..b3c71fb6fb 100755
> --- a/automation/scripts/build
> +++ b/automation/scripts/build
> @@ -22,7 +22,10 @@ if [[ "${RANDCONFIG}" == "y" ]]; then
>      # RANDCONFIG implies HYPERVISOR_ONLY
>      HYPERVISOR_ONLY="y"
>  else
> -    echo "CONFIG_DEBUG=${debug}" > xen/.config
> +    # Start off with arch's defconfig
> +    make -C xen defconfig
> +
> +    echo "CONFIG_DEBUG=${debug}" >> xen/.config
> 
>      if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then
>          echo "${EXTRA_XEN_CONFIG}" >> xen/.config
> --
> 2.30.2
>
diff mbox series

Patch

diff --git a/automation/scripts/build b/automation/scripts/build
index b4edcf010e..b3c71fb6fb 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -22,7 +22,10 @@  if [[ "${RANDCONFIG}" == "y" ]]; then
     # RANDCONFIG implies HYPERVISOR_ONLY
     HYPERVISOR_ONLY="y"
 else
-    echo "CONFIG_DEBUG=${debug}" > xen/.config
+    # Start off with arch's defconfig
+    make -C xen defconfig
+
+    echo "CONFIG_DEBUG=${debug}" >> xen/.config

     if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then
         echo "${EXTRA_XEN_CONFIG}" >> xen/.config