[XEN PATCH 0/2] xen/build: fix kconfig errors during config merge

[XEN PATCH 0/2] xen/build: fix kconfig errors during config merge

[Stewart Hildebrand]

This series fixes a couple of kconfig errors that I observed while
invoking a build with a defconfig and config fragment.

I invoked the build as follows:

cat > xen/arch/arm/configs/custom.config <<EOF
CONFIG_DEBUG=y
CONFIG_SCHED_ARINC653=y
CONFIG_EARLY_PRINTK_ZYNQMP=y
EOF
make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig custom.config
make XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- dist-xen -j $(nproc)

Stewart Hildebrand (2):
  xen/build: fixup path to merge_config.sh
  xen/build: use the correct kconfig makefile

 xen/tools/kconfig/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.26.2

[XEN PATCH 1/2] xen/build: fixup path to merge_config.sh

[Stewart Hildebrand]

This resolves the following observed error:

/bin/sh: /path/to/xen/xen/../xen/scripts/kconfig/merge_config.sh: No such file or directory

Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
---
 xen/tools/kconfig/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile
index ef2f2336c4..fd37f4386a 100644
--- a/xen/tools/kconfig/Makefile
+++ b/xen/tools/kconfig/Makefile
@@ -93,7 +93,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
 
 %.config: $(obj)/conf
 	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
-	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
+	$(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles)
 	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 
 PHONY += kvmconfig
-- 
2.26.2

[XEN PATCH 2/2] xen/build: use the correct kconfig makefile

[Stewart Hildebrand]

This resolves the following observed error:

#
# merged configuration written to .config (needs make)
#
make -f /path/to/xen/xen/../xen/Makefile olddefconfig
make[2]: Entering directory '/path/to/xen/xen'
make[2]: *** No rule to make target 'olddefconfig'.  Stop.
make[2]: Leaving directory '/path/to/xen/xen'
tools/kconfig/Makefile:95: recipe for target 'custom.config' failed

Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>

---
It's possible there are other places where the Makefile path will need
to be changed. This just happened to be the one that failed for me.
---
 xen/tools/kconfig/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile
index fd37f4386a..f39521a0ed 100644
--- a/xen/tools/kconfig/Makefile
+++ b/xen/tools/kconfig/Makefile
@@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
 %.config: $(obj)/conf
 	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
 	$(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles)
-	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
+	$(Q)$(MAKE) -f $(srctree)/tools/kconfig/Makefile.kconfig olddefconfig
 
 PHONY += kvmconfig
 kvmconfig: kvm_guest.config
-- 
2.26.2

Re: [XEN PATCH 1/2] xen/build: fixup path to merge_config.sh

[Anthony PERARD]

On Tue, May 12, 2020 at 01:52:05PM -0400, Stewart Hildebrand wrote:
> This resolves the following observed error:
> 
> /bin/sh: /path/to/xen/xen/../xen/scripts/kconfig/merge_config.sh: No such file or directory
> 
> Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>

Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD

Re: [XEN PATCH 0/2] xen/build: fix kconfig errors during config merge

[Anthony PERARD]

On Tue, May 12, 2020 at 01:52:04PM -0400, Stewart Hildebrand wrote:
> This series fixes a couple of kconfig errors that I observed while
> invoking a build with a defconfig and config fragment.
> 
> I invoked the build as follows:
> 
> cat > xen/arch/arm/configs/custom.config <<EOF
> CONFIG_DEBUG=y
> CONFIG_SCHED_ARINC653=y
> CONFIG_EARLY_PRINTK_ZYNQMP=y
> EOF
> make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig custom.config

Thanks for the patches.

FYI, `make defconfig custom.config` doesn't work as expected with the Xen
build system, it doesn't deal with this use case like Linux's one does.
There is no guaranty that "defconfig" will be made before "custom.config".
It would be better to run `make defconfig && make custom.config`, or
maybe use -j1, until this is properly handled. That's what is done by
kbuild.

Cheers,

-- 
Anthony PERARD

Re: [XEN PATCH 2/2] xen/build: use the correct kconfig makefile

[Anthony PERARD]

On Tue, May 12, 2020 at 01:52:06PM -0400, Stewart Hildebrand wrote:
> This resolves the following observed error:
> 
> #
> # merged configuration written to .config (needs make)
> #
> make -f /path/to/xen/xen/../xen/Makefile olddefconfig
> make[2]: Entering directory '/path/to/xen/xen'
> make[2]: *** No rule to make target 'olddefconfig'.  Stop.
> make[2]: Leaving directory '/path/to/xen/xen'
> tools/kconfig/Makefile:95: recipe for target 'custom.config' failed

That commit message is kind of misleading, as the command run which
lead to the error isn't written. Could you expand the commit message to
include the problematic command ran? Something like:
    Running `make custom.config` fails with:
    ...

> Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
> 
> ---
> It's possible there are other places where the Makefile path will need
> to be changed. This just happened to be the one that failed for me.

The two other locations that calls back on the main Makefile aren't
usable by Xen, they would lead to another error anyway. So fixing the
only %.config is good enough.

> ---
>  xen/tools/kconfig/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile
> index fd37f4386a..f39521a0ed 100644
> --- a/xen/tools/kconfig/Makefile
> +++ b/xen/tools/kconfig/Makefile
> @@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
>  %.config: $(obj)/conf
>  	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
>  	$(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles)
> -	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
> +	$(Q)$(MAKE) -f $(srctree)/tools/kconfig/Makefile.kconfig olddefconfig

Well, the issue would be with $(srctree)/Makefile, but I don't think
that can be fixed right now. So that change is good for now.


With the commit message adjusted:
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD

[XEN PATCH v2] xen/build: use the correct kconfig makefile

[Stewart Hildebrand]

This resolves the following observed error during config merge:

/bin/sh /path/to/xen/xen/../xen/tools/kconfig/merge_config.sh -m .config /path/to/xen/xen/../xen/arch/arm/configs/custom.config
Using .config as base
Merging /path/to/xen/xen/../xen/arch/arm/configs/custom.config
#
# merged configuration written to .config (needs make)
#
make -f /path/to/xen/xen/../xen/Makefile olddefconfig
make[2]: Entering directory '/path/to/xen/xen'
make[2]: *** No rule to make target 'olddefconfig'.  Stop.
make[2]: Leaving directory '/path/to/xen/xen'
tools/kconfig/Makefile:95: recipe for target 'custom.config' failed

The build was invoked by first doing a defconfig (which succeeded):

$ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig

Followed by the config fragment merge command (which failed before this patch)

$ cat > xen/arch/arm/configs/custom.config <<EOF
CONFIG_DEBUG=y
CONFIG_EARLY_PRINTK_ZYNQMP=y
EOF
$ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- custom.config

Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>

---
v2: updated commit message
---
 xen/tools/kconfig/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile
index fd37f4386a..f39521a0ed 100644
--- a/xen/tools/kconfig/Makefile
+++ b/xen/tools/kconfig/Makefile
@@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
 %.config: $(obj)/conf
 	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
 	$(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles)
-	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
+	$(Q)$(MAKE) -f $(srctree)/tools/kconfig/Makefile.kconfig olddefconfig
 
 PHONY += kvmconfig
 kvmconfig: kvm_guest.config
-- 
2.26.2

RE: [XEN PATCH v2] xen/build: use the correct kconfig makefile

[Stewart Hildebrand]

Friday, May 15, 2020 2:25 PM, Stewart Hildebrand wrote:
>Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>

I forgot to include Anthony's Reviewed-by from v1 https://lists.xenproject.org/archives/html/xen-devel/2020-05/msg00848.html

Re: [XEN PATCH v2] xen/build: use the correct kconfig makefile

[Anthony PERARD]

On Fri, May 15, 2020 at 02:25:09PM -0400, Stewart Hildebrand wrote:
> This resolves the following observed error during config merge:
> 
> /bin/sh /path/to/xen/xen/../xen/tools/kconfig/merge_config.sh -m .config /path/to/xen/xen/../xen/arch/arm/configs/custom.config
> Using .config as base
> Merging /path/to/xen/xen/../xen/arch/arm/configs/custom.config
> #
> # merged configuration written to .config (needs make)
> #
> make -f /path/to/xen/xen/../xen/Makefile olddefconfig
> make[2]: Entering directory '/path/to/xen/xen'
> make[2]: *** No rule to make target 'olddefconfig'.  Stop.
> make[2]: Leaving directory '/path/to/xen/xen'
> tools/kconfig/Makefile:95: recipe for target 'custom.config' failed
> 
> The build was invoked by first doing a defconfig (which succeeded):
> 
> $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig
> 
> Followed by the config fragment merge command (which failed before this patch)
> 
> $ cat > xen/arch/arm/configs/custom.config <<EOF
> CONFIG_DEBUG=y
> CONFIG_EARLY_PRINTK_ZYNQMP=y
> EOF
> $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- custom.config
> 
> Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
> 
> ---
> v2: updated commit message

Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD