commit kexec-tools for openSUSE:Factory

2020-08-23 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2020-08-23 09:19:43

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.3399 (New)


Package is "kexec-tools"

Sun Aug 23 09:19:43 2020 rev:136 rq:828093 version:2.0.20

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2020-04-05 
20:52:57.493148923 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.3399/kexec-tools.changes
2020-08-23 09:19:43.942637013 +0200
@@ -1,0 +2,5 @@
+Fri Jun  5 09:36:21 UTC 2020 - Bernhard Wiedemann 
+
+- Make kexec-bootloader work without 'which' package (boo#1172501)
+
+---



Other differences:
--
++ kexec-bootloader ++
--- /var/tmp/diff_new_pack.MkPShL/_old  2020-08-23 09:19:44.786637481 +0200
+++ /var/tmp/diff_new_pack.MkPShL/_new  2020-08-23 09:19:44.786637481 +0200
@@ -189,12 +189,6 @@
 exit(1);
 }
 
-# Do we have kexec?
-if (system("which kexec &>/dev/null") != 0) {
-print STDERR "kexec not available. Install kexec-tools.\n";
-exit(1);
-}
-
 # build the command list
 my $cmd = "kexec";
 

++ kexec-tools-fix-kexec_file_load-error-handling.patch ++
--- /var/tmp/diff_new_pack.MkPShL/_old  2020-08-23 09:19:44.886637536 +0200
+++ /var/tmp/diff_new_pack.MkPShL/_new  2020-08-23 09:19:44.886637536 +0200
@@ -1,9 +1,10 @@
 From 0ec1fd23847ba103f967e3377e2a1b13712cff6e Mon Sep 17 00:00:00 2001
 From: Petr Tesarik 
 Date: Thu, 12 Mar 2020 20:12:12 +0100
-Upstream: not yet, patch sent 2020-03-12 
 Subject: Fix kexec_file_load(2) error handling
 References: bsc#1166105
+Upstream: merged
+Git-commit: 4f77da6340356de40af70473d3c3ae6ec663fbdf
 
 The handling of kexec_file_load() error conditions needs some
 improvement.

++ kexec-tools-reset-getopt-before-falling-back-to-legacy.patch ++
--- /var/tmp/diff_new_pack.MkPShL/_old  2020-08-23 09:19:44.910637550 +0200
+++ /var/tmp/diff_new_pack.MkPShL/_new  2020-08-23 09:19:44.910637550 +0200
@@ -1,9 +1,10 @@
 From dadafc4664c7b78ea1561ccca33986c9639106ec Mon Sep 17 00:00:00 2001
 From: Petr Tesarik 
 Date: Fri, 13 Mar 2020 14:54:00 +0100
-Upstream: not yet, patch sent 2020-03-13
 Subject: Reset getopt before falling back to legacy syscall
 References: bsc#1166105
+Upstream: merged
+Git-commit: 9cf721279f6cb0dec09c8752e471f15fb662406b
 
 The modules may need to parse the arguments again after
 kexec_file_load(2) failed, but getopt is not reset.

++ kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch ++
--- /var/tmp/diff_new_pack.MkPShL/_old  2020-08-23 09:19:44.954637574 +0200
+++ /var/tmp/diff_new_pack.MkPShL/_new  2020-08-23 09:19:44.954637574 +0200
@@ -2,7 +2,8 @@
 Date: Fri, 3 Apr 2020 13:12:00 +0200
 Subject: kexec-tools: s390: Reset kernel command line on syscall fallback
 References: bsc#1167868
-Upstream: submitted 2020-04-03
+Upstream: merged
+Git-commit: 5dc72ded6050a5bb161e3b832867e660c9ca009e
 
 The command line is duplicated on s390 if kexec_file_load(2) is not
 implemented. That's because the corresponding variable is not reset




commit kexec-tools for openSUSE:Factory

2020-04-05 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2020-04-05 20:52:55

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.3248 (New)


Package is "kexec-tools"

Sun Apr  5 20:52:55 2020 rev:135 rq:791187 version:2.0.20

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2020-03-16 
10:17:53.759576425 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.3248/kexec-tools.changes
2020-04-05 20:52:57.493148923 +0200
@@ -1,0 +2,12 @@
+Fri Apr  3 12:11:16 UTC 2020 - Petr Tesařík 
+
+- kexec-tools-Remove-duplicated-variable-declarations.patch:
+  Remove duplicated variable declarations (boo#1160399).
+
+---
+Fri Apr  3 11:24:02 UTC 2020 - Petr Tesařík 
+
+- kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch: s390:
+  Reset kernel command line on syscall fallback (bsc#1167868).
+
+---

New:

  kexec-tools-Remove-duplicated-variable-declarations.patch
  kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.Vqkb3N/_old  2020-04-05 20:52:58.145149547 +0200
+++ /var/tmp/diff_new_pack.Vqkb3N/_new  2020-04-05 20:52:58.149149551 +0200
@@ -38,6 +38,8 @@
 Patch10:%{name}-SYS_getrandom.patch
 Patch11:%{name}-fix-kexec_file_load-error-handling.patch
 Patch12:%{name}-reset-getopt-before-falling-back-to-legacy.patch
+Patch13:%{name}-s390-Reset-kernel-command-line-on-syscal.patch
+Patch14:%{name}-Remove-duplicated-variable-declarations.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -72,6 +74,8 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 autoreconf -fvi

++ kexec-tools-Remove-duplicated-variable-declarations.patch ++
>From cc087b11462af9f971a2c090d07e8d780a867b50 Mon Sep 17 00:00:00 2001
From: Kairui Song 
Date: Wed, 29 Jan 2020 13:38:19 +0800
Subject: kexec-tools: Remove duplicated variable declarations
References: boo#1160399
Upstream: merged
Git-commit: cc087b11462af9f971a2c090d07e8d780a867b50

When building kexec-tools for Fedora 32, following error is observed:

/usr/bin/ld: kexec/arch/x86_64/kexec-bzImage64.o:(.bss+0x0): multiple 
definition of `bzImage_support_efi_boot';
kexec/arch/i386/kexec-bzImage.o:(.bss+0x0): first defined here

/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm/../../fs2dt.h:33: 
multiple definition of `my_debug';
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/kexec/fs2dt.h:33: first 
defined here

/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:68: 
multiple definition of `arm64_mem';
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:68:
 first defined here

/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:54: 
multiple definition of `initrd_size';
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:54:
 first defined here

/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:53: 
multiple definition of `initrd_base';
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:53:
 first defined here

And apparently, these variables are wrongly declared multiple times. So
remove duplicated declaration.

Signed-off-by: Kairui Song 
Signed-off-by: Simon Horman 
Acked-by: Petr Tesarik 
---
 kexec/arch/arm64/kexec-arm64.h  |6 +++---
 kexec/arch/ppc64/kexec-elf-ppc64.c  |2 --
 kexec/arch/x86_64/kexec-bzImage64.c |1 -
 kexec/fs2dt.h   |2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

--- a/kexec/arch/arm64/kexec-arm64.h
+++ b/kexec/arch/arm64/kexec-arm64.h
@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **a
 void zImage_arm64_usage(void);
 
 
-off_t initrd_base;
-off_t initrd_size;
+extern off_t initrd_base;
+extern off_t initrd_size;
 
 /**
  * struct arm64_mem - Memory layout info.
@@ -65,7 +65,7 @@ struct arm64_mem {
 };
 
 #define arm64_mem_ngv UINT64_MAX
-struct arm64_mem arm64_mem;
+extern struct arm64_mem arm64_mem;
 
 uint64_t get_phys_offset(void);
 uint64_t get_vp_offset(void);
--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
@@ -44,8 +44,6 @@
 uint64_t initrd_base, initrd_size;
 unsigned char reuse_initrd = 0;
 const char *ramdisk;
-/* Used for enabling printing message from purgatory code */
-int my_debug = 0;
 
 int elf_ppc64_probe(const char *buf, off_t len)
 {
--- 

commit kexec-tools for openSUSE:Factory

2020-03-16 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2020-03-16 10:17:11

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.3160 (New)


Package is "kexec-tools"

Mon Mar 16 10:17:11 2020 rev:134 rq:784674 version:2.0.20

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2020-02-09 
21:03:08.271378077 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.3160/kexec-tools.changes
2020-03-16 10:17:53.759576425 +0100
@@ -1,0 +2,12 @@
+Fri Mar 13 14:11:55 UTC 2020 - Petr Tesařík 
+
+- kexec-tools-reset-getopt-before-falling-back-to-legacy.patch:
+  Reset getopt before falling back to legacy syscall (bsc#1166105).
+
+---
+Fri Mar 13 08:37:58 UTC 2020 - Petr Tesařík 
+
+- kexec-tools-fix-kexec_file_load-error-handling.patch: Fix the
+  error handling if kexec_file_load() fails (bsc#1166105).
+
+---

New:

  kexec-tools-fix-kexec_file_load-error-handling.patch
  kexec-tools-reset-getopt-before-falling-back-to-legacy.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.B1TPst/_old  2020-03-16 10:17:54.927576901 +0100
+++ /var/tmp/diff_new_pack.B1TPst/_new  2020-03-16 10:17:54.931576903 +0100
@@ -36,6 +36,8 @@
 Patch8: %{name}-build-multiboot2-for-i386.patch
 Patch9: %{name}-video-capability.patch
 Patch10:%{name}-SYS_getrandom.patch
+Patch11:%{name}-fix-kexec_file_load-error-handling.patch
+Patch12:%{name}-reset-getopt-before-falling-back-to-legacy.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -68,6 +70,8 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 autoreconf -fvi

++ kexec-tools-fix-kexec_file_load-error-handling.patch ++
>From 0ec1fd23847ba103f967e3377e2a1b13712cff6e Mon Sep 17 00:00:00 2001
From: Petr Tesarik 
Date: Thu, 12 Mar 2020 20:12:12 +0100
Upstream: not yet, patch sent 2020-03-12 
Subject: Fix kexec_file_load(2) error handling
References: bsc#1166105

The handling of kexec_file_load() error conditions needs some
improvement.

First, on failure, the system call itself returns -1 and sets
errno. It is wrong to check the return value itself.

Second, do_kexec_file_load() mixes different types of error
codes (-1, return value of a load method, negative kernel error
number). Let it always return one of the reason codes defined in
kexec/kexec.h.

Third, the caller of do_kexec_file_load() cannot know what exactly
failed inside that function, so it should not check errno directly.
All it needs to know is whether it makes sense to fall back to the
other syscall. Add an error code for that purpose (EFALLBACK), and
let do_kexec_file_load() decide.

Fourth, do_kexec_file_load() should not print any error message if
it returns EFALLBACK, because the fallback syscall may succeed
later, and the user is confused whether the command failed, or not.
Move the error message towards the end of main().

Signed-off-by: Petr Tesarik 
---
 kexec/kexec.c | 114 ++
 kexec/kexec.h |   1 +
 2 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/kexec/kexec.c b/kexec/kexec.c
index bc6ab3d..33c1b4b 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -836,11 +836,21 @@ static int kexec_file_unload(unsigned long 
kexec_file_flags)
 {
int ret = 0;
 
+   if (!is_kexec_file_load_implemented())
+   return EFALLBACK;
+
ret = kexec_file_load(-1, -1, 0, NULL, kexec_file_flags);
if (ret != 0) {
-   /* The unload failed, print some debugging information */
-   fprintf(stderr, "kexec_file_load(unload) failed\n: %s\n",
-   strerror(errno));
+   if (errno == ENOSYS) {
+   ret = EFALLBACK;
+   } else {
+   /*
+* The unload failed, print some debugging
+* information */
+   fprintf(stderr, "kexec_file_load(unload) failed: %s\n",
+   strerror(errno));
+   ret = EFAILED;
+   }
}
return ret;
 }
@@ -1182,15 +1192,13 @@ static int do_kexec_file_load(int fileind, int argc, 
char **argv,
info.file_mode = 1;
info.initrd_fd = -1;
 
-   if (!is_kexec_file_load_implemented()) {
-   fprintf(stderr, "syscall kexec_file_load not available.\n");
-   return -ENOSYS;
-   }
+   if 

commit kexec-tools for openSUSE:Factory

2020-02-09 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2020-02-09 21:02:41

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.26092 (New)


Package is "kexec-tools"

Sun Feb  9 21:02:41 2020 rev:133 rq:770156 version:2.0.20

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2020-01-29 
13:18:38.142177663 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.26092/kexec-tools.changes   
2020-02-09 21:03:08.271378077 +0100
@@ -1,0 +2,7 @@
+Wed Jan 29 07:35:18 UTC 2020 - Petr Tesařík 
+
+- Fix build errors on old distributions
+  * kexec-tools-video-capability.patch
+  * kexec-tools-SYS_getrandom.patch
+
+---

New:

  kexec-tools-SYS_getrandom.patch
  kexec-tools-video-capability.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.YKAvJU/_old  2020-02-09 21:03:08.887378426 +0100
+++ /var/tmp/diff_new_pack.YKAvJU/_new  2020-02-09 21:03:08.887378426 +0100
@@ -34,6 +34,8 @@
 Patch6: 
%{name}-arm64-kexec-allocate-memory-space-avoiding-reserved-regions.patch
 Patch7: 
%{name}-arm64-kdump-deal-with-resource-entries-in-proc-iomem.patch
 Patch8: %{name}-build-multiboot2-for-i386.patch
+Patch9: %{name}-video-capability.patch
+Patch10:%{name}-SYS_getrandom.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -64,6 +66,8 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 autoreconf -fvi

++ kexec-tools-SYS_getrandom.patch ++
From: Petr Tesarik 
Subject: Define SYS_getrandom if needed
Upstream: never, build fix for SLE12

SLE12 did not provide a definition for SYS_getrandom.

Signed-off-by: Petr Tesarik 
---
 kexec/arch/arm64/kexec-arm64.c |5 +
 1 file changed, 5 insertions(+)

--- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c
@@ -34,6 +34,11 @@
 #include "mem_regions.h"
 #include "arch/options.h"
 
+#ifndef __NR_getrandom
+#define __NR_getrandom 278
+__SYSCALL(__NR_getrandom, sys_getrandom)
+#endif
+
 #define ROOT_NODE_ADDR_CELLS_DEFAULT 1
 #define ROOT_NODE_SIZE_CELLS_DEFAULT 1
 
++ kexec-tools-video-capability.patch ++
From: Petr Tesarik 
Subject: Make sure VIDEO_CAPABILITY_64BIT_BASE is defined
Upstream: never, build fix for SLE12

SLE12 did not provide a definition for VIDEO_CAPABILITY_64BIT_BASE
in .

Signed-off-by: Petr Tesarik 
---
 kexec/arch/i386/x86-linux-setup.c |4 
 1 file changed, 4 insertions(+)

--- a/kexec/arch/i386/x86-linux-setup.c
+++ b/kexec/arch/i386/x86-linux-setup.c
@@ -37,6 +37,10 @@
 #include "x86-linux-setup.h"
 #include "../../kexec/kexec-syscall.h"
 
+#ifndef VIDEO_CAPABILITY_64BIT_BASE
+#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1)/* Frame buffer base 
is 64-bit */
+#endif
+
 void init_linux_parameters(struct x86_linux_param_header *real_mode)
 {
/* Fill in the values that are usually provided by the kernel. */



commit kexec-tools for openSUSE:Factory

2020-01-29 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2020-01-29 13:18:17

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.26092 (New)


Package is "kexec-tools"

Wed Jan 29 13:18:17 2020 rev:132 rq:768201 version:2.0.20

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2020-01-18 
12:17:47.887128194 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.26092/kexec-tools.changes   
2020-01-29 13:18:38.142177663 +0100
@@ -12 +12 @@
-- Backport a upstream patch series: [jsc#SLE-9943]
+- Backport a upstream patch series: [jsc#SLE-9032]



Other differences:
--



commit kexec-tools for openSUSE:Factory

2020-01-18 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2020-01-18 12:16:47

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.26092 (New)


Package is "kexec-tools"

Sat Jan 18 12:16:47 2020 rev:131 rq:764105 version:2.0.20

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2019-06-18 
14:54:27.289475717 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.26092/kexec-tools.changes   
2020-01-18 12:17:47.887128194 +0100
@@ -1,0 +2,17 @@
+Fri Jan 10 06:02:42 UTC 2020 - Chester Lin 
+
+- Fix compiling errors of multiboot2_x86_* functions for i586
+  * kexec-tools-build-multiboot2-for-i386.patch
+
+---
+Mon Dec 16 15:45:05 UTC 2019 - Chester Lin 
+
+- Bump to version 2.0.20
+  Changelog: 
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.19..v2.0.20
 
+- Backport a upstream patch series: [jsc#SLE-9943]
+  Subject: [PATCH v2 0/3] arm64: handle "reserved" entries in /proc/iomem
+  * kexec-tools-add-variant-helper-functions.patch
+  * 
kexec-tools-arm64-kexec-allocate-memory-space-avoiding-reserved-regions.patch
+  * kexec-tools-arm64-kdump-deal-with-resource-entries-in-proc-iomem.patch
+
+---

Old:

  kexec-tools-2.0.19.tar.xz

New:

  kexec-tools-2.0.20.tar.xz
  kexec-tools-add-variant-helper-functions.patch
  kexec-tools-arm64-kdump-deal-with-resource-entries-in-proc-iomem.patch
  kexec-tools-arm64-kexec-allocate-memory-space-avoiding-reserved-regions.patch
  kexec-tools-build-multiboot2-for-i386.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.GvceUC/_old  2020-01-18 12:17:48.411128474 +0100
+++ /var/tmp/diff_new_pack.GvceUC/_new  2020-01-18 12:17:48.411128474 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   kexec-tools
-Version:2.0.19
+Version:2.0.20
 Release:0
 Summary:Tools for loading replacement kernels into memory
 License:GPL-2.0-or-later
@@ -29,7 +29,11 @@
 Source4:%{name}-rpmlintrc
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
-Patch14:%{name}-vmcoreinfo-in-xen.patch
+Patch4: %{name}-vmcoreinfo-in-xen.patch
+Patch5: %{name}-add-variant-helper-functions.patch
+Patch6: 
%{name}-arm64-kexec-allocate-memory-space-avoiding-reserved-regions.patch
+Patch7: 
%{name}-arm64-kdump-deal-with-resource-entries-in-proc-iomem.patch
+Patch8: %{name}-build-multiboot2-for-i386.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -55,7 +59,11 @@
 %setup -q
 %patch2 -p1
 %patch3 -p1
-%patch14 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 autoreconf -fvi

++ kexec-tools-2.0.19.tar.xz -> kexec-tools-2.0.20.tar.xz ++
 2308 lines of diff (skipped)

++ kexec-tools-add-variant-helper-functions.patch ++
From: AKASHI Takahiro 
Date: Fri, 11 Jan 2019 01:59:44 +0900
Subject: kexec: add variant helper functions for handling memory regions
References: jsc#SLE-9943
Upstream: not yet, it's under review in upstream

mem_regions_alloc_and_add() and mem_regions_alloc_and_exclude() are
functionally equivalent to, respectively, mem_regions_add() and
mem_regions_exclude() except the formers will re-allocate memory
dynamically when no more entries are available in 'ranges' array.

Signed-off-by: AKASHI Takahiro 
Signed-off-by: Chester Lin 
---
 kexec/mem_regions.c | 42 ++
 kexec/mem_regions.h |  7 +++
 2 files changed, 49 insertions(+)

diff --git a/kexec/mem_regions.c b/kexec/mem_regions.c
index 50c8abccb93a..ad7d3f13fd84 100644
--- a/kexec/mem_regions.c
+++ b/kexec/mem_regions.c
@@ -125,3 +125,45 @@ int mem_regions_exclude(struct memory_ranges *ranges,
}
return 0;
 }
+
+#define KEXEC_MEMORY_RANGES 16
+
+int mem_regions_alloc_and_add(struct memory_ranges *ranges,
+ unsigned long long base,
+ unsigned long long length, int type)
+{
+   void *new_ranges;
+
+   if (ranges->size >= ranges->max_size) {
+   new_ranges = realloc(ranges->ranges,
+   sizeof(struct 

commit kexec-tools for openSUSE:Factory

2019-06-18 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2019-06-18 14:54:22

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.4811 (New)


Package is "kexec-tools"

Tue Jun 18 14:54:22 2019 rev:130 rq:709972 version:2.0.19

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2019-06-12 
13:05:07.425213213 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.4811/kexec-tools.changes
2019-06-18 14:54:27.289475717 +0200
@@ -1,0 +2,6 @@
+Fri Jun 14 12:11:18 UTC 2019 - Petr Tesarik 
+
+- Bump to version 2.0.19
+  Changelog: 
http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.18..v2.0.19
+
+---

Old:

  kexec-tools-2.0.18.tar.xz

New:

  kexec-tools-2.0.19.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.gNE5xx/_old  2019-06-18 14:54:28.753474813 +0200
+++ /var/tmp/diff_new_pack.gNE5xx/_new  2019-06-18 14:54:28.757474811 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   kexec-tools
-Version:2.0.18
+Version:2.0.19
 Release:0
 Summary:Tools for loading replacement kernels into memory
 License:GPL-2.0-or-later
@@ -94,6 +94,18 @@
 %posttrans
 %{?regenerate_initrd_posttrans}
 
+# Compatibility cruft
+# there is no %license prior to SLE12
+%if %{undefined _defaultlicensedir}
+%define license %doc
+%else
+# filesystem before SLE12 SP3 lacks /usr/share/licenses
+%if 0%(test ! -d %{_defaultlicensedir} && echo 1)
+%define _defaultlicensedir %_defaultdocdir
+%endif
+%endif
+# End of compatibility cruft
+
 %files
 %license COPYING
 %doc AUTHORS News TODO doc

++ kexec-tools-2.0.18.tar.xz -> kexec-tools-2.0.19.tar.xz ++
 2736 lines of diff (skipped)




commit kexec-tools for openSUSE:Factory

2019-06-12 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2019-06-12 13:05:03

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new.4811 (New)


Package is "kexec-tools"

Wed Jun 12 13:05:03 2019 rev:129 rq:706370 version:2.0.18

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2018-11-09 
07:50:13.496000730 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new.4811/kexec-tools.changes
2019-06-12 13:05:07.425213213 +0200
@@ -1,0 +2,5 @@
+Mon Jan 14 15:47:10 CET 2019 - ku...@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.BCERcY/_old  2019-06-12 13:05:08.665212692 +0200
+++ /var/tmp/diff_new_pack.BCERcY/_new  2019-06-12 13:05:08.669212690 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -95,7 +95,8 @@
 %{?regenerate_initrd_posttrans}
 
 %files
-%doc AUTHORS COPYING News TODO doc
+%license COPYING
+%doc AUTHORS News TODO doc
 %{_mandir}/man*/*
 #UsrMerge
 /sbin/kexec




commit kexec-tools for openSUSE:Factory

2018-11-08 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2018-11-09 07:49:54

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Fri Nov  9 07:49:54 2018 rev:128 rq:645947 version:2.0.18

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2018-10-01 
09:05:06.427908836 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2018-11-09 07:50:13.496000730 +0100
@@ -1,0 +2,14 @@
+Thu Nov  1 20:58:20 UTC 2018 - ptesa...@suse.com
+
+- Remove bogus Url RPM tag: The project does not have a home page.
+
+---
+Thu Nov  1 14:58:41 UTC 2018 - ptesa...@suse.com
+
+- Bump to version 2.0.18
+  Changelog: 
http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.17..v2.0.18
+- Drop patches from upstream git:
+  * kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
+- Remove the confusing kdump binary (no longer in upstream).
+
+---

Old:

  kexec-tools-2.0.17.tar.xz
  kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch

New:

  kexec-tools-2.0.18.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.JjoBy5/_old  2018-11-09 07:50:15.851998006 +0100
+++ /var/tmp/diff_new_pack.JjoBy5/_new  2018-11-09 07:50:15.855998002 +0100
@@ -17,13 +17,12 @@
 
 
 Name:   kexec-tools
-Version:2.0.17
+Version:2.0.18
 Release:0
 Summary:Tools for loading replacement kernels into memory
 License:GPL-2.0-or-later
 Group:  System/Kernel
-Url:
https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
-Source: 
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/snapshot/%{name}-%{version}.tar.xz
+Source: 
https://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8
 Source3:kexec-load.service
@@ -31,7 +30,6 @@
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
 Patch14:%{name}-vmcoreinfo-in-xen.patch
-Patch15:%{name}-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -58,7 +56,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch14 -p1
-%patch15 -p1
 
 %build
 autoreconf -fvi
@@ -70,7 +67,6 @@
 %install
 %make_install
 install -c -m 0644 %{SOURCE2} %{buildroot}/%{_mandir}/man8
-rm -f %{buildroot}/%{_mandir}/man8/kdump.8
 mkdir -p %{buildroot}/%{_sbindir}
 install -m 0755 %{SOURCE1} %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_unitdir}
@@ -78,7 +74,6 @@
 ln -s service %{buildroot}%{_sbindir}/rckexec-load
 #UsrMerge
 mkdir -p %{buildroot}/sbin
-ln -s %{_sbindir}/kdump %{buildroot}/sbin
 ln -s %{_sbindir}/kexec %{buildroot}/sbin
 #EndUsrMerge
 
@@ -103,11 +98,9 @@
 %doc AUTHORS COPYING News TODO doc
 %{_mandir}/man*/*
 #UsrMerge
-/sbin/kdump
 /sbin/kexec
 #EndUsrMerge
 %{_sbindir}/rckexec-load
-%{_sbindir}/kdump
 %{_sbindir}/kexec
 %{_sbindir}/kexec-bootloader
 %{_sbindir}/vmcore-dmesg

++ kexec-tools-2.0.17.tar.xz -> kexec-tools-2.0.18.tar.xz ++
 58344 lines of diff (skipped)

++ kexec-tools-disable-test.patch ++
--- /var/tmp/diff_new_pack.JjoBy5/_old  2018-11-09 07:50:16.095997724 +0100
+++ /var/tmp/diff_new_pack.JjoBy5/_new  2018-11-09 07:50:16.095997724 +0100
@@ -8,14 +8,12 @@
  Makefile.in |7 +--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-Index: kexec-tools-2.0.14/Makefile.in
-===
 kexec-tools-2.0.14.orig/Makefile.in
-+++ kexec-tools-2.0.14/Makefile.in
-@@ -178,8 +178,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
+--- a/Makefile.in
 b/Makefile.in
+@@ -173,8 +173,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
  PGSRCS:=$(foreach s, $(GENERATED_SRCS), 
$(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
  
- MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)
+ MAN_PAGES:=$(KEXEC_MANPAGE) $(VMCORE_DMESG_MANPAGE)
 -BINARIES_i386:=$(KEXEC_TEST)
 -BINARIES_x86_64:=$(KEXEC_TEST)
 +# Dont' build kexec_test
@@ -23,6 +21,6 @@
 +#BINARIES_x86_64:=$(KEXEC_TEST)
 +BINARIES_i386:=
 +BINARIES_x86_64:=
- BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH))
+ BINARIES:=$(KEXEC) $(VMCORE_DMESG) $(BINARIES_$(ARCH))
  
- TARGETS:=$(BINARIES) $(MAN_PAGES)
+ UNINSTALL_KDUMP = $(sbindir)/kdump




commit kexec-tools for openSUSE:Factory

2018-10-01 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2018-10-01 09:05:01

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Mon Oct  1 09:05:01 2018 rev:127 rq:637049 version:2.0.17

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2018-04-26 
13:33:06.154917070 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2018-10-01 09:05:06.427908836 +0200
@@ -1,0 +2,15 @@
+Mon Sep 10 14:27:09 UTC 2018 - Alberto Planas Dominguez 
+
+- kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
+  Upstream backport.
+
+  In response to a change in binutils, commit b21ebf2fb4c
+  (x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
+  the linux kernel during the 4.16 development cycle and has
+  since been backported to earlier stable kernel series. The
+  change results in the failure message in $SUBJECT when
+  rebooting via kexec.
+
+  Fix this by replicating the change in kexec. 
+
+---

New:

  kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.tAmMDI/_old  2018-10-01 09:05:07.687907750 +0200
+++ /var/tmp/diff_new_pack.tAmMDI/_new  2018-10-01 09:05:07.687907750 +0200
@@ -20,7 +20,7 @@
 Version:2.0.17
 Release:0
 Summary:Tools for loading replacement kernels into memory
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  System/Kernel
 Url:
https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source: 
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/snapshot/%{name}-%{version}.tar.xz
@@ -31,6 +31,7 @@
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
 Patch14:%{name}-vmcoreinfo-in-xen.patch
+Patch15:%{name}-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -57,6 +58,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 autoreconf -fvi

++ kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch ++
From: Chris Clayton 
Date: Mon, 20 Aug 2018 12:00:31 +0100
Subject: kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error
Upstream: merged
Git-commit: b9de21ef51a7ceab7122a707c188602eae22c4ee

In response to a change in binutils, commit b21ebf2fb4c
(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
the linux kernel during the 4.16 development cycle and has
since been backported to earlier stable kernel series. The
change results in the failure message in $SUBJECT when
rebooting via kexec.

Fix this by replicating the change in kexec.

Signed-off-by: Chris Clayton 
Acked-by: Baoquan He 
Tested-by: Bhupesh Sharma 
Acked-by: Bhupesh Sharma 
Signed-off-by: Simon Horman 
---
 kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 
b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
index 7fdde73..db85b44 100644
--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),
goto overflow;
break;
case R_X86_64_PC32: 
+   case R_X86_64_PLT32:
*(uint32_t *)location = value - address;
break;
default:



commit kexec-tools for openSUSE:Factory

2018-04-26 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2018-04-26 13:33:03

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Thu Apr 26 13:33:03 2018 rev:126 rq:598935 version:2.0.17

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2018-04-07 
20:48:12.497606517 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2018-04-26 13:33:06.154917070 +0200
@@ -1,0 +2,19 @@
+Thu Apr 19 11:54:10 UTC 2018 - ptesa...@suse.com
+
+- Bump to version 2.0.17
+  Changelog: 
http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.16..v2.0.17
+- Drop kexec-tools-xen-static.patch: upstream uses run-time dynamic
+  linking to address the same issue.
+- Drop all patches from upstream git:
+  * kexec-tools-add-a-helper-function-to-add-ranges.patch
+  * kexec-tools-ppc64-parse-ibm-dynamic-memory.patch
+  * kexec-tools-ppc64-leverage-kexec_file_load-support.patch
+  * kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch
+  * kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch
+  * kexec-tools-Do-not-special-case-the-s-option.patch
+  * kexec-tools-Add-option-to-revert-s.patch
+  * kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch
+  * kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch
+  * kexec-tools-fix-kexec-p-segfault.patch
+
+---

Old:

  kexec-tools-2.0.16.tar.gz
  kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch
  kexec-tools-Add-option-to-revert-s.patch
  kexec-tools-Do-not-special-case-the-s-option.patch
  kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch
  kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch
  kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch
  kexec-tools-add-a-helper-function-to-add-ranges.patch
  kexec-tools-fix-kexec-p-segfault.patch
  kexec-tools-ppc64-leverage-kexec_file_load-support.patch
  kexec-tools-ppc64-parse-ibm-dynamic-memory.patch
  kexec-tools-xen-static.patch

New:

  kexec-tools-2.0.17.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.wQNFWQ/_old  2018-04-26 13:33:07.086882924 +0200
+++ /var/tmp/diff_new_pack.wQNFWQ/_new  2018-04-26 13:33:07.086882924 +0200
@@ -17,30 +17,19 @@
 
 
 Name:   kexec-tools
-Version:2.0.16
+Version:2.0.17
 Release:0
 Summary:Tools for loading replacement kernels into memory
 License:GPL-2.0+
 Group:  System/Kernel
-Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
-Source: 
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/snapshot/%{name}-%{version}.tar.gz
+Url:
https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
+Source: 
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/snapshot/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8
 Source3:kexec-load.service
 Source4:%{name}-rpmlintrc
-Patch1: %{name}-xen-static.patch
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
-Patch4: %{name}-add-a-helper-function-to-add-ranges.patch
-Patch5: %{name}-ppc64-parse-ibm-dynamic-memory.patch
-Patch6: %{name}-ppc64-leverage-kexec_file_load-support.patch
-Patch7: %{name}-Return-ENOSYS-when-kexec-does-not-know.patch
-Patch8: %{name}-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch
-Patch9: %{name}-Do-not-special-case-the-s-option.patch
-Patch10:%{name}-Add-option-to-revert-s.patch
-Patch11:%{name}-Add-option-to-fall-back-to-KEXEC_LOAD.patch
-Patch12:%{name}-Document-s-c-and-a-options-in-the-man-page.patch
-Patch13:%{name}-fix-kexec-p-segfault.patch
 Patch14:%{name}-vmcoreinfo-in-xen.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -65,19 +54,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 %patch14 -p1
 
 %build




commit kexec-tools for openSUSE:Factory

2018-04-07 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2018-04-07 20:48:03

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Sat Apr  7 20:48:03 2018 rev:125 rq:593775 version:2.0.16

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2018-02-25 
11:32:49.803384992 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2018-04-07 20:48:12.497606517 +0200
@@ -1,0 +2,26 @@
+Thu Apr  5 11:12:53 UTC 2018 - ptesa...@suse.com
+
+- kexec-tools-vmcoreinfo-in-xen.patch: Revert "kexec-tools: Read
+  always one vmcoreinfo file" (bsc#1085626, bsc#951740).
+
+---
+Thu Apr  5 09:05:11 UTC 2018 - ptesa...@suse.com
+
+- kexec-tools-fix-kexec-p-segfault.patch: Fix a segmentation fault
+  when trying to run "kexec -p" (bsc#1080916).
+
+---
+Tue Apr  3 11:43:18 UTC 2018 - msucha...@suse.com
+
+- kexec: add -a option to fall back to KEXEC_LOAD when KEXEC_FILE_LOAD is not
+  supported (bsc#1080916, boo#1076839).
+  * kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch
+  * kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch
+  * kexec-tools-Do-not-special-case-the-s-option.patch
+  * kexec-tools-Add-option-to-revert-s.patch
+  * kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch
+  * kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch
+- kexec-tools-ppc64-leverage-kexec_file_load-support.patch: kexec/ppc64:
+  leverage kexec_file_load support (bsc#1080916).
+
+---

New:

  kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch
  kexec-tools-Add-option-to-revert-s.patch
  kexec-tools-Do-not-special-case-the-s-option.patch
  kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch
  kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch
  kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch
  kexec-tools-fix-kexec-p-segfault.patch
  kexec-tools-ppc64-leverage-kexec_file_load-support.patch
  kexec-tools-vmcoreinfo-in-xen.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.meD1k9/_old  2018-04-07 20:48:13.125583790 +0200
+++ /var/tmp/diff_new_pack.meD1k9/_new  2018-04-07 20:48:13.133583500 +0200
@@ -33,6 +33,15 @@
 Patch3: %{name}-disable-test.patch
 Patch4: %{name}-add-a-helper-function-to-add-ranges.patch
 Patch5: %{name}-ppc64-parse-ibm-dynamic-memory.patch
+Patch6: %{name}-ppc64-leverage-kexec_file_load-support.patch
+Patch7: %{name}-Return-ENOSYS-when-kexec-does-not-know.patch
+Patch8: %{name}-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch
+Patch9: %{name}-Do-not-special-case-the-s-option.patch
+Patch10:%{name}-Add-option-to-revert-s.patch
+Patch11:%{name}-Add-option-to-fall-back-to-KEXEC_LOAD.patch
+Patch12:%{name}-Document-s-c-and-a-options-in-the-man-page.patch
+Patch13:%{name}-fix-kexec-p-segfault.patch
+Patch14:%{name}-vmcoreinfo-in-xen.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -61,6 +70,15 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 autoreconf -fvi

++ kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch ++
From: Michal Suchanek 
Date: Mon, 26 Feb 2018 12:24:44 +0100
Subject: kexec: Add option to fall back to KEXEC_LOAD when KEXEC_FILE_LOAD
 is not supported
References: bsc#1080916, boo#1076839
Upstream: merged
Git-commit: 9fa99c42cb911727a962b358c5b1d36d0fe338ab

Not all architectures implement KEXEC_FILE_LOAD. However, on some
archiectures KEXEC_FILE_LOAD is required when secure boot is enabled in
locked-down mode. Previously users had to select the KEXEC_FILE_LOAD
syscall with undocumented -s option. However, if they did pass the
option kexec would fail on architectures that do not support it.

So add an -a option that tries KEXEC_FILE_LOAD and when it is not
supported tries KEXEC_LOAD.

Signed-off-by: Michal Suchanek 
---
v3: instead of changing the deafult add extra option
v4: actually check -ENOSYS as well
v5: add missing break
v6:
  - add note about ENOTSUPP
  - add description to help text
---
 kexec/kexec.c | 65 ++-
 kexec/kexec.h |  4 +++-
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/kexec/kexec.c b/kexec/kexec.c

commit kexec-tools for openSUSE:Factory

2018-02-25 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2018-02-25 11:32:48

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Sun Feb 25 11:32:48 2018 rev:124 rq:579332 version:2.0.16

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2018-01-30 
15:37:39.737488781 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2018-02-25 11:32:49.803384992 +0100
@@ -1,0 +2,9 @@
+Fri Feb 23 07:38:55 UTC 2018 - ptesa...@suse.com
+
+- kexec-tools-ppc64-parse-ibm-dynamic-memory.patch: kexec/ppc64:
+  add support to parse ibm, dynamic-memory-v2 property
+  (bsc#1081789, LTC#164625).
+- kexec-tools-add-a-helper-function-to-add-ranges.patch: kexec: add
+  a helper function to add ranges (bsc#1081789, LTC#164625).
+
+---

New:

  kexec-tools-add-a-helper-function-to-add-ranges.patch
  kexec-tools-ppc64-parse-ibm-dynamic-memory.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.UzARzC/_old  2018-02-25 11:32:51.195334446 +0100
+++ /var/tmp/diff_new_pack.UzARzC/_new  2018-02-25 11:32:51.195334446 +0100
@@ -31,6 +31,8 @@
 Patch1: %{name}-xen-static.patch
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
+Patch4: %{name}-add-a-helper-function-to-add-ranges.patch
+Patch5: %{name}-ppc64-parse-ibm-dynamic-memory.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -57,6 +59,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 autoreconf -fvi

++ kexec-tools-add-a-helper-function-to-add-ranges.patch ++
From: Hari Bathini 
Date: Tue, 20 Feb 2018 19:48:00 +0530
Subject: kexec: add a helper function to add ranges
References: bsc#1081789, LTC#164625
Upstream: merged
Git-commit: c740fdb2048265551f77d3f0fe53b2fddc0c8489 Mon Sep 17 00:00:00 2001

Add a helper function for adding ranges to avoid duplicating code.

Signed-off-by: Hari Bathini 
Reviewed-by: Mahesh Salgaonkar 
Signed-off-by: Simon Horman 
Acked-by: Petr Tesarik 

---
 kexec/fs2dt.c |  115 ++
 1 file changed, 53 insertions(+), 62 deletions(-)

--- a/kexec/fs2dt.c
+++ b/kexec/fs2dt.c
@@ -169,6 +169,50 @@ static unsigned propnum(const char *name
return offset;
 }
 
+/*
+ * Add ranges by comparing 'base' and 'end' addresses with usable
+ * memory ranges. Returns the number of ranges added. Each range added
+ * increments 'idx' by 2.
+ */
+static uint64_t add_ranges(uint64_t **ranges, int *ranges_size, int idx,
+  uint64_t base, uint64_t end)
+{
+   uint64_t loc_base, loc_end, rngs_cnt = 0;
+   size_t range;
+   int add = 0;
+
+   for (range = 0; range < usablemem_rgns.size; range++) {
+   loc_base = usablemem_rgns.ranges[range].start;
+   loc_end = usablemem_rgns.ranges[range].end;
+   if (loc_base >= base && loc_end <= end) {
+   add = 1;
+   } else if (base < loc_end && end > loc_base) {
+   if (loc_base < base)
+   loc_base = base;
+   if (loc_end > end)
+   loc_end = end;
+   add = 1;
+   }
+
+   if (add) {
+   if (idx >= ((*ranges_size) - 2)) {
+   (*ranges_size) += MEM_RANGE_CHUNK_SZ;
+   *ranges = realloc(*ranges, (*ranges_size)*8);
+   if (!(*ranges))
+   die("unrecoverable error: can't realloc"
+   "%d bytes for ranges.\n",
+   (*ranges_size)*8);
+   }
+   (*ranges)[idx++] = cpu_to_be64(loc_base);
+   (*ranges)[idx++] = cpu_to_be64(loc_end - loc_base);
+
+   rngs_cnt++;
+   }
+   }
+
+   return rngs_cnt;
+}
+
 #ifdef HAVE_DYNAMIC_MEMORY
 static void add_dyn_reconf_usable_mem_property__(int fd)
 {
@@ -176,8 +220,8 @@ static void add_dyn_reconf_usable_mem_pr
uint64_t buf[32];
uint64_t *ranges;
int ranges_size = MEM_RANGE_CHUNK_SZ;
-   uint64_t base, end, loc_base, loc_end;
-   size_t i, rngs_cnt, range;
+   uint64_t base, 

commit kexec-tools for openSUSE:Factory

2018-01-30 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2018-01-30 15:37:38

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Tue Jan 30 15:37:38 2018 rev:123 rq:569880 version:2.0.16

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2018-01-13 
21:35:23.132363539 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2018-01-30 15:37:39.737488781 +0100
@@ -1,0 +2,61 @@
+Fri Jan 19 12:59:56 UTC 2018 - tchva...@suse.com
+
+- Create compat link for rckexec-loader systemd service
+- Convert the asciidoc file to normal man in order to drop asciidoc dep
+  * python2 only obsoletion and upstream has only raw manpages too
+- Properly state all post/postun dependencies (systemd, suse-module-tools)
+- There is no reason for exclusive arch if we state all archs
+- Bump to version 2.0.16
+  Changelog: 
http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.14..v2.0.16
+- Remove support for older products to trivialize spec file
+- Make sure to not pull python2 via asciidoc
+- Drop merged patch 0001-kexec-tools-2.0.14.git.patch
+- Drop all patches from upstream git:
+  * 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch
+  * 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch
+  * 0004-alpha-add-missing-__NR_kexec_load-definition.patch
+  * 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch
+  * 0006-kexec-Remove-redundant-space-from-help-message.patch
+  * 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch
+  * 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch
+  * 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch
+  * 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch
+  * 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch
+  * 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch
+  * 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch
+  * 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch
+  * 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch
+  * 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch
+  * 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch
+  * 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch
+  * 0019-gitignore-add-two-generated-files-in-purgatory.patch
+  * 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch
+  * 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch
+  * 0022-uImage-fix-realloc-pointer-confusion.patch
+  * 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch
+  * 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch
+  * 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch
+  * 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch
+  * 0027-arm64-add-uImage-support.patch
+  * 0028-vmcore-dmesg-Define-_GNU_SOURCE.patch
+  * 0029-Don-t-use-L-width-specifier-with-integer-values.patch
+  * 0030-x86-x86_64-Fix-format-warning-with-die.patch
+  * 0031-ppc-Fix-format-warning-with-die.patch
+  * 0032-crashdump-Remove-stray-get_crashkernel_region-declar.patch
+  * 0033-x86-Support-large-number-of-memory-ranges.patch
+  * 0034-Fix-broken-Xen-support-in-configure.ac.patch
+  * 0035-kexec-extend-the-semantics-of-kexec_iomem_for_each_l.patch
+  * 0036-kexec-generalize-and-rename-get_kernel_stext_sym.patch
+  * 0037-arm64-identify-PHYS_OFFSET-correctly.patch
+  * 0038-arm64-change-return-values-on-error-to-negative.patch
+  * 0039-arm64-kdump-identify-memory-regions.patch
+  * 0040-arm64-kdump-add-elf-core-header-segment.patch
+  * 0041-arm64-kdump-set-up-kernel-image-segment.patch
+  * 0042-arm64-kdump-set-up-other-segments.patch
+  * 0043-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch
+  * 0044-arm64-kdump-Add-support-for-binary-image-files.patch
+  * 0045-Handle-additional-e820-memmap-type-strings.patch
+  * 0046-powerpc-fix-command-line-overflow-error.patch
+  * 0047-fix-how-RMA-top-is-deduced.patch
+
+---

Old:

  0001-kexec-tools-2.0.14.git.patch
  0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch
  0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch
  0004-alpha-add-missing-__NR_kexec_load-definition.patch
  0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch
  0006-kexec-Remove-redundant-space-from-help-message.patch
  0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch
  0008-kexec-Add-option-to-get-crash-kernel-region-size.patch
  0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch
  0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch
  

commit kexec-tools for openSUSE:Factory

2018-01-13 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2018-01-13 21:35:17

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Sat Jan 13 21:35:17 2018 rev:122 rq:563415 version:2.0.14

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2017-11-03 
16:22:46.932726680 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2018-01-13 21:35:23.132363539 +0100
@@ -1,0 +2,7 @@
+Mon Jan  8 15:14:57 UTC 2018 - msucha...@suse.com
+
+- Fix kexec error on ppc64 (bsc#1074947).
+  0046-powerpc-fix-command-line-overflow-error.patch
+  0047-fix-how-RMA-top-is-deduced.patch
+
+---

New:

  0046-powerpc-fix-command-line-overflow-error.patch
  0047-fix-how-RMA-top-is-deduced.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.FYvEzC/_old  2018-01-13 21:35:25.904233761 +0100
+++ /var/tmp/diff_new_pack.FYvEzC/_new  2018-01-13 21:35:25.908233573 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -84,6 +84,8 @@
 Patch143:   0043-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch
 Patch144:   0044-arm64-kdump-Add-support-for-binary-image-files.patch
 Patch145:   0045-Handle-additional-e820-memmap-type-strings.patch
+Patch146:   0046-powerpc-fix-command-line-overflow-error.patch
+Patch147:   0047-fix-how-RMA-top-is-deduced.patch
 
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -152,6 +154,8 @@
 %patch143 -p1
 %patch144 -p1
 %patch145 -p1
+%patch146 -p1
+%patch147 -p1
 
 %patch1 -p1
 %patch2 -p1

++ 0046-powerpc-fix-command-line-overflow-error.patch ++
>From 21eb397a5fc9227cd95d23e8c74a49cf6a293e57 Mon Sep 17 00:00:00 2001
From: Hari Bathini 
Date: Wed, 9 Aug 2017 23:47:42 +0530
Subject: [PATCH] kexec-tools: powerpc: fix command line overflow error

References: bsc#1074947
Patch-mainline: v2.0.16-rc1
Git-commit: 21eb397a5fc9227cd95d23e8c74a49cf6a293e57

Since kernel commit a5980d064fe2 ("powerpc: Bump COMMAND_LINE_SIZE
to 2048"), powerpc bumped command line size to 2048 but the size
used here is still the default value of 512. Bump it to 2048 to
fix command line overflow errors observed when command line length
is above 512 bytes. Also, get rid of the multiple definitions of
COMMAND_LINE_SIZE macro in ppc architecture.

Signed-off-by: Hari Bathini 
Signed-off-by: Simon Horman 
Acked-by: Michal Suchanek 
---
 kexec/arch/ppc/crashdump-powerpc.c | 6 +-
 kexec/arch/ppc/crashdump-powerpc.h | 2 --
 kexec/arch/ppc/fs2dt.c | 1 -
 kexec/arch/ppc/kexec-ppc.h | 3 ++-
 kexec/arch/ppc/ops.h   | 1 -
 kexec/arch/ppc64/crashdump-ppc64.c | 6 --
 kexec/arch/ppc64/crashdump-ppc64.h | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/kexec/arch/ppc/crashdump-powerpc.c 
b/kexec/arch/ppc/crashdump-powerpc.c
index dde6de7ec7a1..4ad026f38dd0 100644
--- a/kexec/arch/ppc/crashdump-powerpc.c
+++ b/kexec/arch/ppc/crashdump-powerpc.c
@@ -252,8 +252,12 @@ static void ulltoa(unsigned long long i, char *str)
 /* Append str to cmdline */
 static void add_cmdline(char *cmdline, char *str)
 {
+   int cmdline_size;
int cmdlen = strlen(cmdline) + strlen(str);
-   if (cmdlen > (COMMAND_LINE_SIZE - 1))
+
+   cmdline_size = (kernel_version() < KERNEL_VERSION(3, 15, 0) ?
+   512 : COMMAND_LINE_SIZE);
+   if (cmdlen > (cmdline_size - 1))
die("Command line overflow\n");
strcat(cmdline, str);
 }
diff --git a/kexec/arch/ppc/crashdump-powerpc.h 
b/kexec/arch/ppc/crashdump-powerpc.h
index 9b9b01e3157b..97b5095ba748 100644
--- a/kexec/arch/ppc/crashdump-powerpc.h
+++ b/kexec/arch/ppc/crashdump-powerpc.h
@@ -20,8 +20,6 @@ extern struct arch_options_t arch_options;
 #define KERNELBASE PAGE_OFFSET
 #define __pa(x)((unsigned long)(x)-PAGE_OFFSET)
 
-#define COMMAND_LINE_SIZE  512 /* from kernel */
-
 #ifdef CONFIG_BOOKE
 /* We don't need backup region in Book E */
 #define BACKUP_SRC_START   0x
diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c
index 

commit kexec-tools for openSUSE:Factory

2017-11-03 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2017-11-03 16:22:45

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Fri Nov  3 16:22:45 2017 rev:121 rq:537964 version:2.0.14

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2017-10-23 
16:40:12.405427496 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2017-11-03 16:22:46.932726680 +0100
@@ -1,0 +2,8 @@
+Tue Oct 31 10:23:51 MDT 2017 - carn...@suse.com
+
+- With Xen 4.10 there is a new required library called xentoolcore
+  (bsc#1037779)
+  kexec-tools-xen-static.patch
+- Refreshed kexec-tools-disable-test.patch
+
+---



Other differences:
--
++ kexec-tools-disable-test.patch ++
--- /var/tmp/diff_new_pack.xzo1XT/_old  2017-11-03 16:22:48.776659569 +0100
+++ /var/tmp/diff_new_pack.xzo1XT/_new  2017-11-03 16:22:48.780659423 +0100
@@ -8,9 +8,11 @@
  Makefile.in |7 +--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 a/Makefile.in
-+++ b/Makefile.in
-@@ -177,8 +177,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
+Index: kexec-tools-2.0.14/Makefile.in
+===
+--- kexec-tools-2.0.14.orig/Makefile.in
 kexec-tools-2.0.14/Makefile.in
+@@ -178,8 +178,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
  PGSRCS:=$(foreach s, $(GENERATED_SRCS), 
$(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
  
  MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)

++ kexec-tools-xen-static.patch ++
--- /var/tmp/diff_new_pack.xzo1XT/_old  2017-11-03 16:22:48.800658696 +0100
+++ /var/tmp/diff_new_pack.xzo1XT/_new  2017-11-03 16:22:48.800658696 +0100
@@ -6,42 +6,60 @@
 This patch just links the xenctrl library statically. That allows
 to use Xen support without a runtime dependency to the Xen package.
 
+31Oct2017: Updated to handle Xen 4.10 with new xentoolcore library
+
 Signed-off-by: Bernhard Walle 
+Signed-off-by: Charles Arnold 
 
 

 ---
  configure.ac |   17 -
  1 file changed, 16 insertions(+), 1 deletion(-)
 
 a/configure.ac
-+++ b/configure.ac
+Index: kexec-tools-2.0.14/configure.ac
+===
+--- kexec-tools-2.0.14.orig/configure.ac
 kexec-tools-2.0.14/configure.ac
 @@ -164,8 +164,10 @@ fi
  
  dnl find Xen control stack libraries
  if test "$with_xen" = yes ; then
-+  if pkg-config --exists 'xenlight > 4.8.0' ; then
++  if pkg-config --exists 'xenlight > 4.9.0' ; then
AC_CHECK_HEADER(xenctrl.h,
 -  [AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
 +  [AC_CHECK_LIB(xenctrl, xc_kexec_load,
-+  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxendevicemodel 
-lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
++  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoolcore -lxentoollog 
-lxendevicemodel -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
AC_MSG_NOTICE([Xen support disabled]))])
if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then
AC_CHECK_LIB(xenctrl, xc_kexec_status,
-@@ -173,6 +175,19 @@ if test "$with_xen" = yes ; then
+@@ -173,6 +175,32 @@ if test "$with_xen" = yes ; then
[The kexec_status call is available]),
AC_MSG_NOTICE([The kexec_status call is not 
available]))
fi
 +  else
-+  if pkg-config --exists 'xenlight > 4.6.0' ; then
++  if pkg-config --exists 'xenlight > 4.8.0' ; then
 +  AC_CHECK_HEADER(xenctrl.h,
 +  [AC_CHECK_LIB(xenctrl, xc_kexec_load,
-+  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxenforeignmemory 
-Wl,-Bdynamic -lpthread -ldl $LIBS"]],
++  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxendevicemodel 
-lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
 +  AC_MSG_NOTICE([Xen support disabled]))])
++  if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then
++  AC_CHECK_LIB(xenctrl, xc_kexec_status,
++  

commit kexec-tools for openSUSE:Factory

2017-10-23 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2017-10-23 16:40:11

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Mon Oct 23 16:40:11 2017 rev:120 rq:534593 version:2.0.14

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2017-06-23 
09:13:04.167328127 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2017-10-23 16:40:12.405427496 +0200
@@ -1,0 +2,7 @@
+Thu Jun  1 09:12:40 UTC 2017 - jeng...@inai.de
+
+- Remove redundant %clean section. Replace $RPM_* shell vars
+  by macros.
+- Rewrite summary line.
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.ibiBsG/_old  2017-10-23 16:40:16.857219158 +0200
+++ /var/tmp/diff_new_pack.ibiBsG/_new  2017-10-23 16:40:16.861218971 +0200
@@ -25,7 +25,7 @@
 Requires(pre):  %fillup_prereq
 Requires(post): coreutils
 Requires(postun): coreutils
-Summary:Tools for fast kernel loading
+Summary:Tools for loading replacement kernels into memory
 License:GPL-2.0+
 Group:  System/Kernel
 Version:2.0.14
@@ -162,10 +162,10 @@
 export SUSE_ASNEEDED=0
 %{?suse_update_config -f}
 %ifarch ia64
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//')
+RPM_OPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-fstack-protector//')
 %endif
 autoreconf -f
-CFLAGS=$RPM_OPT_FLAGS BUILD_CFLAGS=$RPM_OPT_FLAGS \
+CFLAGS="$RPM_OPT_FLAGS" BUILD_CFLAGS="$RPM_OPT_FLAGS" \
 %ifarch ppc
 %configure --host=powerpc64-suse-linux --build=powerpc64-suse-linux 
 %else
@@ -175,22 +175,19 @@
 a2x -D . -d manpage -f manpage %{S:2}
 
 %install
-%makeinstall
-install -c -m 0644 kexec-bootloader.8 $RPM_BUILD_ROOT%{_mandir}/man8
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/kdump.8
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m644 %{S:3} $RPM_BUILD_ROOT%{_unitdir}
+%make_install
+install -c -m 0644 kexec-bootloader.8 %{buildroot}/%{_mandir}/man8
+rm -f %{buildroot}/%{_mandir}/man8/kdump.8
+mkdir -p %{buildroot}/%{_sbindir}
+install -m 0755 %{S:1} %{buildroot}/%{_sbindir}
+mkdir -p %{buildroot}/%{_unitdir}
+install -m644 %{S:3} %{buildroot}/%{_unitdir}
 #UsrMerge
-mkdir -p $RPM_BUILD_ROOT/sbin
-ln -s %{_sbindir}/kdump $RPM_BUILD_ROOT/sbin
-ln -s %{_sbindir}/kexec $RPM_BUILD_ROOT/sbin
+mkdir -p %{buildroot}/sbin
+ln -s %{_sbindir}/kdump %{buildroot}/sbin
+ln -s %{_sbindir}/kexec %{buildroot}/sbin
 #EndUsrMerge
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
 %post
 %service_add_post kexec-load.service
 %{?regenerate_initrd_post}




commit kexec-tools for openSUSE:Factory

2017-06-23 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2017-06-23 09:12:59

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Fri Jun 23 09:12:59 2017 rev:119 rq:500224 version:2.0.14

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2017-05-27 
13:09:55.391115031 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2017-06-23 09:13:04.167328127 +0200
@@ -1,0 +2,60 @@
+Wed May 31 10:47:33 CEST 2017 - ti...@suse.de
+
+- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671)
+  Changelog: 
http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14
+- Backport upstream fixes  (bsc#1039937, FATE#320672, FATE#320671)
+  0001-kexec-tools-2.0.14.git.patch
+  0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch
+  0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch
+  0004-alpha-add-missing-__NR_kexec_load-definition.patch
+  0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch
+  0006-kexec-Remove-redundant-space-from-help-message.patch
+  0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch
+  0008-kexec-Add-option-to-get-crash-kernel-region-size.patch
+  0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch
+  0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch
+  0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch
+  0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch
+  0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch
+  0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch
+  0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch
+  0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch
+  0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch
+  0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch
+  0019-gitignore-add-two-generated-files-in-purgatory.patch
+  0020-Only-print-debug-message-when-failed-to-serach-for-k.patch
+  0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch
+  0022-uImage-fix-realloc-pointer-confusion.patch
+  0023-uImage-Fix-uImage_load-for-little-endian-machines.patch
+  0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch
+  0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch
+  0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch
+  0027-arm64-add-uImage-support.patch
+  0028-vmcore-dmesg-Define-_GNU_SOURCE.patch
+  0029-Don-t-use-L-width-specifier-with-integer-values.patch
+  0030-x86-x86_64-Fix-format-warning-with-die.patch
+  0031-ppc-Fix-format-warning-with-die.patch
+  0032-crashdump-Remove-stray-get_crashkernel_region-declar.patch
+  0033-x86-Support-large-number-of-memory-ranges.patch
+  0034-Fix-broken-Xen-support-in-configure.ac.patch
+  0035-kexec-extend-the-semantics-of-kexec_iomem_for_each_l.patch
+  0036-kexec-generalize-and-rename-get_kernel_stext_sym.patch
+  0037-arm64-identify-PHYS_OFFSET-correctly.patch
+  0038-arm64-change-return-values-on-error-to-negative.patch
+  0039-arm64-kdump-identify-memory-regions.patch
+  0040-arm64-kdump-add-elf-core-header-segment.patch
+  0041-arm64-kdump-set-up-kernel-image-segment.patch
+  0042-arm64-kdump-set-up-other-segments.patch
+  0043-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch
+  0044-arm64-kdump-Add-support-for-binary-image-files.patch
+  0045-Handle-additional-e820-memmap-type-strings.patch
+- Refreshed patches:
+  kexec-tools-xen-static.patch
+  kexec-tools-xen-balloon-up.patch
+- Drop obsoleted arm64 patches:
+  kexec-tools-enable-aarch64-fixup.patch
+  kexec-tools-enable-aarch64.patch
+- Fix source URL, as ftp was discontinued on korg
+- Sync changelog with SLE12 packages
+
+---
@@ -45,0 +106,6 @@
+Mon May 30 08:47:49 UTC 2016 - ptesa...@suse.com
+
+- kexec-tools-ppc64-reduce-elf-loads.patch: ppc64: Reduce number of
+  ELF LOAD segments (bsc#981339).
+
+---
@@ -48 +114 @@
-- Adjust linking to libxenctrl to xen-4.7 API
+- Adjust linking to libxenctrl to xen-4.7 API (fate#319989)
@@ -56,0 +123,14 @@
+Mon Oct 26 09:33:04 UTC 2015 - ptesa...@suse.cz
+
+- kexec-tools-vmcoreinfo-in-xen.patch: Store XEN_VMCOREINFO in
+  panic kernel ELF notes.
+  (bsc#951740)
+
+---
+Wed Oct 14 04:11:05 UTC 2015 - j...@suse.com
+
+- kexec-tools-xen-inhibit-file-based-syscall.patch: To inhibit file
+  based syscall on XEN, using old syscall to load crash kernel.
+  (bsc#947172)
+
+---
@@ -73,0 +154,6 @@
+Mon May  4 08:36:01 UTC 

commit kexec-tools for openSUSE:Factory

2017-05-27 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2017-05-27 13:09:28

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Sat May 27 13:09:28 2017 rev:118 rq:497341 version:2.0.13

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2017-04-20 
20:47:10.759953789 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2017-05-27 13:09:55.391115031 +0200
@@ -1,0 +2,7 @@
+Wed May 10 15:51:43 MDT 2017 - carn...@suse.com
+
+- kexec-tools-xen-static.patch: xen breaks kexec-tools build
+  (bsc#1037779)
+  See also matching fix in xen-devel package
+
+---



Other differences:
--
++ kexec-tools-xen-static.patch ++
--- /var/tmp/diff_new_pack.LnTJ0u/_old  2017-05-27 13:09:56.143008725 +0200
+++ /var/tmp/diff_new_pack.LnTJ0u/_new  2017-05-27 13:09:56.147008160 +0200
@@ -1,10 +1,11 @@
 From: Bernhard Walle 
 Subject: [PATCH] Link xenctrl statically
+Upstream: no
+Signed-off-by: Tony Jones 
 
 This patch just links the xenctrl library statically. That allows
 to use Xen support without a runtime dependency to the Xen package.
 
-
 Signed-off-by: Bernhard Walle 
 
 

@@ -12,23 +13,32 @@
  configure.ac |   10 +-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 a/configure.ac
-+++ b/configure.ac
-@@ -163,9 +163,17 @@ fi
+Index: kexec-tools-2.0.13/configure.ac
+===
+--- kexec-tools-2.0.13.orig/configure.ac
 kexec-tools-2.0.13/configure.ac
+@@ -161,9 +161,24 @@ fi
  
  dnl find Xen control stack libraries
  if test "$with_xen" = yes ; then
-+  if pkg-config --exists 'xenlight >= 4.7' ; then
++  if pkg-config --exists 'xenlight > 4.8.0' ; then
AC_CHECK_HEADER(xenctrl.h,
 -  [AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
 +  [AC_CHECK_LIB(xenctrl, xc_kexec_load,
-+  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxenforeignmemory 
-Wl,-Bdynamic -lpthread -ldl $LIBS"]],
++  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxendevicemodel 
-lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
AC_MSG_NOTICE([Xen support disabled]))])
 +  else
-+  AC_CHECK_HEADER(xenctrl.h,
-+  [AC_CHECK_LIB(xenctrl, xc_kexec_load,
-+  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
-+  AC_MSG_NOTICE([Xen support disabled]))])
++  if pkg-config --exists 'xenlight > 4.6.0' ; then
++  AC_CHECK_HEADER(xenctrl.h,
++  [AC_CHECK_LIB(xenctrl, xc_kexec_load,
++  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxenforeignmemory 
-Wl,-Bdynamic -lpthread -ldl $LIBS"]],
++  AC_MSG_NOTICE([Xen support disabled]))])
++  else
++  AC_CHECK_HEADER(xenctrl.h,
++  [AC_CHECK_LIB(xenctrl, xc_kexec_load,
++  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
++  AC_MSG_NOTICE([Xen support disabled]))])
++  fi
 +  fi
  fi
  




commit kexec-tools for openSUSE:Factory

2017-04-20 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2017-04-20 20:47:08

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Thu Apr 20 20:47:08 2017 rev:117 rq:487406 version:2.0.13

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2017-02-26 
17:00:05.895249409 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2017-04-20 20:47:10.759953789 +0200
@@ -1,0 +2,5 @@
+Tue Apr 11 14:27:09 UTC 2017 - bwiedem...@suse.com
+
+- fix kexec-bootloader with /boot partition (boo#1033599)
+
+---



Other differences:
--
++ kexec-bootloader ++
--- /var/tmp/diff_new_pack.NLSkIn/_old  2017-04-20 20:47:11.763811854 +0200
+++ /var/tmp/diff_new_pack.NLSkIn/_new  2017-04-20 20:47:11.767811288 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 #
 # This program is free software; you can redistribute it and/or  
{{{
 # modify it under the terms of the GNU General Public License
@@ -152,12 +152,13 @@
 my $image=$section->{"image"};
 my $initrd=$section->{"initrd"};
 
-# handle btfs /@ -> /
-if (substr ($image, 0, 3) eq "/@/") {
-   $image = substr ($image, 2);
-}
-if ($initrd && substr ($initrd, 0, 3) eq "/@/") {
-   $initrd = substr ($initrd, 2);
+for my $file ($image, $initrd) {
+   # handle btfs /@ -> /
+   $file =~ s!^/@/!/!;
+   # handle /boot on separate partition
+   if($file !~ m!^/boot/! && ! -e $file && -e "/boot$file") {
+  $file="/boot$file"
+   }
 }
 
 if ($debug) {




commit kexec-tools for openSUSE:Factory

2017-02-26 Thread root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2017-02-26 17:00:04

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2016-08-12 
15:36:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2017-02-26 17:00:05.895249409 +0100
@@ -1,0 +2,5 @@
+Wed Feb 22 12:51:28 UTC 2017 - meiss...@suse.com
+
+- Do not pull in gcc-PIE, as it breaks the static build in here.
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.P4Keqb/_old  2017-02-26 17:00:07.131061956 +0100
+++ /var/tmp/diff_new_pack.P4Keqb/_new  2017-02-26 17:00:07.135061349 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -44,6 +44,7 @@
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
+#!BuildIgnore:  gcc-PIE
 BuildRequires:  asciidoc
 BuildRequires:  automake
 BuildRequires:  libxslt




commit kexec-tools for openSUSE:Factory

2016-08-12 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2016-08-12 15:36:17

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2016-07-01 
09:56:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2016-08-12 15:36:19.0 +0200
@@ -1,0 +2,8 @@
+Mon Aug  8 10:47:36 UTC 2016 - ptesa...@suse.com
+
+- Update to version 2.0.13
+  Changelog: 
http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.12..v2.0.13
+
+- Refresh kexec-tools-enable-aarch64.patch
+
+---

Old:

  kexec-tools-2.0.12.tar.xz

New:

  kexec-tools-2.0.13.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.S5wK7V/_old  2016-08-12 15:36:20.0 +0200
+++ /var/tmp/diff_new_pack.S5wK7V/_new  2016-08-12 15:36:20.0 +0200
@@ -28,7 +28,7 @@
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
-Version:2.0.12
+Version:2.0.13
 Release:0
 Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader

++ kexec-tools-2.0.12.tar.xz -> kexec-tools-2.0.13.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kexec-tools-2.0.12/configure 
new/kexec-tools-2.0.13/configure
--- old/kexec-tools-2.0.12/configure2016-03-22 02:08:10.0 +0100
+++ new/kexec-tools-2.0.13/configure2016-08-08 12:27:25.0 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for kexec-tools 2.0.12.
+# Generated by GNU Autoconf 2.69 for kexec-tools 2.0.13.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='kexec-tools'
 PACKAGE_TARNAME='kexec-tools'
-PACKAGE_VERSION='2.0.12'
-PACKAGE_STRING='kexec-tools 2.0.12'
+PACKAGE_VERSION='2.0.13'
+PACKAGE_STRING='kexec-tools 2.0.13'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1268,7 +1268,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures kexec-tools 2.0.12 to adapt to many kinds of systems.
+\`configure' configures kexec-tools 2.0.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1334,7 +1334,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of kexec-tools 2.0.12:";;
+ short | recursive ) echo "Configuration of kexec-tools 2.0.13:";;
esac
   cat <<\_ACEOF
 
@@ -1424,7 +1424,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-kexec-tools configure 2.0.12
+kexec-tools configure 2.0.13
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1722,7 +1722,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by kexec-tools $as_me 2.0.12, which was
+It was created by kexec-tools $as_me 2.0.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5325,7 +5325,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by kexec-tools $as_me 2.0.12, which was
+This file was extended by kexec-tools $as_me 2.0.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -5387,7 +5387,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/&/g'`"
 ac_cs_version="\\
-kexec-tools config.status 2.0.12
+kexec-tools config.status 2.0.13
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kexec-tools-2.0.12/configure.ac 
new/kexec-tools-2.0.13/configure.ac
--- old/kexec-tools-2.0.12/configure.ac 2016-03-22 02:07:37.0 +0100
+++ new/kexec-tools-2.0.13/configure.ac 2016-08-08 12:25:58.0 +0200
@@ -4,7 +4,7 @@
 dnl 
 
 dnl ---Required
-AC_INIT(kexec-tools, 2.0.12)
+AC_INIT(kexec-tools, 2.0.13)
 AC_CONFIG_AUX_DIR(./config)
 

commit kexec-tools for openSUSE:Factory

2016-07-01 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2016-07-01 09:56:34

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2016-06-14 
23:06:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2016-07-01 09:56:35.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 17 11:44:18 UTC 2016 - norm...@linux.vnet.ibm.com
+
+-  remove sed line in spec for ppc64 about stack-protector
+   as now handled in Makefile.
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.YSPHTZ/_old  2016-07-01 09:56:36.0 +0200
+++ /var/tmp/diff_new_pack.YSPHTZ/_new  2016-07-01 09:56:36.0 +0200
@@ -72,7 +72,7 @@
 # disable as-needed
 export SUSE_ASNEEDED=0
 %{?suse_update_config -f}
-%ifarch ia64 ppc64le
+%ifarch ia64
 RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//')
 %endif
 autoreconf -f




commit kexec-tools for openSUSE:Factory

2016-06-14 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2016-06-14 23:06:09

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2015-12-18 
21:52:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2016-06-14 23:06:28.0 +0200
@@ -1,0 +2,18 @@
+Fri Jun  3 18:16:51 UTC 2016 - to...@suse.com
+
+- Update to version 2.0.12 (FATE#320915, bsc#980545)
+  Changelog: 
http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.10..v2.0.12
+
+  Drop following patches (upstream):
+   kexec-tools-load-crash-kernel-high.patch
+
+-  Fix pkg-config to check >= 4.7 rather than > 4.6 for xenlight
+
+-  Specifically name Files in specfile rather than using glob.
+
+---
+Tue May  3 15:17:15 UTC 2016 - o...@aepfle.de
+
+- Adjust linking to libxenctrl to xen-4.7 API
+
+---

Old:

  kexec-tools-2.0.10.tar.xz
  kexec-tools-load-crash-kernel-high.patch

New:

  kexec-tools-2.0.12.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.UTC5ua/_old  2016-06-14 23:06:28.0 +0200
+++ /var/tmp/diff_new_pack.UTC5ua/_new  2016-06-14 23:06:28.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
-Version:2.0.10
+Version:2.0.12
 Release:0
 Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader
@@ -40,7 +40,6 @@
 Patch3: %{name}-disable-test.patch
 Patch4: %{name}-enable-aarch64.patch
 Patch5: %{name}-enable-aarch64-fixup.patch
-Patch6: %{name}-load-crash-kernel-high.patch
 
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -50,6 +49,7 @@
 BuildRequires:  libxslt
 BuildRequires:  zlib-devel
 %ifarch x86_64
+BuildRequires:  pkg-config
 BuildRequires:  xen-devel
 %endif
 ExclusiveArch:  ppc64le aarch64 %ix86 x86_64 ia64 ppc ppc64 s390 s390x %arm sh 
mips mipsel m68k
@@ -67,7 +67,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 # disable as-needed
@@ -125,10 +124,13 @@
 %doc AUTHORS COPYING News TODO doc
 %doc %{_mandir}/man*/*
 #UsrMerge
-/sbin/*
+/sbin/kdump
+/sbin/kexec
 #EndUsrMerge
-%{_sbindir}/*
+%{_sbindir}/kdump
+%{_sbindir}/kexec
 %{_sbindir}/kexec-bootloader
+%{_sbindir}/vmcore-dmesg
 %{_unitdir}/kexec-load.service
 
 %changelog

++ kexec-tools-2.0.10.tar.xz -> kexec-tools-2.0.12.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kexec-tools-2.0.10/configure 
new/kexec-tools-2.0.12/configure
--- old/kexec-tools-2.0.10/configure2015-06-25 12:09:47.0 +0200
+++ new/kexec-tools-2.0.12/configure2016-03-22 02:08:10.0 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for kexec-tools 2.0.10.
+# Generated by GNU Autoconf 2.69 for kexec-tools 2.0.12.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='kexec-tools'
 PACKAGE_TARNAME='kexec-tools'
-PACKAGE_VERSION='2.0.10'
-PACKAGE_STRING='kexec-tools 2.0.10'
+PACKAGE_VERSION='2.0.12'
+PACKAGE_STRING='kexec-tools 2.0.12'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1268,7 +1268,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures kexec-tools 2.0.10 to adapt to many kinds of systems.
+\`configure' configures kexec-tools 2.0.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1334,7 +1334,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of kexec-tools 2.0.10:";;
+ short | recursive ) echo "Configuration of kexec-tools 2.0.12:";;
esac
   cat <<\_ACEOF
 
@@ -1424,7 

commit kexec-tools for openSUSE:Factory

2015-12-18 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2015-12-18 21:52:37

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2015-10-17 
16:37:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2015-12-18 21:52:39.0 +0100
@@ -1,0 +2,6 @@
+Thu Dec 10 16:33:20 CET 2015 - ti...@suse.de
+
+- Fix missing dependency on coreutils for initrd macros (boo#958562)
+- Call missing initrd macro at postun (boo#958562)
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.m76TXG/_old  2015-12-18 21:52:40.0 +0100
+++ /var/tmp/diff_new_pack.m76TXG/_new  2015-12-18 21:52:40.0 +0100
@@ -22,7 +22,9 @@
 BuildRequires:  glibc-devel-64bit
 %endif
 Requires:   perl-Bootloader
-PreReq: %fillup_prereq
+Requires(pre):  %fillup_prereq
+Requires(post): coreutils
+Requires(postun): coreutils
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
@@ -107,6 +109,7 @@
 
 %postun
 %service_del_postun kexec-load.service
+%{?regenerate_initrd_post}
 
 %pre
 %service_add_pre kexec-load.service




commit kexec-tools for openSUSE:Factory

2015-10-17 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2015-10-17 16:37:39

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is "kexec-tools"

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2015-07-14 
17:20:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2015-10-17 16:37:40.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct  6 09:34:20 UTC 2015 - ptesa...@suse.com
+
+- kexec-tools-load-crash-kernel-high.patch: Load crash kernel high
+  on x86 (bsc#946365).
+
+---

New:

  kexec-tools-load-crash-kernel-high.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.Ksw4ws/_old  2015-10-17 16:37:41.0 +0200
+++ /var/tmp/diff_new_pack.Ksw4ws/_new  2015-10-17 16:37:41.0 +0200
@@ -38,6 +38,7 @@
 Patch3: %{name}-disable-test.patch
 Patch4: %{name}-enable-aarch64.patch
 Patch5: %{name}-enable-aarch64-fixup.patch
+Patch6: %{name}-load-crash-kernel-high.patch
 
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -64,6 +65,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 # disable as-needed

++ kexec-tools-load-crash-kernel-high.patch ++
From: Petr Tesarik 
Date: Thu Sep 24 08:48:52 2015 +0200
Subject: Load crash kernel high on x86
References: bsc#946365
Patch-mainline: post-v2.0.10
Git-commit: 4fbf781eb0383a491906d3851b066657b29c2816

There may be more than one crash kernel regions on x86. Currently,
kexec-tools picks the largest one. If high reservation is smaller
than low, it will try to load panic kernel low. However, the kexec
syscall checks that target address is within crashk_res boundaries,
so attempts to load crash kernel low result in -EADDRNOTAVAIL, and
kexec prints out this error message:

kexec_load failed: Cannot assign requested address

Looking at the logic in arch/x86/kernel/setup.c, there are only two
possible layouts:

  1. crashk_res is below 4G, and there is only one region,
  2. crashk_res is above 4G, and crashk_low_res is below 4G

In either case, kexec-tools must pick the highest region.

Changelog:

  * v3: rename function to get_crash_kernel_load_range
  * v2: remove unnecessary local variables

Signed-off-by: Petr Tesarik 
Signed-off-by: Simon Horman 

---
 kexec/arch/i386/crashdump-x86.c|   21 +++--
 kexec/arch/i386/kexec-x86-common.c |4 ++--
 kexec/kexec.h  |2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

--- a/kexec/arch/i386/crashdump-x86.c
+++ b/kexec/arch/i386/crashdump-x86.c
@@ -1017,24 +1017,17 @@ int load_crashdump_segments(struct kexec
return 0;
 }
 
-int get_max_crash_kernel_limit(uint64_t *start, uint64_t *end)
+/* On x86, the kernel may make a low reservation in addition to the
+ * normal reservation. However, the kernel refuses to load the panic
+ * kernel to low memory, so always choose the highest range.
+ */
+int get_crash_kernel_load_range(uint64_t *start, uint64_t *end)
 {
-   int i, idx = -1;
-   unsigned long sz_max = 0, sz;
-
if (!crash_reserved_mem_nr)
return -1;
 
-   for (i = crash_reserved_mem_nr - 1; i >= 0; i--) {
-   sz = crash_reserved_mem[i].end - crash_reserved_mem[i].start +1;
-   if (sz <= sz_max)
-   continue;
-   sz_max = sz;
-   idx = i;
-   }
-
-   *start = crash_reserved_mem[idx].start;
-   *end = crash_reserved_mem[idx].end;
+   *start = crash_reserved_mem[crash_reserved_mem_nr - 1].start;
+   *end = crash_reserved_mem[crash_reserved_mem_nr - 1].end;
 
return 0;
 }
--- a/kexec/arch/i386/kexec-x86-common.c
+++ b/kexec/arch/i386/kexec-x86-common.c
@@ -361,9 +361,9 @@ int get_memory_ranges(struct memory_rang
!(kexec_flags & KEXEC_PRESERVE_CONTEXT)) {
uint64_t start, end;
 
-   ret = get_max_crash_kernel_limit(, );
+   ret = get_crash_kernel_load_range(, );
if (ret != 0) {
-   fprintf(stderr, "get_max_crash_kernel_limit failed.\n");
+   fprintf(stderr, "get_crash_kernel_load_range 
failed.\n");
return -1;
}
 
--- a/kexec/kexec.h
+++ b/kexec/kexec.h
@@ -286,7 +286,7 @@ int arch_process_options(int argc, char
 int arch_compat_trampoline(struct kexec_info *info);
 void 

commit kexec-tools for openSUSE:Factory

2015-07-14 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2015-07-14 17:20:31

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2015-04-03 
14:33:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2015-07-14 17:20:33.0 +0200
@@ -1,0 +2,11 @@
+Fri Jun 26 07:33:16 UTC 2015 - ptesa...@suse.cz
+
+- Upgrade to kexec-2.0.10: This is a feature release coinciding
+  with the release of the v4.1 Linux Kernel.
+- Refreshed patches:
+  * kexec-tools-xen-static.patch
+  * kexec-tools-xen-balloon-up.patch
+- Dropped patches (now upstream):
+  * kexec-tools-callback-function-proto.patch
+
+---

Old:

  kexec-tools-2.0.9.tar.xz
  kexec-tools-callback-function-proto.patch

New:

  kexec-tools-2.0.10.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.SdYEqZ/_old  2015-07-14 17:20:34.0 +0200
+++ /var/tmp/diff_new_pack.SdYEqZ/_new  2015-07-14 17:20:34.0 +0200
@@ -26,7 +26,7 @@
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
-Version:2.0.9
+Version:2.0.10
 Release:0
 Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader
@@ -38,7 +38,6 @@
 Patch3: %{name}-disable-test.patch
 Patch4: %{name}-enable-aarch64.patch
 Patch5: %{name}-enable-aarch64-fixup.patch
-Patch6: %{name}-callback-function-proto.patch
 
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -65,7 +64,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 # disable as-needed

++ kexec-tools-2.0.9.tar.xz - kexec-tools-2.0.10.tar.xz ++
 2192 lines of diff (skipped)
retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/kexec-tools-2.0.9/configure.ac new/kexec-tools-2.0.10/configure.ac
--- old/kexec-tools-2.0.9/configure.ac  2015-02-09 06:31:19.0 +0100
+++ new/kexec-tools-2.0.10/configure.ac 2015-06-25 12:09:23.0 +0200
@@ -4,10 +4,11 @@
 dnl 
 
 dnl ---Required
-AC_INIT(kexec-tools, 2.0.9)
+AC_INIT(kexec-tools, 2.0.10)
 AC_CONFIG_AUX_DIR(./config)
 AC_CONFIG_HEADERS([include/config.h])
 AC_LANG(C)
+AC_PROG_CC
 
 AC_DEFINE_UNQUOTED(PACKAGE_DATE, `date '+%d %B %Y'`,
[Define to the release date of this package])
@@ -97,9 +98,6 @@
 
 dnl ---Programs
 dnl To specify a different compiler, just 'export CC=/path/to/compiler'
-
-AC_PROG_CC
-
 if test ${build} != ${host} ; then
AC_CHECK_PROGS(BUILD_CC, [${build_alias}-gcc ${build}-gcc gcc])
 else
@@ -152,22 +150,22 @@
 dnl See if I have a usable copy of zlib available
 if test $with_zlib = yes ; then
AC_CHECK_HEADER(zlib.h,
-   AC_CHECK_LIB(z, inflateInit_, ,
-   AC_MSG_NOTICE([zlib support disabled])))
+   [AC_CHECK_LIB(z, inflateInit_, ,
+   AC_MSG_NOTICE([zlib support disabled]))])
 fi
 
 dnl See if I have a usable copy of lzma available
 if test $with_lzma = yes ; then
AC_CHECK_HEADER(lzma.h,
-   AC_CHECK_LIB(lzma, lzma_code, ,
-   AC_MSG_NOTICE([lzma support disabled])))
+   [AC_CHECK_LIB(lzma, lzma_code, ,
+   AC_MSG_NOTICE([lzma support disabled]))])
 fi
 
 dnl find Xen control stack libraries
 if test $with_xen = yes ; then
AC_CHECK_HEADER(xenctrl.h,
-   AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
-   AC_MSG_NOTICE([Xen support disabled])))
+   [AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
+   AC_MSG_NOTICE([Xen support disabled]))])
 fi
 
 dnl ---Sanity checks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/kexec-tools-2.0.9/include/config.h new/kexec-tools-2.0.10/include/config.h
--- old/kexec-tools-2.0.9/include/config.h  2015-02-09 06:32:26.0 
+0100
+++ 

commit kexec-tools for openSUSE:Factory

2015-04-03 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2015-04-03 14:33:20

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2015-02-16 
17:31:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2015-04-03 14:33:21.0 +0200
@@ -1,0 +2,11 @@
+Sun Mar 29 01:53:16 UTC 2015 - crrodrig...@opensuse.org
+
+- kexec tools are included in the default initrd, we need 
+  to regenerate if this package changes.
+
+---
+Fri Mar 20 15:19:45 UTC 2015 - sch...@linux-m68k.org
+
+- Enable building on m68k
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.8a5DWF/_old  2015-04-03 14:33:22.0 +0200
+++ /var/tmp/diff_new_pack.8a5DWF/_new  2015-04-03 14:33:22.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -50,7 +50,7 @@
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
-ExclusiveArch:  ppc64le aarch64 %ix86 x86_64 ia64 ppc ppc64 s390 s390x %arm sh 
mips mipsel
+ExclusiveArch:  ppc64le aarch64 %ix86 x86_64 ia64 ppc ppc64 s390 s390x %arm sh 
mips mipsel m68k
 
 %description
 Kexec is a user space utility for loading another kernel and asking the
@@ -103,6 +103,7 @@
 
 %post
 %service_add_post kexec-load.service
+%{?regenerate_initrd_post}
 
 %postun
 %service_del_postun kexec-load.service
@@ -113,6 +114,9 @@
 %preun
 %service_del_preun kexec-load.service
 
+%posttrans
+%{?regenerate_initrd_posttrans}
+
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING News TODO doc




commit kexec-tools for openSUSE:Factory

2015-02-16 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2015-02-16 15:24:49

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2015-01-15 
15:58:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2015-02-16 17:31:07.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb 13 17:42:58 UTC 2015 - ptesa...@suse.cz
+
+- Upgrade to kexec-2.0.9: This is a bug-fix release coinciding with
+  the release of the v3.19 Linux Kernel.
+
+---

Old:

  kexec-tools-2.0.8.tar.xz

New:

  kexec-tools-2.0.9.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.bEjMuE/_old  2015-02-16 17:31:07.0 +0100
+++ /var/tmp/diff_new_pack.bEjMuE/_new  2015-02-16 17:31:07.0 +0100
@@ -26,7 +26,7 @@
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
-Version:2.0.8
+Version:2.0.9
 Release:0
 Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader

++ kexec-tools-2.0.8.tar.xz - kexec-tools-2.0.9.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kexec-tools-2.0.8/configure 
new/kexec-tools-2.0.9/configure
--- old/kexec-tools-2.0.8/configure 2014-10-08 07:17:01.0 +0200
+++ new/kexec-tools-2.0.9/configure 2015-02-09 06:31:38.0 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for kexec-tools 2.0.8.
+# Generated by GNU Autoconf 2.69 for kexec-tools 2.0.9.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='kexec-tools'
 PACKAGE_TARNAME='kexec-tools'
-PACKAGE_VERSION='2.0.8'
-PACKAGE_STRING='kexec-tools 2.0.8'
+PACKAGE_VERSION='2.0.9'
+PACKAGE_STRING='kexec-tools 2.0.9'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1268,7 +1268,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures kexec-tools 2.0.8 to adapt to many kinds of systems.
+\`configure' configures kexec-tools 2.0.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1334,7 +1334,7 @@
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of kexec-tools 2.0.8:;;
+ short | recursive ) echo Configuration of kexec-tools 2.0.9:;;
esac
   cat \_ACEOF
 
@@ -1424,7 +1424,7 @@
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-kexec-tools configure 2.0.8
+kexec-tools configure 2.0.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1676,7 +1676,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by kexec-tools $as_me 2.0.8, which was
+It was created by kexec-tools $as_me 2.0.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5332,7 +5332,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log=
-This file was extended by kexec-tools $as_me 2.0.8, which was
+This file was extended by kexec-tools $as_me 2.0.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -5394,7 +5394,7 @@
 cat $CONFIG_STATUS _ACEOF || ac_write_fail=1
 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; 
s/[\\\`\$]//g'`
 ac_cs_version=\\
-kexec-tools config.status 2.0.8
+kexec-tools config.status 2.0.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\\$ac_cs_config\\
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kexec-tools-2.0.8/configure.ac 
new/kexec-tools-2.0.9/configure.ac
--- old/kexec-tools-2.0.8/configure.ac  2014-10-08 07:16:51.0 +0200
+++ new/kexec-tools-2.0.9/configure.ac  2015-02-09 06:31:19.0 +0100
@@ -4,7 +4,7 @@
 dnl 
 
 dnl ---Required
-AC_INIT(kexec-tools, 2.0.8)
+AC_INIT(kexec-tools, 2.0.9)
 AC_CONFIG_AUX_DIR(./config)
 AC_CONFIG_HEADERS([include/config.h])
 AC_LANG(C)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 

commit kexec-tools for openSUSE:Factory

2015-01-15 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2015-01-15 15:58:13

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-10-11 
19:25:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2015-01-15 15:58:18.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan  9 02:13:57 UTC 2015 - to...@suse.com
+
+- Fix x86 callback prototypes (bnc#905090)
+  Add patch: kexec-tools-callback-function-proto.patch
+
+---

New:

  kexec-tools-callback-function-proto.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.SeIo5p/_old  2015-01-15 15:58:19.0 +0100
+++ /var/tmp/diff_new_pack.SeIo5p/_new  2015-01-15 15:58:19.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,7 +37,8 @@
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
 Patch4: %{name}-enable-aarch64.patch
-Patch6: %{name}-enable-aarch64-fixup.patch
+Patch5: %{name}-enable-aarch64-fixup.patch
+Patch6: %{name}-callback-function-proto.patch
 
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -63,6 +64,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p1
 
 %build

++ kexec-tools-callback-function-proto.patch ++
From: Bernhard Übelacker bernha...@vr-web.de
Subject: Fix callback functions given to kexec_iomem_for_each_line
References: https://bugs.debian.org/771671
References: bnc#905090
Upstream: pending

--- kexec-tools-2.0.7.orig/kexec/arch/i386/crashdump-x86.c
+++ kexec-tools-2.0.7/kexec/arch/i386/crashdump-x86.c
@@ -1041,8 +1041,8 @@ int get_max_crash_kernel_limit(uint64_t
 
 static int crashkernel_mem_callback(void *UNUSED(data), int nr,
   char *UNUSED(str),
-  unsigned long base,
-  unsigned long length)
+  unsigned long long base,
+  unsigned long long length)
 {
if (nr = CRASH_RESERVED_MEM_NR)
return 1;
--- kexec-tools-2.0.7.orig/kexec/arch/sh/crashdump-sh.c
+++ kexec-tools-2.0.7/kexec/arch/sh/crashdump-sh.c
@@ -34,8 +34,8 @@ static struct memory_range crash_memory_
 static int crash_sh_range_nr;
 static int crash_sh_memory_range_callback(void *UNUSED(data), int UNUSED(nr),
  char *str,
- unsigned long base,
- unsigned long length)
+ unsigned long long base,
+ unsigned long long length)
 {
 
struct memory_range *range = crash_memory_range;
--- kexec-tools-2.0.7.orig/kexec/arch/sh/kexec-sh.c
+++ kexec-tools-2.0.7/kexec/arch/sh/kexec-sh.c
@@ -24,8 +24,8 @@ static struct memory_range memory_range[
 
 static int kexec_sh_memory_range_callback(void *UNUSED(data), int nr,
  char *UNUSED(str),
- unsigned long base,
- unsigned long length)
+ unsigned long long base,
+ unsigned long long length)
 {
if (nr  MAX_MEMORY_RANGES) {
memory_range[nr].start = base;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2014-10-11 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-10-11 19:25:03

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-08-28 
10:01:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-10-11 19:25:09.0 +0200
@@ -1,0 +2,13 @@
+Thu Oct  9 16:38:05 UTC 2014 - ptesa...@suse.cz
+
+- Upgrade to kexec-2.0.8
+- Dropped patches (now upstream):
+  o kexec-tools-xen-e820-redefinition.patch
+  o kexec-tools-i386-bzimage_efi.patch
+  o kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch
+  o kexec-tools-zero-efi-info.patch
+  o kexec-tools-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch
+  o 
kexec-tools-ppc64-purgatory-device-tree-values-should-be-read-stored-in-big-endian.patch
+  o kexec-tools-kdump-fix-elf-header-endianess.patch
+
+---

Old:

  kexec-tools-2.0.5.tar.xz
  kexec-tools-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch
  kexec-tools-i386-bzimage_efi.patch
  kexec-tools-kdump-fix-elf-header-endianess.patch
  
kexec-tools-ppc64-purgatory-device-tree-values-should-be-read-stored-in-big-endian.patch
  kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch
  kexec-tools-xen-e820-redefinition.patch
  kexec-tools-zero-efi-info.patch

New:

  kexec-tools-2.0.8.tar.xz



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.JQPhFC/_old  2014-10-11 19:25:10.0 +0200
+++ /var/tmp/diff_new_pack.JQPhFC/_new  2014-10-11 19:25:10.0 +0200
@@ -26,7 +26,7 @@
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
-Version:2.0.5
+Version:2.0.8
 Release:0
 Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader
@@ -37,14 +37,7 @@
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
 Patch4: %{name}-enable-aarch64.patch
-Patch5: %{name}-xen-e820-redefinition.patch
 Patch6: %{name}-enable-aarch64-fixup.patch
-Patch7: %{name}-i386-bzimage_efi.patch
-Patch8: %{name}-ppc64-purgatory-disabling-gcc-stack-protection.patch
-Patch9: %{name}-zero-efi-info.patch
-Patch10:
%{name}-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch
-Patch11:
%{name}-ppc64-purgatory-device-tree-values-should-be-read-stored-in-big-endian.patch
-Patch12:%{name}-kdump-fix-elf-header-endianess.patch
 
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -70,14 +63,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 %build
 # disable as-needed

++ kexec-tools-2.0.5.tar.xz - kexec-tools-2.0.8.tar.xz ++
 5774 lines of diff (skipped)

++ kexec-tools-xen-balloon-up.patch ++
--- /var/tmp/diff_new_pack.JQPhFC/_old  2014-10-11 19:25:10.0 +0200
+++ /var/tmp/diff_new_pack.JQPhFC/_new  2014-10-11 19:25:10.0 +0200
@@ -179,15 +179,15 @@
unsigned long machine = elf_info-machine;
 --- a/kexec/kexec.c
 +++ b/kexec/kexec.c
-@@ -1071,6 +1071,7 @@ int main(int argc, char *argv[])
+@@ -1173,6 +1173,7 @@ int main(int argc, char *argv[])
int do_shutdown = 1;
int do_sync = 1;
int do_ifdown = 0;
 +  int do_balloon = 0;
int do_unload = 0;
int do_reuse_initrd = 0;
-   void *entry = 0;
-@@ -1105,6 +1106,7 @@ int main(int argc, char *argv[])
+   int do_kexec_file_syscall = 0;
+@@ -1227,6 +1228,7 @@ int main(int argc, char *argv[])
do_shutdown = 0;
do_sync = 1;
do_ifdown = 1;
@@ -195,7 +195,7 @@
do_exec = 1;
break;
case OPT_LOAD:
-@@ -1123,6 +1125,7 @@ int main(int argc, char *argv[])
+@@ -1247,6 +1249,7 @@ int main(int argc, char *argv[])
do_shutdown = 0;
do_sync = 1;
do_ifdown = 1;
@@ -203,7 +203,7 @@
do_exec = 1;
break;
case OPT_LOAD_JUMP_BACK_HELPER:
-@@ -1246,6 +1249,9 @@ int main(int argc, char *argv[])
+@@ -1384,6 +1387,9 @@ int main(int argc, char *argv[])
if ((result == 0)  do_ifdown) {
  

commit kexec-tools for openSUSE:Factory

2014-08-28 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-08-28 10:01:52

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-08-20 
17:53:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-08-28 10:01:54.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 19 21:06:29 UTC 2014 - to...@suse.com
+
+- custom autoconf action was no longer setting HAVE_LIBXENCTRL (bnc#886873)
+
+---



Other differences:
--
++ kexec-tools-xen-static.patch ++
--- /var/tmp/diff_new_pack.ejgQ6I/_old  2014-08-28 10:01:55.0 +0200
+++ /var/tmp/diff_new_pack.ejgQ6I/_new  2014-08-28 10:01:55.0 +0200
@@ -20,7 +20,7 @@
AC_CHECK_HEADER(xenctrl.h,
 -  AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
 +  AC_CHECK_LIB(xenctrl, xc_kexec_load,
-+  [[LIBS=$LIBS -Wl,-Bstatic -lxenctrl -Wl,-Bdynamic]]
++  [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) 
[[LIBS=-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS]]],
AC_MSG_NOTICE([Xen support disabled])))
  fi
  

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2014-08-20 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-08-20 17:52:56

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-07-28 
16:11:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-08-20 17:53:12.0 +0200
@@ -1,0 +2,6 @@
+Fri Aug 15 21:34:43 UTC 2014 - to...@suse.com
+
+- Do not package kdump.8 as it is only a placeholder, full man page is provided
+  by kdump package (bnc#892090)
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.2I1RfP/_old  2014-08-20 17:53:13.0 +0200
+++ /var/tmp/diff_new_pack.2I1RfP/_new  2014-08-20 17:53:13.0 +0200
@@ -98,9 +98,8 @@
 
 %install
 %makeinstall
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install -c -m 0644 kexec-bootloader.8 $RPM_BUILD_ROOT%{_mandir}/man8
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/kdump.8
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2014-07-28 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-07-28 16:11:20

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-07-25 
12:27:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-07-28 16:11:21.0 +0200
@@ -1,0 +2,6 @@
+Sat Jul 26 14:53:22 UTC 2014 - to...@suse.com
+
+- Fix ELF header endianess for ppc64le kdump (bnc#888150)
+  New patch: kexec-tools-kdump-fix-elf-header-endianess.patch
+
+---

New:

  kexec-tools-kdump-fix-elf-header-endianess.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.ahuEQl/_old  2014-07-28 16:11:22.0 +0200
+++ /var/tmp/diff_new_pack.ahuEQl/_new  2014-07-28 16:11:22.0 +0200
@@ -44,6 +44,8 @@
 Patch9: %{name}-zero-efi-info.patch
 Patch10:
%{name}-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch
 Patch11:
%{name}-ppc64-purgatory-device-tree-values-should-be-read-stored-in-big-endian.patch
+Patch12:%{name}-kdump-fix-elf-header-endianess.patch
+
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -75,6 +77,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 # disable as-needed

++ kexec-tools-kdump-fix-elf-header-endianess.patch ++
From: Laurent Dufour lduf...@linux.vnet.ibm.com
Subject: kdump fix ELF header endianess
References: bnc#888150
Signed-off-by: Tony Jones to...@suse.de
Upstream: pending

The ELF header created among the loading of the kdump kernel should be
flagged using the current endianess and not always as big endian.

Without this patch the data exposed in /proc/vmcore are not readable when
running in LE mode.

Signed-off-by: Laurent Dufour lduf...@linux.vnet.ibm.com
---
 kexec/arch/ppc64/crashdump-ppc64.c |4 
 1 file changed, 4 insertions(+)

--- a/kexec/arch/ppc64/crashdump-ppc64.c
+++ b/kexec/arch/ppc64/crashdump-ppc64.c
@@ -38,7 +38,11 @@
 static struct crash_elf_info elf_info64 =
 {
class: ELFCLASS64,
+#if BYTE_ORDER == LITTLE_ENDIAN
+   data: ELFDATA2LSB,
+#else
data: ELFDATA2MSB,
+#endif
machine: EM_PPC64,
page_offset: PAGE_OFFSET,
lowmem_limit: MAXMEM,
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2014-07-25 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-07-25 12:27:28

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-05-02 
19:21:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-07-25 12:27:51.0 +0200
@@ -1,0 +2,6 @@
+Sun Jul 20 19:49:17 UTC 2014 - p.drou...@gmail.com
+
+- Remove insserv dependency; the package doesn't provide any sysvinit
+  script
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.Rf22px/_old  2014-07-25 12:27:52.0 +0200
+++ /var/tmp/diff_new_pack.Rf22px/_new  2014-07-25 12:27:52.0 +0200
@@ -22,7 +22,7 @@
 BuildRequires:  glibc-devel-64bit
 %endif
 Requires:   perl-Bootloader
-PreReq: %insserv_prereq %fillup_prereq
+PreReq: %fillup_prereq
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2014-05-02 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-05-02 19:21:29

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-03-31 
20:43:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-05-02 19:21:33.0 +0200
@@ -1,0 +2,16 @@
+Thu May  1 17:47:36 UTC 2014 - to...@suse.com
+
+- Device tree values should be big endian for ppc64le (bnc#875485)
+  New patch: 
kexec-tools-ppc64-purgatory-device-tree-values-should-be-read-stored-in-big-endian.patch
+
+---
+Fri Apr 11 18:08:41 UTC 2014 - to...@suse.com
+
+- Expose flattened device trees (ppc64le) to new kexec'd kernel in Big Endian
+  format (bnc#873169)
+New patch: 
kexec-tools-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch
+- Update patch headers to reflect upstream commit id's:
+Change patch: 
kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch
+Change patch: kexec-tools-zero-efi-info.patch
+
+---
@@ -5,2 +21,2 @@
-  New patch: kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch_
-- Disable erroneous (efi memory descriptor version message (bnc#867785c5)
+  New patch: kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch
+- Disable erroneous (efi memory descriptor version) message (bnc#867785c5)

New:

  kexec-tools-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch
  
kexec-tools-ppc64-purgatory-device-tree-values-should-be-read-stored-in-big-endian.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.LOv7gG/_old  2014-05-02 19:21:34.0 +0200
+++ /var/tmp/diff_new_pack.LOv7gG/_new  2014-05-02 19:21:34.0 +0200
@@ -42,6 +42,8 @@
 Patch7: %{name}-i386-bzimage_efi.patch
 Patch8: %{name}-ppc64-purgatory-disabling-gcc-stack-protection.patch
 Patch9: %{name}-zero-efi-info.patch
+Patch10:
%{name}-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch
+Patch11:
%{name}-ppc64-purgatory-device-tree-values-should-be-read-stored-in-big-endian.patch
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -71,6 +73,8 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 # disable as-needed

++ kexec-tools-fs2dt-fix-endianess-issue-with-initrd-base-and-size.patch 
++
From: Laurent Dufour lduf...@linux.vnet.ibm.com
Subject: [PATCH] kexec/fs2dt : Fix endianess issue with initrd base and size
Date: Fri, 11 Apr 2014 12:10:30 +0200
Git-commit: db3c32babc5279816344be8210ca91a64331f0fe
References: bnc#873169
Signed-off-by: Tony Jones to...@suse.de

The initrd values exposed in the device tree of the kexeced kernel must be
encoded in Big Endian format.

Without this patch, kexeced LE kernel are expected to panic when dealing
with the initrd image.

Signed-off-by: Laurent Dufour lduf...@linux.vnet.ibm.com
---
 kexec/fs2dt.c |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c
index 5e6b98d..2a90979 100644
--- a/kexec/fs2dt.c
+++ b/kexec/fs2dt.c
@@ -531,7 +531,7 @@ static void putnode(void)
/* Add initrd entries to the second kernel */
if (initrd_base  initrd_size  !strcmp(basename,chosen/)) {
int len = 8;
-   unsigned long long initrd_end;
+   uint64_t bevalue;
 
dt_reserve(dt, 12); /* both props, of 6 words ea. */
*dt++ = cpu_to_be32(3);
@@ -539,7 +539,8 @@ static void putnode(void)
*dt++ = cpu_to_be32(propnum(linux,initrd-start));
pad_structure_block(len);
 
-   memcpy(dt,initrd_base,len);
+   bevalue = cpu_to_be64(initrd_base);
+   memcpy(dt, bevalue, len);
dt += (len + 3)/4;
 
len = 8;
@@ -547,10 +548,10 @@ static void putnode(void)
*dt++ = cpu_to_be32(len);
*dt++ = cpu_to_be32(propnum(linux,initrd-end));
 
-   initrd_end = initrd_base + initrd_size;
+   bevalue = cpu_to_be64(initrd_base + initrd_size);
pad_structure_block(len);
 
-   memcpy(dt,initrd_end,len);
+   memcpy(dt, bevalue, len);
dt += (len + 3)/4;
 
reserve(initrd_base, initrd_size);
++ 

commit kexec-tools for openSUSE:Factory

2014-03-31 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-03-31 20:43:19

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-02-22 
20:44:32.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-03-31 20:43:30.0 +0200
@@ -1,0 +2,8 @@
+Tue Mar 18 16:45:14 UTC 2014 - to...@suse.com
+
+- Disable stack protector for ppc64le (bnc#869161)
+  New patch: kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch_
+- Disable erroneous (efi memory descriptor version message (bnc#867785c5)
+  New patch: kexec-tools-zero-efi-info.patch
+
+---

New:

  kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch
  kexec-tools-zero-efi-info.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.OaF4Mc/_old  2014-03-31 20:43:31.0 +0200
+++ /var/tmp/diff_new_pack.OaF4Mc/_new  2014-03-31 20:43:31.0 +0200
@@ -40,6 +40,8 @@
 Patch5: %{name}-xen-e820-redefinition.patch
 Patch6: %{name}-enable-aarch64-fixup.patch
 Patch7: %{name}-i386-bzimage_efi.patch
+Patch8: %{name}-ppc64-purgatory-disabling-gcc-stack-protection.patch
+Patch9: %{name}-zero-efi-info.patch
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -67,12 +69,14 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 # disable as-needed
 export SUSE_ASNEEDED=0
 %{?suse_update_config -f}
-%ifarch ia64
+%ifarch ia64 ppc64le
 RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//')
 %endif
 autoreconf -f

++ kexec-tools-ppc64-purgatory-disabling-gcc-stack-protection.patch ++
From: Laurent Dufour lduf...@linux.vnet.ibm.com
Date: Tue, 25 Mar 2014 10:55:53 +0100
Subject: [PATCH] ppc64/purgatory: Disabling GCC's stack protection

Some Linux distributions, like Suse, are turning on the GCC's stack
protection mechanism by default (-fstack-protector). When building the
purgatory with this option, this leads to link issues that are revealed at
runtime when the purgatory is loaded because symbols like __stack_chk_fail
are unresolved.

This patch forces this stack protection mechanism to be turned off when
building the purgatory on ppc64 BE and LE.

Signed-off-by: Laurent Dufour lduf...@linux.vnet.ibm.com
---
 purgatory/arch/ppc64/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/purgatory/arch/ppc64/Makefile b/purgatory/arch/ppc64/Makefile
index 31076e9..712e2b1 100644
--- a/purgatory/arch/ppc64/Makefile
+++ b/purgatory/arch/ppc64/Makefile
@@ -9,7 +9,7 @@ ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/console-ppc64.c
 ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/crashdump_backup.c
 ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/misc.S
 
-ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float
+ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float -fno-stack-protector
 ppc64_PURGATORY_EXTRA_ASFLAGS += -m64
 ifeq ($(SUBARCH),BE)
ppc64_PURGATORY_EXTRA_LDFLAGS += -melf64ppc
++ kexec-tools-zero-efi-info.patch ++
From: Tony Jones to...@suse.de
Subject: Disable erroneous efi memory descriptor version message 
References: bnc#867785c5
Upstream: not yet
 
On non-EFI systems, efi_info section of boot_params is zero filled resulting 
in an erroneous message from kexec regarding efi memory descriptor version.

Caused by commit: e1ffc9e9a0769e1f54185003102e9bec428b84e8 Passing efi related 
data via setup_data

# od -j 448 -N 32 -v -x /sys/kernel/boot_params/data 
700        
720        
740

# kexec -l --reuse-cmdline --initrd=/boot/initrd-`uname -r` 
/boot/vmlinuz-`uname -r`
efi memory descriptor version 0 is not supported!

---
 kexec/arch/i386/x86-linux-setup.c |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- a/kexec/arch/i386/x86-linux-setup.c
+++ b/kexec/arch/i386/x86-linux-setup.c
@@ -687,17 +687,25 @@ static void setup_efi_info(struct kexec_
ret = get_bootparam(real_mode-efi_info, offset, 32);
if (ret)
return;
+   if (((struct efi_info *)real_mode-efi_info)-efi_memmap_size == 0)
+   /* zero filled efi_info */
+   goto out;
desc_version = get_efi_mem_desc_version(real_mode);
if (desc_version != 1) {
fprintf(stderr,
 

commit kexec-tools for openSUSE:Factory

2014-02-22 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-02-22 20:44:30

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-02-11 
11:39:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-02-22 20:44:32.0 +0100
@@ -1,0 +2,11 @@
+Thu Feb  6 01:14:24 UTC 2014 - to...@suse.com
+
+- Drop obsolete /etc/init.d/kexec (bnc# 862143).
+- Handle btrfs root subvolume (bnc# 862143c35)
+- Create kexec-load.service (bnc# 862143)
+- Update kexec-bootloader manpage (document reboot using kexec)
+- Remove old 11.1 conditionals
+- Update kexec-tools-i386-bzimage_efi.patch and
+  kexec-tools-xen-e820-redefinition.patch with upstream commit ids
+
+---

Old:

  kexec.init

New:

  kexec-load.service



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.GpO9ac/_old  2014-02-22 20:44:33.0 +0100
+++ /var/tmp/diff_new_pack.GpO9ac/_new  2014-02-22 20:44:33.0 +0100
@@ -31,7 +31,7 @@
 Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8.txt
-Source3:kexec.init
+Source3:kexec-load.service
 Source4:%{name}-rpmlintrc
 Patch1: %{name}-xen-static.patch
 Patch2: %{name}-xen-balloon-up.patch
@@ -43,12 +43,10 @@
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
-BuildRequires:  automake
-BuildRequires:  zlib-devel
-%if 0%{?suse_version} = 1110
 BuildRequires:  asciidoc
+BuildRequires:  automake
 BuildRequires:  libxslt
-%endif
+BuildRequires:  zlib-devel
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
@@ -85,24 +83,17 @@
 %configure
 %endif
 make
-cp %{S:1} .
-cp %{S:2} .
-cp %{S:3} .
-%if 0%{?suse_version} = 1110
-a2x -d manpage -f manpage kexec-bootloader.8.txt
-%endif
+a2x -D . -d manpage -f manpage %{S:2}
 
 %install
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
 install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8
-%if 0%{?suse_version} = 1110
 install -c -m 0644 kexec-bootloader.8 $RPM_BUILD_ROOT%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m 0755 kexec-bootloader $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
-install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
-%endif
+install -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+install -m644 %{S:3} $RPM_BUILD_ROOT%{_unitdir}
 #UsrMerge
 mkdir -p $RPM_BUILD_ROOT/sbin
 ln -s %{_sbindir}/kdump $RPM_BUILD_ROOT/sbin
@@ -111,17 +102,18 @@
 
 %clean
 [ $RPM_BUILD_ROOT != / ]  rm -rf $RPM_BUILD_ROOT
-%if 0%{?suse_version} = 1110
 
 %post
-%{fillup_and_insserv -n kexec kexec}
-%endif
-#
+%service_add_post kexec-load.service
 
 %postun
-%if 0%{?suse_version} = 1110
-%insserv_cleanup
-%endif
+%service_del_postun kexec-load.service
+
+%pre
+%service_add_pre kexec-load.service
+
+%preun
+%service_del_preun kexec-load.service
 
 %files
 %defattr(-, root, root)
@@ -131,9 +123,7 @@
 /sbin/*
 #EndUsrMerge
 %{_sbindir}/*
-%if 0%{?suse_version} = 1110
 %{_sbindir}/kexec-bootloader
-%config /etc/init.d/kexec
-%endif
+%{_unitdir}/kexec-load.service
 
 %changelog

++ kexec-bootloader ++
--- /var/tmp/diff_new_pack.GpO9ac/_old  2014-02-22 20:44:33.0 +0100
+++ /var/tmp/diff_new_pack.GpO9ac/_new  2014-02-22 20:44:33.0 +0100
@@ -149,11 +149,22 @@
 exit(1);
 }
 
+my $image=$section-{image};
+my $initrd=$section-{initrd};
+
+# handle btfs /@ - /
+if (substr ($image, 0, 3) eq /@/) {
+   $image = substr ($image, 2);
+}
+if ($initrd  substr ($initrd, 0, 3) eq /@/) {
+   $initrd = substr ($initrd, 2);
+}
+
 if ($debug) {
 print Type   :  . $section-{type}.\n;
 print Name   :  . $section-{name}.\n;
-print Image  :  . $section-{image}.\n;
-print Initrd :  . $section-{initrd}.\n;
+print Image  :  . $image.\n;
+print Initrd :  . $initrd.\n;
 print VGA:  . $section-{vgamode}.\n;
 print Append :  . $section-{append}.\n;
 print Root   :  . $section-{root}.\n;
@@ -164,15 +175,16 @@
 exit(1);
 }
 
+
 # check if the image exists
-if (! -f $section-{image}) {
-print STDERR Image ' . $section-{image} . ' does not exist.\n;
+if (! -f $image) {
+print STDERR Image ' . $image . ' does not exist.\n;
 exit(1);
 }
 
 # check if the initrd exists
-if 

commit kexec-tools for openSUSE:Factory

2014-02-11 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-02-11 11:39:32

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-01-15 
19:35:50.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-02-11 11:39:33.0 +0100
@@ -1,0 +2,31 @@
+Wed Feb  5 17:53:56 UTC 2014 - to...@suse.com
+
+- Update to version 2.0.5
+  Drop patch 'device-tree-buffer-overflows.patch' (upstream)
+  Drop patch '0001-kexec-fs2dt-fix-endianess-conversion.patch' (upstream)
+- Rename aarch64 patch to 'kexec-tools-enable-aarch64.patch' and rebase to 
+  version from Linaro git.
+- Add 'kexec-tools-enable-aarch64-fixup.patch' to solve arm libfdt breakage
+  with Linaro patch.
+- Enable ppc64le
+- Refresh patches for context.
+- Add following patches (pending upstream):
+  'kexec-tools-i386-bzimage_efi.patch' to fix i386 breakage.
+  'kexec-tools-xen-e820-redefinition.patch' to fix xen/820 breakage.
+
+---
+Tue Feb  4 13:00:37 UTC 2014 - dmuel...@suse.com
+
+- add 0001-kexec-fs2dt-fix-endianess-conversion.patch:
+  * fix ppc64 and arm
+- refresh device-tree-buffer-overflows.patch with the version
+  that went upstream
+
+---
+Mon Feb  3 14:17:09 UTC 2014 - dmuel...@suse.com
+
+- enable build for arm / aarch64 
+- add kexec-aarch64.patch
+- add device-tree-buffer-overflows.patch
+
+---

Old:

  kexec-tools-2.0.4-rpmlintrc
  kexec-tools-2.0.4.tar.bz2

New:

  kexec-tools-2.0.5.tar.xz
  kexec-tools-enable-aarch64-fixup.patch
  kexec-tools-enable-aarch64.patch
  kexec-tools-i386-bzimage_efi.patch
  kexec-tools-rpmlintrc
  kexec-tools-xen-e820-redefinition.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.67kXbX/_old  2014-02-11 11:39:34.0 +0100
+++ /var/tmp/diff_new_pack.67kXbX/_new  2014-02-11 11:39:34.0 +0100
@@ -26,16 +26,20 @@
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
-Version:2.0.4
+Version:2.0.5
 Release:0
-Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
+Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8.txt
 Source3:kexec.init
-Source4:%{name}-%{version}-rpmlintrc
+Source4:%{name}-rpmlintrc
 Patch1: %{name}-xen-static.patch
 Patch2: %{name}-xen-balloon-up.patch
 Patch3: %{name}-disable-test.patch
+Patch4: %{name}-enable-aarch64.patch
+Patch5: %{name}-xen-e820-redefinition.patch
+Patch6: %{name}-enable-aarch64-fixup.patch
+Patch7: %{name}-i386-bzimage_efi.patch
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -48,7 +52,7 @@
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
-ExclusiveArch:  %ix86 x86_64 ia64 ppc ppc64 s390 s390x arm sh mips mipsel
+ExclusiveArch:  ppc64le aarch64 %ix86 x86_64 ia64 ppc ppc64 s390 s390x %arm sh 
mips mipsel
 
 %description
 Kexec is a user space utility for loading another kernel and asking the
@@ -61,6 +65,10 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 # disable as-needed
@@ -71,14 +79,12 @@
 %endif
 autoreconf -f
 CFLAGS=$RPM_OPT_FLAGS BUILD_CFLAGS=$RPM_OPT_FLAGS \
-%configure \
 %ifarch ppc
---host=powerpc64-suse-linux \
---build=powerpc64-suse-linux \
+%configure --host=powerpc64-suse-linux --build=powerpc64-suse-linux 
+%else
+%configure
 %endif
-#  --libdir=/%_lib || true
 make
-# manpage
 cp %{S:1} .
 cp %{S:2} .
 cp %{S:3} .
@@ -111,7 +117,6 @@
 %{fillup_and_insserv -n kexec kexec}
 %endif
 #
-#%preun
 
 %postun
 %if 0%{?suse_version} = 1110

++ kexec-tools-enable-aarch64-fixup.patch ++
From: Tony Jones to...@suse.de
Subject: fixup aarch64 libfdt
Upstream: no

LIBS change had global scope,  fix.

---
 kexec/arch/arm64/Makefile |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- a/kexec/arch/arm64/Makefile
+++ b/kexec/arch/arm64/Makefile
@@ -2,9 +2,14 @@
 arm64_FS2DT += kexec/fs2dt.c
 arm64_FS2DT_INCLUDE += -include $(srcdir)/kexec/arch/arm64/kexec-arm64.h
 
+libfdt_SRCS += 

commit kexec-tools for openSUSE:Factory

2014-01-15 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-01-15 19:35:48

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2014-01-07 
14:36:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-01-15 19:35:50.0 +0100
@@ -1,0 +2,9 @@
+Thu Jan  9 21:04:46 UTC 2014 - to...@suse.com
+
+- Update to version 2.0.4
+- Drop patches (mainline):
+   kexec-tools-fix-makefile-binaries.patch (aaedd532)
+   kexec-tools-fix-strncat.patch (d5efc524)
+   kexec-tools-no-vga-output.patch (f1facd4b)
+
+---

Old:

  kexec-tools-2.0.3-rpmlintrc
  kexec-tools-2.0.3.tar.bz2
  kexec-tools-fix-makefile-binaries.patch
  kexec-tools-fix-strncat.patch
  kexec-tools-no-vga-output.patch

New:

  kexec-tools-2.0.4-rpmlintrc
  kexec-tools-2.0.4.tar.bz2



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.7eqfsq/_old  2014-01-15 19:35:51.0 +0100
+++ /var/tmp/diff_new_pack.7eqfsq/_new  2014-01-15 19:35:51.0 +0100
@@ -26,19 +26,16 @@
 Summary:Tools for fast kernel loading
 License:GPL-2.0+
 Group:  System/Kernel
-Version:2.0.3
+Version:2.0.4
 Release:0
 Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8.txt
 Source3:kexec.init
 Source4:%{name}-%{version}-rpmlintrc
-Patch0: %{name}-no-vga-output.patch
 Patch1: %{name}-xen-static.patch
-Patch2: %{name}-fix-strncat.patch
-Patch3: %{name}-xen-balloon-up.patch
-Patch4: %{name}-fix-makefile-binaries.patch
-Patch5: %{name}-disable-test.patch
+Patch2: %{name}-xen-balloon-up.patch
+Patch3: %{name}-disable-test.patch
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -61,12 +58,9 @@
 
 %prep
 %setup -q -n kexec-tools-%{version}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 # disable as-needed

++ kexec-tools-2.0.3-rpmlintrc - kexec-tools-2.0.4-rpmlintrc ++

++ kexec-tools-2.0.3.tar.bz2 - kexec-tools-2.0.4.tar.bz2 ++
 17036 lines of diff (skipped)

++ kexec-tools-disable-test.patch ++
--- /var/tmp/diff_new_pack.7eqfsq/_old  2014-01-15 19:35:51.0 +0100
+++ /var/tmp/diff_new_pack.7eqfsq/_new  2014-01-15 19:35:51.0 +0100
@@ -10,7 +10,7 @@
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -176,8 +176,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
+@@ -177,8 +177,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
  PGSRCS:=$(foreach s, $(GENERATED_SRCS), 
$(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
  
  MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)

++ kexec-tools-xen-balloon-up.patch ++
--- /var/tmp/diff_new_pack.7eqfsq/_old  2014-01-15 19:35:51.0 +0100
+++ /var/tmp/diff_new_pack.7eqfsq/_new  2014-01-15 19:35:51.0 +0100
@@ -9,10 +9,8 @@
  kexec/kexec.c |6 ++
  3 files changed, 119 insertions(+), 6 deletions(-)
 
-Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
-===
 kexec-tools-2.0.2.orig/kexec/crashdump-xen.c
-+++ kexec-tools-2.0.2/kexec/crashdump-xen.c
+--- a/kexec/crashdump-xen.c
 b/kexec/crashdump-xen.c
 @@ -8,6 +8,7 @@
  #include limits.h
  #include sys/types.h
@@ -42,7 +40,7 @@
  static jmp_buf xen_sigill_jmp;
  void xen_sigill_handler(int sig)
  {
-@@ -81,29 +93,118 @@ found:
+@@ -84,29 +96,118 @@ found:
return regs[0];
  }
  
@@ -167,7 +165,7 @@
  #endif
  
  /*
-@@ -122,6 +223,11 @@ int xen_present(void)
+@@ -125,6 +226,11 @@ int xen_present(void)
return is_dom0  0;
  }
  
@@ -179,11 +177,9 @@
  unsigned long xen_architecture(struct crash_elf_info *elf_info)
  {
unsigned long machine = elf_info-machine;
-Index: kexec-tools-2.0.2/kexec/crashdump.h
-===
 kexec-tools-2.0.2.orig/kexec/crashdump.h
-+++ kexec-tools-2.0.2/kexec/crashdump.h
-@@ -50,6 +50,7 @@ unsigned long phys_to_virt(struct crash_
+--- a/kexec/crashdump.h
 b/kexec/crashdump.h
+@@ -57,6 +57,7 @@ unsigned long phys_to_virt(struct crash_
   unsigned long paddr);
  
  int xen_present(void);
@@ -191,11 +187,9 @@
  unsigned long 

commit kexec-tools for openSUSE:Factory

2014-01-07 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2014-01-07 14:36:37

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2013-12-08 
19:27:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2014-01-07 14:36:38.0 +0100
@@ -1,0 +2,5 @@
+Sun Jan  5 08:06:01 UTC 2014 - co...@suse.com
+
+- xen 4.4 is exclusive to 64bit archs, so don't require it
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.827Bvu/_old  2014-01-07 14:36:38.0 +0100
+++ /var/tmp/diff_new_pack.827Bvu/_new  2014-01-07 14:36:38.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -48,7 +48,7 @@
 BuildRequires:  asciidoc
 BuildRequires:  libxslt
 %endif
-%ifarch %ix86 x86_64
+%ifarch x86_64
 BuildRequires:  xen-devel
 %endif
 ExclusiveArch:  %ix86 x86_64 ia64 ppc ppc64 s390 s390x arm sh mips mipsel
@@ -59,17 +59,6 @@
 kernel may be asked to start the loaded kernel on reboot, or to start
 the loaded kernel after it panics.
 
-
-
-Authors:
-
-Eric Biederman ebied...@xmission.com
-Albert Herranz
-Jesse Barnes jbar...@sgi.com
-Khalid Aziz khalid.a...@hp.com
-Hariprasad Nellitheertha h...@in.ibm.com
-Tim Deegan tj...@cl.cam.ac.uk
-
 %prep
 %setup -q -n kexec-tools-%{version}
 %patch0 -p1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2013-12-08 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2013-12-08 19:27:42

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2013-04-14 
10:16:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2013-12-08 19:27:43.0 +0100
@@ -1,0 +2,6 @@
+Fri Dec  6 11:51:24 UTC 2013 - ptesa...@suse.cz
+
+- Remove double-packaging of /etc/init.d/kexec-tools, fixing build
+  errors on some targets, e.g. SLE-11.
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.24vlq9/_old  2013-12-08 19:27:44.0 +0100
+++ /var/tmp/diff_new_pack.24vlq9/_new  2013-12-08 19:27:44.0 +0100
@@ -142,10 +142,9 @@
 #UsrMerge
 /sbin/*
 #EndUsrMerge
-%{_sbindir}
+%{_sbindir}/*
 %if 0%{?suse_version} = 1110
 %{_sbindir}/kexec-bootloader
-/etc/init.d/kexec
 %config /etc/init.d/kexec
 %endif
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2013-04-14 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2013-04-14 10:16:27

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools, Maintainer is to...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2012-10-23 
19:38:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2013-04-14 10:16:28.0 +0200
@@ -1,0 +2,6 @@
+Thu Apr 11 06:37:22 UTC 2013 - mmeis...@suse.com
+
+- Added url as source.
+  Please see http://en.opensuse.org/SourceUrls
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.nRjoVN/_old  2013-04-14 10:16:29.0 +0200
+++ /var/tmp/diff_new_pack.nRjoVN/_new  2013-04-14 10:16:29.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
 Group:  System/Kernel
 Version:2.0.3
 Release:0
-Source: %{name}-%{version}.tar.bz2
+Source: 
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8.txt
 Source3:kexec.init

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2012-06-25 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2012-06-25 12:33:31

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools, Maintainer is to...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2012-05-21 
07:27:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2012-06-25 12:33:32.0 +0200
@@ -1,0 +2,13 @@
+Thu Jun 14 16:23:58 CEST 2012 - oher...@suse.de
+
+- Fix xen cpuid() inline asm to not clobber stack's red zone 
+  See xen-unstable changeset 24344:72f4e4cb7440
+
+---
+Thu Jun 14 11:26:16 CEST 2012 - oher...@suse.de
+
+- Balloon up in a Xen PVonHVM guest before kexec (bnc#694863)
+- Update xen_present check for xenfs in pv_ops kernel (bnc#694863)
+- Change xen_present hv check (bnc#658413)
+
+---

New:

  kexec-tools-xen-balloon-up.patch
  kexec-tools-xen-present.diff



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.zmr6iC/_old  2012-06-25 12:33:34.0 +0200
+++ /var/tmp/diff_new_pack.zmr6iC/_new  2012-06-25 12:33:34.0 +0200
@@ -37,6 +37,8 @@
 Patch1: %{name}-xen-static.diff
 Patch2: gcc-no-undefined-flag-fix.patch
 Patch3: kexec-fix-strncat.patch
+Patch4: kexec-tools-xen-present.diff
+Patch5: kexec-tools-xen-balloon-up.patch
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -74,6 +76,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 # disable as-needed

++ kexec-tools-xen-balloon-up.patch ++
Reference: bnc#694863

A PVonHVM guest can not kexec if balloon driver gave some memory back to 
hypervisor.
Disable ballooning before doing kexec.

---
 kexec/crashdump-xen.c |  118 +++---
 kexec/crashdump.h |1 
 kexec/kexec.c |6 ++
 3 files changed, 119 insertions(+), 6 deletions(-)

Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
===
--- kexec-tools-2.0.2.orig/kexec/crashdump-xen.c
+++ kexec-tools-2.0.2/kexec/crashdump-xen.c
@@ -8,6 +8,7 @@
 #include limits.h
 #include sys/types.h
 #include sys/stat.h
+#include sys/select.h
 #include unistd.h
 #include fcntl.h
 #include setjmp.h
@@ -30,9 +31,20 @@ struct crash_note_info {
 static int xen_phys_cpus;
 static struct crash_note_info *xen_phys_notes;
 
+#define XEN_MEM0_DIR /sys/devices/system/xen_memory/xen_memory0
+#define XEN_MEM0_TARGET XEN_MEM0_DIR /target_kb
+#define XEN_MEM0_LOW XEN_MEM0_DIR /info/low_kb
+#define XEN_MEM0_HIGH XEN_MEM0_DIR /info/high_kb
+
 /* based on code from xen-detect.c */
 static int is_dom0;
 #if defined(__i386__) || defined(__x86_64__)
+enum {
+   XEN_PV = 1,
+   XEN_HVM = 2,
+   XEN_NONE = 3,
+};
+static int guest_type;
 static jmp_buf xen_sigill_jmp;
 void xen_sigill_handler(int sig)
 {
@@ -81,29 +93,118 @@ found:
return regs[0];
 }
 
-static int xen_detect_pv_guest(void)
+static void xen_detect_guest_type(void)
 {
struct sigaction act, oldact;
-   int is_pv = -1;
+
+   guest_type = XEN_NONE;
+   if (check_for_xen(0)) {
+   guest_type = XEN_HVM;
+   return;
+   }
 
if (setjmp(xen_sigill_jmp))
-   return is_pv;
+   return;
 
memset(act, 0, sizeof(act));
act.sa_handler = xen_sigill_handler;
sigemptyset (act.sa_mask);
if (sigaction(SIGILL, act, oldact))
-   return is_pv;
+   return;
if (check_for_xen(1))
-   is_pv = 1;
+   guest_type = XEN_PV;
sigaction(SIGILL, oldact, NULL);
-   return is_pv;
+   return;
+}
+
+static int xen_detect_pv_guest(void)
+{
+   if (!guest_type)
+   xen_detect_guest_type();
+
+   return guest_type == XEN_PV ? 1 : -1;
 }
+
+static int do_balloon_up(void)
+{
+   char line[123];
+   FILE *f;
+   int done = 0, seen_lo, seen_hi;
+   long long lo, hi, prev_lo = 0, prev_hi = 0;
+
+   if (!guest_type)
+   xen_detect_guest_type();
+
+   if (guest_type != XEN_HVM)
+   return 0;
+
+   /* Nothing to do if no balloon driver */
+   f = fopen(XEN_MEM0_TARGET, w);
+   if (!f)
+   return 0;
+
+   /* Balloon up to maximum, the guest can not exceed its max_memkb */
+   

commit kexec-tools for openSUSE:Factory

2012-05-20 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2012-05-21 07:27:57

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools, Maintainer is to...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2011-12-08 
11:29:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2012-05-21 07:27:58.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr 20 16:19:26 UTC 2012 - rschweik...@suse.com
+
+- place binaries into /usr tree (UsrMerge project)
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.YSYY2R/_old  2012-05-21 07:28:00.0 +0200
+++ /var/tmp/diff_new_pack.YSYY2R/_new  2012-05-21 07:28:00.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   kexec-tools
 %ifarch ppc
 BuildRequires:  gcc-64bit
 BuildRequires:  glibc-devel-64bit
 %endif
-License:GPL-2.0+
-Group:  System/Kernel
 Requires:   perl-Bootloader
 PreReq: %insserv_prereq %fillup_prereq
 Summary:Tools for fast kernel loading
+License:GPL-2.0+
+Group:  System/Kernel
 Version:2.0.2
 Release:0
 Source: %{name}-%{version}.tar.bz2
@@ -83,14 +84,12 @@
 %endif
 autoreconf -f
 CFLAGS=$RPM_OPT_FLAGS BUILD_CFLAGS=$RPM_OPT_FLAGS \
-./configure \
-   --prefix=/ \
+%configure \
 %ifarch ppc
 --host=powerpc64-suse-linux \
 --build=powerpc64-suse-linux \
 %endif
-   --sbindir=/sbin \
-   --libdir=/%_lib || true
+#  --libdir=/%_lib || true
 make
 # manpage
 cp %{S:1} .
@@ -101,7 +100,7 @@
 %endif
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
 install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8
 %if 0%{?suse_version} = 1110
@@ -111,11 +110,27 @@
 mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
 install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
 %endif
+#UsrMerge
+mkdir -p $RPM_BUILD_ROOT/sbin
+%ifarch %ix86 x86_64
+mkdir -p $RPM_BUILD_ROOT/%_lib
+ln -s %{_libdir}/kexec-tools $RPM_BUILD_ROOT/%_lib
+%endif
+ln -s %{_sbindir}/kdump $RPM_BUILD_ROOT/sbin
+ln -s %{_sbindir}/kexec $RPM_BUILD_ROOT/sbin
+#EndUsrMerge
 
 %clean
 [ $RPM_BUILD_ROOT != / ]  rm -rf $RPM_BUILD_ROOT
 %if 0%{?suse_version} = 1110
 
+#UsrMerge
+%pre
+if [ -d /%_lib/kexec-tools ];then
+rm -rf /%_lib/kexec-tools
+fi
+#EndUsrMerge
+
 %post
 %{fillup_and_insserv -n kexec kexec}
 %endif
@@ -131,14 +146,20 @@
 %defattr(-, root, root)
 %doc AUTHORS COPYING News TODO doc
 %doc %{_mandir}/man*/*
+#UsrMerge
 /sbin/*
+%ifarch %ix86 x86_64
+/%_lib/kexec-tools*
+%endif
+#EndUsrMerge
+%{_sbindir}
 %if 0%{?suse_version} = 1110
 %{_sbindir}/kexec-bootloader
 /etc/init.d/kexec
 %config /etc/init.d/kexec
 %endif
 %ifarch %ix86 x86_64
-/%_lib/kexec-tools*
+%{_libdir}/kexec-tools*
 %endif
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2011-12-08 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2011-12-08 11:28:54

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools, Maintainer is to...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2011-09-23 
02:06:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 
2011-12-08 11:29:34.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec  2 16:42:47 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+---



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.lK93a0/_old  2011-12-08 11:29:35.0 +0100
+++ /var/tmp/diff_new_pack.lK93a0/_new  2011-12-08 11:29:35.0 +0100
@@ -15,21 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:   kexec-tools
 %ifarch ppc
-BuildRequires:  gcc-64bit glibc-devel-64bit
+BuildRequires:  gcc-64bit
+BuildRequires:  glibc-devel-64bit
 %endif
 License:GPL-2.0+
 Group:  System/Kernel
 Requires:   perl-Bootloader
 PreReq: %insserv_prereq %fillup_prereq
-AutoReqProv:on
 Summary:Tools for fast kernel loading
 Version:2.0.2
-Release:7
+Release:0
 Source: %{name}-%{version}.tar.bz2
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8.txt
@@ -42,9 +39,11 @@
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
+BuildRequires:  automake
 BuildRequires:  zlib-devel
 %if 0%{?suse_version} = 1110
-BuildRequires:  asciidoc libxslt
+BuildRequires:  asciidoc
+BuildRequires:  libxslt
 %endif
 %ifarch %ix86 x86_64
 BuildRequires:  xen-devel

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2011-12-06 18:21:38

Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and  /work/SRC/openSUSE:Factory/.kexec-tools.new (New)


Package is kexec-tools, Maintainer is to...@suse.com

Changes:




Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.1Isbpx/_old  2011-12-06 18:37:48.0 +0100
+++ /var/tmp/diff_new_pack.1Isbpx/_new  2011-12-06 18:37:48.0 +0100
@@ -22,7 +22,7 @@
 %ifarch ppc
 BuildRequires:  gcc-64bit glibc-devel-64bit
 %endif
-License:GPLv2+
+License:GPL-2.0+
 Group:  System/Kernel
 Requires:   perl-Bootloader
 PreReq: %insserv_prereq %fillup_prereq

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2011-07-11 Thread h_root

Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory
checked in at Mon Jul 11 10:36:22 CEST 2011.




--- kexec-tools/kexec-tools.changes 2011-05-17 11:13:46.0 +0200
+++ /mounts/work_src_done/STABLE/kexec-tools/kexec-tools.changes
2011-07-10 23:48:26.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 23:48:14 CEST 2011 - meiss...@suse.de
+
+- fixed strncat sizse argument on ppc
+
+---

calling whatdependson for head-i586


New:

  kexec-fix-strncat.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.WUgxFL/_old  2011-07-11 10:36:03.0 +0200
+++ /var/tmp/diff_new_pack.WUgxFL/_new  2011-07-11 10:36:03.0 +0200
@@ -29,7 +29,7 @@
 AutoReqProv:on
 Summary:Tools for fast kernel loading
 Version:2.0.2
-Release:5
+Release:7
 Source: %{name}-%{version}.tar.bz2
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8.txt
@@ -38,6 +38,7 @@
 Patch0: %{name}-no-vga-output.diff
 Patch1: %{name}-xen-static.diff
 Patch2: gcc-no-undefined-flag-fix.patch
+Patch3: kexec-fix-strncat.patch
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -72,6 +73,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # disable as-needed

++ kexec-fix-strncat.patch ++
Index: kexec-tools-2.0.2/kexec/arch/ppc64/fs2dt.c
===
--- kexec-tools-2.0.2.orig/kexec/arch/ppc64/fs2dt.c
+++ kexec-tools-2.0.2/kexec/arch/ppc64/fs2dt.c
@@ -594,7 +594,7 @@ static void putnode(void)
 * pseries/hvcterminal is supported.
 */
strcpy(filename, pathname);
-   strncat(filename, linux,stdout-path, MAXPATH);
+   strncat(filename, linux,stdout-path, 
MAXPATH-strlen(filename)-1);
fd = open(filename, O_RDONLY);
if (fd == -1) {
printf(Unable to find %s, printing from purgatory is 
diabled\n,
@@ -618,8 +618,8 @@ static void putnode(void)
read(fd, buff, statbuf.st_size);
close(fd);
strncpy(filename, /proc/device-tree/, MAXPATH);
-   strncat(filename, buff, MAXPATH);
-   strncat(filename, /compatible, MAXPATH);
+   strncat(filename, buff, MAXPATH-strlen(filename)-1);
+   strncat(filename, /compatible, MAXPATH-strlen(filename)-1);
fd = open(filename, O_RDONLY);
if (fd == -1) {
printf(Unable to find %s printing from purgatory is 
diabled\n,





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kexec-tools for openSUSE:Factory

2011-05-17 Thread h_root

Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory
checked in at Tue May 17 15:24:59 CEST 2011.




--- kexec-tools/kexec-tools.changes 2010-09-12 11:49:27.0 +0200
+++ /mounts/work_src_done/STABLE/kexec-tools/kexec-tools.changes
2011-05-17 11:13:46.0 +0200
@@ -1,0 +2,5 @@
+Tue May 17 11:12:54 CEST 2011 - jsl...@suse.de
+
+- fix build with gcc that doesn't understand --no-undefined
+
+---

calling whatdependson for head-i586


New:

  gcc-no-undefined-flag-fix.patch



Other differences:
--
++ kexec-tools.spec ++
--- /var/tmp/diff_new_pack.NgIrbh/_old  2011-05-17 15:19:15.0 +0200
+++ /var/tmp/diff_new_pack.NgIrbh/_new  2011-05-17 15:19:15.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package kexec-tools (Version 2.0.2)
+# spec file for package kexec-tools
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
 AutoReqProv:on
 Summary:Tools for fast kernel loading
 Version:2.0.2
-Release:1
+Release:5
 Source: %{name}-%{version}.tar.bz2
 Source1:kexec-bootloader
 Source2:kexec-bootloader.8.txt
@@ -37,6 +37,7 @@
 Source4:%{name}-%{version}-rpmlintrc
 Patch0: %{name}-no-vga-output.diff
 Patch1: %{name}-xen-static.diff
+Patch2: gcc-no-undefined-flag-fix.patch
 Url:
ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -70,6 +71,7 @@
 %setup -q -n kexec-tools-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # disable as-needed

++ gcc-no-undefined-flag-fix.patch ++
From 8880e5b8a295788dcae8f5cc038de92cd97b6807 Mon Sep 17 00:00:00 2001
From: Simon Horman ho...@verge.net.au
Date: Wed, 30 Mar 2011 08:34:39 +0900
Subject: build: Pass --no-undefined as a linker option
Git-commit: 8880e5b8a295788dcae8f5cc038de92cd97b6807
Patch-mainline: yes

gcc-4.6 does not accept --no-undefined as a compiler option

Reported-by: Civil civil.o...@gmail.com
Acked-by: Eric W. Biederman ebied...@xmission.com
Signed-off-by: Simon Horman ho...@verge.net.au
Signed-off-by: Jiri Slaby jirisl...@gmail.com
---
 purgatory/Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/purgatory/Makefile b/purgatory/Makefile
index ea0c19a..ee1679c 100644
--- a/purgatory/Makefile
+++ b/purgatory/Makefile
@@ -56,8 +56,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
-I$(srcdir)/include \
-I$(shell $(CC) -print-file-name=include)
 $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
-   --no-undefined -nostartfiles -nostdlib -nodefaultlibs \
-   -e purgatory_start -r
+   -Wl,--no-undefined -nostartfiles -nostdlib \
+   -nodefaultlibs -e purgatory_start -r
 
 $(PURGATORY): $(PURGATORY_OBJS)
$(MKDIR) -p $(@D)
-- 
1.7.4.2






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org