kexec-tools, ppc64: fix build error on ppc64

This patches changes the kexec/Makefile to only include the required arch Makefile.

Including all arch Makefiles causes unexpected results as changing one archs Makefile effects all other archs.

ppc64 recently broke surprisingly because 6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" added "CFLAGS +=-Wall -Werror" to kexec/arch/mips/Makefile. This shouldn't happen.

Signed-off-by Michael Neuling <[email protected]>

---
Horms: Tested by compiling on x86 and ppc64, but probably needs testing on other archs before being committed.

Quoted 11 lines · Michael Neuling

This patches changes the kexec/Makefile to only include the required arch Makefile.

Including all arch Makefiles causes unexpected results as changing one archs Makefile effects all other archs.

ppc64 recently broke surprisingly because 6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" added "CFLAGS +=-Wall -Werror" to kexec/arch/mips/Makefile. This shouldn't happen.

Quoted 4 lines

Signed-off-by Michael Neuling <[email protected]>

---
Horms: Tested by compiling on x86 and ppc64, but probably needs testing on other archs before being committed.

Unfortunately this breaks make tarball - only kexec/arch/$ARCH is included in the tarball.

Perhaps we could introduce $(ARCH)_FLAGS, which I think is consistent with the handling of other variables by the kexec build.

Quoted 12 lines · In message <[email protected]> you wrote:

Quoted 11 lines · Michael Neuling

This patches changes the kexec/Makefile to only include the required arch Makefile.

Including all arch Makefiles causes unexpected results as changing one archs Makefile effects all other archs.

ppc64 recently broke surprisingly because 6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" added "CFLAGS +=-Wall -Werror" to kexec/arch/mips/Makefile. This shouldn't happen.

Quoted 7 lines

Quoted 4 lines

Signed-off-by Michael Neuling <[email protected]>

---
Horms: Tested by compiling on x86 and ppc64, but probably needs testing on other archs before being committed.

Unfortunately this breaks make tarball - only kexec/arch/$ARCH is included in the tarball.

I figured it might break something :-)

BTW make tarball works here.

Quoted 2 lines

Perhaps we could introduce $(ARCH)_FLAGS, which I think is consistent with the handling of other variables by the kexec build.

Seems like a bit of a band aid.

It still seems pretty broken that we use arch/mips/Makefile for ppc64.

Looking at 6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 and trying to work out how it broke ppc64 was pretty annoying.

6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" broke pp64 as it turned on -Werror for all archs.

This fixes the warning and hence ppc64 building.

Signed-off-by Michael Neuling <[email protected]>

---
I've posted a second patch to fix the issue of changing one archs Makefile, effecting all other archs.

 kexec/arch/ppc64/fs2dt.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: kexec-tools/kexec/arch/ppc64/fs2dt.c
===================================================================

6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" broke pp64 as it turned on -Werror for all archs.

This fixes the warning and hence ppc64 building.

Signed-off-by Michael Neuling <[email protected]>

---
I've posted a second patch to fix the issue of changing one archs Makefile, effecting all other archs.

 kexec/arch/ppc64/fs2dt.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: kexec-tools/kexec/arch/ppc64/fs2dt.c
===================================================================

kexec/arch/ppc64/fs2dt.c +2 -1

@@ -357,7 +357,8 @@ static void putprops(char *fn, struct di
  * Compare function used to sort the device-tree directories
  * This function will be passed to scandir.
  */
-static int comparefunc(const void *dentry1, const void *dentry2)
+static int comparefunc(const struct dirent **dentry1,
+		       const struct dirent **dentry2)
 {
 	char *str1 = (*(struct dirent **)dentry1)->d_name;
 	char *str2 = (*(struct dirent **)dentry2)->d_name;

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Quoted 4 lines · Michael Neuling

6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" broke pp64 as it turned on -Werror for all archs.

This fixes the warning and hence ppc64 building.

Thanks.

While I'm very much in favour of using -Werror for testing and these kind of patches are great, I think that -Werror by default is rather silly. We can't control what will be a warning in the future and sometimes fixing warnings isn't appropriate - for instance there are warnings in fs2dt.c at the moment, that is currently considered an upstream problem.

In short, this patch is great. But I plan to also remove -Werror as the default now that its been brought to my attention.

Quoted 29 lines

Signed-off-by Michael Neuling <[email protected]>

---
I've posted a second patch to fix the issue of changing one archs Makefile, effecting all other archs.

 kexec/arch/ppc64/fs2dt.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: kexec-tools/kexec/arch/ppc64/fs2dt.c
===================================================================

kexec/arch/ppc64/fs2dt.c +2 -1

@@ -357,7 +357,8 @@ static void putprops(char *fn, struct di
  * Compare function used to sort the device-tree directories
  * This function will be passed to scandir.
  */
-static int comparefunc(const void *dentry1, const void *dentry2)
+static int comparefunc(const struct dirent **dentry1,
+		       const struct dirent **dentry2)
 {
 	char *str1 = (*(struct dirent **)dentry1)->d_name;
 	char *str2 = (*(struct dirent **)dentry2)->d_name;

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Quoted 15 lines · In message <[email protected]> you wrote:

Quoted 4 lines · Michael Neuling

6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" broke pp64 as it turned on -Werror for all archs.

This fixes the warning and hence ppc64 building.

Thanks.

While I'm very much in favour of using -Werror for testing and these kind of patches are great, I think that -Werror by default is rather silly. We can't control what will be a warning in the future and sometimes fixing warnings isn't appropriate - for instance there are warnings in fs2dt.c at the moment, that is currently considered an upstream problem.

Quoted 2 lines

In short, this patch is great. But I plan to also remove -Werror as the default now that its been brought to my attention.

Cool. My second patch should do this for all but MIPS.

From 76beff0507360f3001e23c9b4c765ef56384d5d5 Mon Sep 17 00:00:00 2001

Quoted 18 lines

Quoted 15 lines · In message <[email protected]> you wrote:

Quoted 4 lines · Michael Neuling

6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" broke pp64 as it turned on -Werror for all archs.

This fixes the warning and hence ppc64 building.

Thanks.

While I'm very much in favour of using -Werror for testing and these kind of patches are great, I think that -Werror by default is rather silly. We can't control what will be a warning in the future and sometimes fixing warnings isn't appropriate - for instance there are warnings in fs2dt.c at the moment, that is currently considered an upstream problem.

Quoted 4 lines

Quoted 2 lines

In short, this patch is great. But I plan to also remove -Werror as the default now that its been brought to my attention.

Cool. My second patch should do this for all but MIPS.

Unfortunately the second patch breaks make tarball. For now I have committed the following:

From 76beff0507360f3001e23c9b4c765ef56384d5d5 Mon Sep 17 00:00:00 2001
From: Simon Horman <[email protected]>
Date: Wed, 5 May 2010 13:33:21 +1000
Subject: [PATCH] build: Don't modify CFLAGS in kexec/arch/mips/Makefile

Revert this portion of recent MIPS changes as it actually effects the CFLAGS for all architectures. Moreover I'm somewhat dubious about defaulting to -Werror for any architecture.

Signed-off-by Simon Horman <[email protected]>

---
 kexec/arch/mips/Makefile |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

kexec/arch/mips/Makefile +0 -3

index 831b263..03bdb9a 100644
@@ -14,5 +14,3 @@ dist += kexec/arch/mips/Makefile $(mips_KEXEC_SRCS)
            \
       kexec/arch/mips/kexec-mips.h                                    \
       kexec/arch/mips/crashdump-mips.h                                \
       kexec/arch/mips/include/arch/options.h
-
-CFLAGS +=-Wall -Werror
--

1.7.1

2010/5/5 Simon Horman <[email protected]>

Quoted 41 lines · Michael Neuling

Quoted 18 lines

Quoted 15 lines · In message <[email protected]> you wrote:

Quoted 4 lines · Michael Neuling

6adc05c6e3fdbc8b9f5d915af78ca05d0a09cb17 "some kexec MIPS improvements" broke pp64 as it turned on -Werror for all archs.

This fixes the warning and hence ppc64 building.

Thanks.

While I'm very much in favour of using -Werror for testing and these kind of patches are great, I think that -Werror by default is rather silly. We can't control what will be a warning in the future and sometimes fixing warnings isn't appropriate - for instance there are warnings in fs2dt.c at the moment, that is currently considered an upstream problem.

Quoted 4 lines

Quoted 2 lines

In short, this patch is great. But I plan to also remove -Werror as the default now that its been brought to my attention.

Cool. My second patch should do this for all but MIPS.

Unfortunately the second patch breaks make tarball. For now I have committed the following:

From 76beff0507360f3001e23c9b4c765ef56384d5d5 Mon Sep 17 00:00:00 2001
From: Simon Horman <[email protected]>
Date: Wed, 5 May 2010 13:33:21 +1000
Subject: [PATCH] build: Don't modify CFLAGS in kexec/arch/mips/Makefile

Revert this portion of recent MIPS changes as it actually effects the CFLAGS for all architectures. Moreover I'm somewhat dubious about defaulting to -Werror for any architecture.

Signed-off-by Simon Horman <[email protected]>

---
 kexec/arch/mips/Makefile |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Quoted 12 lines

kexec/arch/mips/Makefile +0 -3

index 831b263..03bdb9a 100644
@@ -14,5 +14,3 @@ dist += kexec/arch/mips/Makefile $(mips_KEXEC_SRCS)
            \
       kexec/arch/mips/kexec-mips.h                                    \
       kexec/arch/mips/crashdump-mips.h                                \
       kexec/arch/mips/include/arch/options.h
-
-CFLAGS +=-Wall -Werror
--

Quoted 3 lines

1.7.1

Plan was to have -Werror only for mips. Thanks for fixes.