Backport the following commit from upstream kexec-tools:

commit 5af63fb Author: Baoquan He bhe@redhat.com Date: Wed Oct 29 16:19:55 2014 +0800

ppc64: erase unnecessary segment info printing

In ppc64 loading, it will print the segment information. This is not wanted since other Archs don't have this. People even think there's something wrong. So erase it to make it be consistent with other Archs.

And if people really want to check these info, they can specify "-d" option. They are printed in print_segments() too.

Signed-off-by: Baoquan He bhe@redhat.com Signed-off-by: Simon Horman horms@verge.net.au

Signed-off-by: Qiao Zhao qzhao@redhat.com --- ...4-erase-unnecessary-segment-info-printing.patch | 29 ++++++++++++++++++++++ kexec-tools.spec | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 kexec-tools-2.0.8-ppc64-erase-unnecessary-segment-info-printing.patch

diff --git a/kexec-tools-2.0.8-ppc64-erase-unnecessary-segment-info-printing.patch b/kexec-tools-2.0.8-ppc64-erase-unnecessary-segment-info-printing.patch new file mode 100644 index 0000000..b669ec7 --- /dev/null +++ b/kexec-tools-2.0.8-ppc64-erase-unnecessary-segment-info-printing.patch @@ -0,0 +1,29 @@ +In ppc64 loading, it will print the segment information. This is not +wanted since other Archs don't have this. People even think there's +something wrong. So erase it to make it be consistent with other Archs. + +And if people really want to check these info, they can specify "-d" +option. They are printed in print_segments() too. + +Signed-off-by: Baoquan He <bhe at redhat.com> +--- + kexec/arch/ppc64/kexec-elf-ppc64.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c +index ce10367..4a1540e 100644 +--- a/kexec/arch/ppc64/kexec-elf-ppc64.c ++++ b/kexec/arch/ppc64/kexec-elf-ppc64.c +@@ -377,10 +377,6 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, + dbgprintf("opal_base is %llx\n", (unsigned long long) my_opal_base); + dbgprintf("opal_entry is %llx\n", (unsigned long long) my_opal_entry); + +- for (i = 0; i < info->nr_segments; i++) +- fprintf(stderr, "segment[%d].mem:%p memsz:%zu\n", i, +- info->segment[i].mem, info->segment[i].memsz); +- + return 0; + } + +-- +1.9.0 diff --git a/kexec-tools.spec b/kexec-tools.spec index cf37727..99f90f3 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -69,6 +69,7 @@ ExcludeArch: aarch64 # # Patches 301 through 400 are meant for ppc64 kexec-tools enablement # +Patch301: kexec-tools-2.0.8-ppc64-erase-unnecessary-segment-info-printing.patch

# # Patches 401 through 500 are meant for s390 kexec-tools enablement @@ -104,6 +105,7 @@ tar -z -x -v -f %{SOURCE19} tar -z -x -v -f %{SOURCE23}

+%patch301 -p1 %patch601 -p1

%ifarch ppc