Hello community, here is the log from the commit of package kexec-tools for openSUSE:Factory checked in at 2012-10-23 19:38:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old) and /work/SRC/openSUSE:Factory/.kexec-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kexec-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes 2012-06-25 12:33:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 2012-10-23 19:38:42.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 11 23:10:42 UTC 2012 - [email protected] + +- Update to kexec 2.0.3. Drop unneeded patches. + +------------------------------------------------------------------- Old: ---- gcc-no-undefined-flag-fix.patch kexec-fix-strncat.patch kexec-tools-2.0.2-rpmlintrc kexec-tools-2.0.2.tar.bz2 kexec-tools-no-vga-output.diff kexec-tools-xen-present.diff kexec-tools-xen-static.diff New: ---- kexec-tools-2.0.3-rpmlintrc kexec-tools-2.0.3.tar.bz2 kexec-tools-disable-test.patch kexec-tools-fix-makefile-binaries.patch kexec-tools-fix-strncat.patch kexec-tools-no-vga-output.patch kexec-tools-xen-static.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kexec-tools.spec ++++++ --- /var/tmp/diff_new_pack.4FGjmL/_old 2012-10-23 19:38:52.000000000 +0200 +++ /var/tmp/diff_new_pack.4FGjmL/_new 2012-10-23 19:38:52.000000000 +0200 @@ -26,19 +26,19 @@ Summary: Tools for fast kernel loading License: GPL-2.0+ Group: System/Kernel -Version: 2.0.2 +Version: 2.0.3 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: kexec-bootloader Source2: kexec-bootloader.8.txt Source3: kexec.init Source4: %{name}-%{version}-rpmlintrc -Patch0: %{name}-no-vga-output.diff -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 +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 Url: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: fop @@ -116,10 +116,6 @@ %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 @@ -128,13 +124,6 @@ [ "$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 @@ -152,9 +141,6 @@ %doc %{_mandir}/man*/* #UsrMerge /sbin/* -%ifarch %ix86 x86_64 -/%_lib/kexec-tools* -%endif #EndUsrMerge %{_sbindir} %if 0%{?suse_version} >= 1110 @@ -162,8 +148,5 @@ /etc/init.d/kexec %config /etc/init.d/kexec %endif -%ifarch %ix86 x86_64 -%{_libdir}/kexec-tools* -%endif %changelog ++++++ kexec-tools-2.0.2-rpmlintrc -> kexec-tools-2.0.3-rpmlintrc ++++++ ++++++ kexec-tools-2.0.2.tar.bz2 -> kexec-tools-2.0.3.tar.bz2 ++++++ ++++ 13289 lines of diff (skipped) ++++++ kexec-tools-disable-test.patch ++++++ From: Tony Jones <[email protected]> Subject: Disable kexec_test Disable kexec_test. It is not required in released product (matching latest Fedora). Also one less file for usr_merge --- Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/Makefile.in +++ b/Makefile.in @@ -176,8 +176,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) -BINARIES_i386:=$(KEXEC_TEST) -BINARIES_x86_64:=$(KEXEC_TEST) +# Dont' build kexec_test +#BINARIES_i386:=$(KEXEC_TEST) +#BINARIES_x86_64:=$(KEXEC_TEST) +BINARIES_i386:= +BINARIES_x86_64:= BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH)) TARGETS:=$(BINARIES) $(MAN_PAGES) ++++++ kexec-tools-fix-makefile-binaries.patch ++++++ From: Tony Jones Date: Tue Oct 9 17:35:14 2012 Subject: kexec: fix Makefile.in binaries_arch Git-commit: aaedd5321b239a919a080da84ed5c96fb4481ed2 --- a/Makefile.in 2011-10-03 00:56:38.000000000 +0200 +++ b/Makefile.in 2012-09-26 18:36:44.232086000 +0200 @@ -176,8 +176,8 @@ PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE) -BINARIES_i386:=$(KEXEC_TEST) $(KEXEC_TEST) -BINARIES_x86_64:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH)) +BINARIES_i386:=$(KEXEC_TEST) +BINARIES_x86_64:=$(KEXEC_TEST) BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH)) TARGETS:=$(BINARIES) $(MAN_PAGES) ++++++ kexec-tools-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", ++++++ kexec-tools-no-vga-output.patch ++++++ From: Bernhard Walle <[email protected]> Subject: [PATCH] Don't print setup_linux_vesafb message Patch-mainline: never This looks ugly: linux-nisf:/var/crash # rckdump start Loading kdump setup_linux_vesafb: 1024x768x16 @ e0000000 +600000 Don't display the setup_linux_vesafb message. Signed-off-by: Bernhard Walle <[email protected]> --- 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 @@ -149,9 +149,13 @@ int setup_linux_vesafb(struct x86_linux_ real_mode->rsvd_pos = var.transp.offset; real_mode->rsvd_size = var.transp.length; } + +#if 0 fprintf(stderr, "%s: %dx%dx%d @ %lx +%x\n", __FUNCTION__, var.xres, var.yres, var.bits_per_pixel, fix.smem_start, fix.smem_len); +#endif + return 0; out: ++++++ kexec-tools-xen-static.patch ++++++ From: Bernhard Walle <[email protected]> Subject: [PATCH] Link xenctrl statically 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 <[email protected]> ================================================================================ --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/configure.ac +++ b/configure.ac @@ -160,7 +160,8 @@ fi dnl find Xen control stack libraries if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, - AC_CHECK_LIB(xenctrl, xc_version, , + AC_CHECK_LIB(xenctrl, xc_version, + [[LIBS="$LIBS -Wl,-Bstatic -lxenctrl -Wl,-Bdynamic"]] AC_MSG_NOTICE([Xen support disabled]))) if test "$ac_cv_lib_xenctrl_xc_version" = yes ; then AC_CHECK_FUNCS(xc_get_machine_memory_map) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
