[PATCH kexec-tools] arm: do not build iomem.o target with no soruce

[Simon Horman]

Header files should be added to the distribution but not
used to derive targets for compilation. In this an attempt was
made to build iomem.o, but iomem.c does not exist so this fails.

Fixes: 1574ff1aae4f ("arm: include phys_to_virt.h and iomem.h in distribution")
Cc: Dave Young <***@redhat.com>
Signed-off-by: Simon Horman <***@verge.net.au>
---
kexec/arch/arm/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kexec/arch/arm/Makefile b/kexec/arch/arm/Makefile
index 871979e0ae26..a1b730034de8 100644
--- a/kexec/arch/arm/Makefile
+++ b/kexec/arch/arm/Makefile
@@ -27,9 +27,9 @@ arm_KEXEC_SRCS += $(libfdt_SRCS)

arm_UIMAGE = kexec/kexec-uImage.c
arm_PHYS_TO_VIRT = kexec/arch/arm/phys_to_virt.c
-arm_PHYS_TO_VIRT += kexec/arch/arm/iomem.h
-arm_PHYS_TO_VIRT += kexec/arch/arm/phys_to_virt.h
+arm_PHYS_TO_VIRT_INCLUDE = kexec/arch/arm/iomem.h
+arm_PHYS_TO_VIRT_INCLUDE += kexec/arch/arm/phys_to_virt.h

dist += kexec/arch/arm/Makefile $(arm_KEXEC_SRCS) $(arm_PHYS_TO_VIRT) \
- kexec/arch/arm/crashdump-arm.h kexec/arch/arm/kexec-arm.h \
- kexec/arch/arm/include/arch/options.h
+ $(arm_PHYS_TO_VIRT_INCLUDE) kexec/arch/arm/crashdump-arm.h \
+ kexec/arch/arm/kexec-arm.h kexec/arch/arm/include/arch/options.h

[Pratyush Anand]

Post by Simon Horman
Header files should be added to the distribution but not
used to derive targets for compilation. In this an attempt was
made to build iomem.o, but iomem.c does not exist so this fails.
Fixes: 1574ff1aae4f ("arm: include phys_to_virt.h and iomem.h in distribution")
---
kexec/arch/arm/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kexec/arch/arm/Makefile b/kexec/arch/arm/Makefile
index 871979e0ae26..a1b730034de8 100644
--- a/kexec/arch/arm/Makefile
+++ b/kexec/arch/arm/Makefile
@@ -27,9 +27,9 @@ arm_KEXEC_SRCS += $(libfdt_SRCS)
arm_UIMAGE = kexec/kexec-uImage.c
arm_PHYS_TO_VIRT = kexec/arch/arm/phys_to_virt.c
-arm_PHYS_TO_VIRT += kexec/arch/arm/iomem.h
-arm_PHYS_TO_VIRT += kexec/arch/arm/phys_to_virt.h
+arm_PHYS_TO_VIRT_INCLUDE = kexec/arch/arm/iomem.h
+arm_PHYS_TO_VIRT_INCLUDE += kexec/arch/arm/phys_to_virt.h

Since they are needed only in dist definition, so probably we could have
avoided to define arm_PHYS_TO_VIRT_INCLUDE and could have added these
files directly to dist. It will keep it similar like other makefiles
(kexec/arch/x86_64/Makefile)

Post by Simon Horman
dist += kexec/arch/arm/Makefile $(arm_KEXEC_SRCS) $(arm_PHYS_TO_VIRT) \
- kexec/arch/arm/crashdump-arm.h kexec/arch/arm/kexec-arm.h \
- kexec/arch/arm/include/arch/options.h
+ $(arm_PHYS_TO_VIRT_INCLUDE) kexec/arch/arm/crashdump-arm.h \
+ kexec/arch/arm/kexec-arm.h kexec/arch/arm/include/arch/options.h

Otherwise, changes looks fine to me.


~Pratyush

[Simon Horman]

Post by Pratyush Anand

Post by Simon Horman
Header files should be added to the distribution but not
used to derive targets for compilation. In this an attempt was
made to build iomem.o, but iomem.c does not exist so this fails.
Fixes: 1574ff1aae4f ("arm: include phys_to_virt.h and iomem.h in distribution")
---
kexec/arch/arm/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kexec/arch/arm/Makefile b/kexec/arch/arm/Makefile
index 871979e0ae26..a1b730034de8 100644
--- a/kexec/arch/arm/Makefile
+++ b/kexec/arch/arm/Makefile
@@ -27,9 +27,9 @@ arm_KEXEC_SRCS += $(libfdt_SRCS)
arm_UIMAGE = kexec/kexec-uImage.c
arm_PHYS_TO_VIRT = kexec/arch/arm/phys_to_virt.c
-arm_PHYS_TO_VIRT += kexec/arch/arm/iomem.h
-arm_PHYS_TO_VIRT += kexec/arch/arm/phys_to_virt.h
+arm_PHYS_TO_VIRT_INCLUDE = kexec/arch/arm/iomem.h
+arm_PHYS_TO_VIRT_INCLUDE += kexec/arch/arm/phys_to_virt.h

Since they are needed only in dist definition, so probably we could have
avoided to define arm_PHYS_TO_VIRT_INCLUDE and could have added these files
directly to dist. It will keep it similar like other makefiles
(kexec/arch/x86_64/Makefile)

Post by Simon Horman
dist += kexec/arch/arm/Makefile $(arm_KEXEC_SRCS) $(arm_PHYS_TO_VIRT) \
- kexec/arch/arm/crashdump-arm.h kexec/arch/arm/kexec-arm.h \
- kexec/arch/arm/include/arch/options.h
+ $(arm_PHYS_TO_VIRT_INCLUDE) kexec/arch/arm/crashdump-arm.h \
+ kexec/arch/arm/kexec-arm.h kexec/arch/arm/include/arch/options.h

Otherwise, changes looks fine to me.

Thanks, I will post a v2.