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.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 2015-02-16 17:31:07.000000000 +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.000000000 +0100 +++ /var/tmp/diff_new_pack.bEjMuE/_new 2015-02-16 17:31:07.000000000 +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.000000000 +0200 +++ new/kexec-tools-2.0.9/configure 2015-02-09 06:31:38.000000000 +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.000000000 +0200 +++ new/kexec-tools-2.0.9/configure.ac 2015-02-09 06:31:19.000000000 +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' old/kexec-tools-2.0.8/include/config.h new/kexec-tools-2.0.9/include/config.h --- old/kexec-tools-2.0.8/include/config.h 2014-10-08 07:17:11.000000000 +0200 +++ new/kexec-tools-2.0.9/include/config.h 2015-02-09 06:32:26.000000000 +0100 @@ -44,13 +44,13 @@ #define PACKAGE_BUGREPORT "" /* Define to the release date of this package */ -#define PACKAGE_DATE "08 October 2014" +#define PACKAGE_DATE "09 February 2015" /* Define to the full name of this package. */ #define PACKAGE_NAME "kexec-tools" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "kexec-tools 2.0.8" +#define PACKAGE_STRING "kexec-tools 2.0.9" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "kexec-tools" @@ -59,7 +59,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.8" +#define PACKAGE_VERSION "2.0.9" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kexec-tools-2.0.8/kexec/arch/m68k/Makefile new/kexec-tools-2.0.9/kexec/arch/m68k/Makefile --- old/kexec-tools-2.0.8/kexec/arch/m68k/Makefile 2013-12-13 01:52:51.000000000 +0100 +++ new/kexec-tools-2.0.9/kexec/arch/m68k/Makefile 2014-10-14 07:04:10.000000000 +0200 @@ -10,5 +10,6 @@ m68k_VIRT_TO_PHYS = dist += kexec/arch/m68k/Makefile $(m68k_KEXEC_SRCS) \ + kexec/arch/m68k/bootinfo.h \ kexec/arch/m68k/kexec-m68k.h \ kexec/arch/m68k/include/arch/options.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kexec-tools-2.0.8/kexec/arch/m68k/bootinfo.h new/kexec-tools-2.0.9/kexec/arch/m68k/bootinfo.h --- old/kexec-tools-2.0.8/kexec/arch/m68k/bootinfo.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kexec-tools-2.0.9/kexec/arch/m68k/bootinfo.h 2014-10-14 06:58:06.000000000 +0200 @@ -0,0 +1,43 @@ +#include <asm/bootinfo.h> + +#define DEFAULT_BOOTINFO_FILE "/proc/bootinfo" +#define MAX_BOOTINFO_SIZE 1536 + + + /* + * Convenience overlay of several struct bi_record variants + */ + +struct bi_rec { + __be16 tag; + __be16 size; + union { + __be32 data[0]; + /* shorthands for the types we use */ + __be32 machtype; + struct { + __be32 addr; + __be32 size; + } mem_info; + char string[0]; + }; +}; + + + /* + * We only support the "new" tagged bootinfo (v2) + */ + +#define SUPPORTED_BOOTINFO_VERSION 2 + + +extern const char *bootinfo_file; + +extern void bootinfo_load(void); +extern void bootinfo_print(void); +extern int bootinfo_get_memory_ranges(struct memory_range **range); +extern void bootinfo_set_cmdline(const char *cmdline); +extern void bootinfo_set_ramdisk(unsigned long ramdisk_addr, + unsigned long ramdisk_size); +extern void bootinfo_check_bootversion(const struct kexec_info *info); +extern void add_bootinfo(struct kexec_info *info, unsigned long addr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kexec-tools-2.0.8/kexec/fs2dt.c new/kexec-tools-2.0.9/kexec/fs2dt.c --- old/kexec-tools-2.0.8/kexec/fs2dt.c 2014-05-15 06:42:21.000000000 +0200 +++ new/kexec-tools-2.0.9/kexec/fs2dt.c 2014-12-02 02:49:54.000000000 +0100 @@ -381,8 +381,8 @@ { struct dirent *dp; int i = 0, fd; - size_t len; - ssize_t slen; + off_t len; + off_t slen; struct stat statbuf; for (i = 0; i < numlist; i++) { @@ -443,23 +443,27 @@ *dt++ = cpu_to_be32(propnum(fn)); pad_structure_block(len); - fd = open(pathname, O_RDONLY); - if (fd == -1) - die("unrecoverable error: could not open \"%s\": %s\n", - pathname, strerror(errno)); + if (len) { + char *buf; - slen = read(fd, dt, len); - if (slen < 0) - die("unrecoverable error: could not read \"%s\": %s\n", - pathname, strerror(errno)); - if ((size_t)slen != len) - die("unrecoverable error: short read from\"%s\"\n", - pathname); + buf = slurp_file_len(pathname, len, &slen); + if (slen != len) + die("unrecoverable error: short read from\"%s\"\n", + pathname); + + memcpy(dt, buf, slen); + free(buf); + } checkprop(fn, dt, len); dt += (len + 3)/4; + fd = open(pathname, O_RDONLY); + if (fd == -1) + die("unrecoverable error: could not open \"%s\": %s\n", + pathname, strerror(errno)); + if (!strcmp(dp->d_name, "reg") && usablemem_rgns.size) add_usable_mem_property(fd, len); add_dyn_reconf_usable_mem_property(dp, fd); @@ -479,6 +483,8 @@ { char *str1 = (*(struct dirent **)dentry1)->d_name; char *str2 = (*(struct dirent **)dentry2)->d_name; + char *sep1 = strchr(str1, '@'); + char *sep2 = strchr(str2, '@'); /* * strcmp scans from left to right and fails to idetify for some @@ -486,9 +492,20 @@ * Therefore, we get the wrong sorted order like memory@10000000 and * memory@f000000. */ - if (strchr(str1, '@') && strchr(str2, '@') && - (strlen(str1) > strlen(str2))) - return 1; + if (sep1 && sep2) { + int baselen1 = sep1 - str1; + int baselen2 = sep2 - str2; + int len1 = strlen(str1); + int len2 = strlen(str2); + + /* + * Check the base name matches, and the properties are + * different lengths. + */ + if ((baselen1 == baselen2) && (len1 != len2) && + !strncmp(str1, str2, baselen2)) + return (len1 > len2) - (len1 < len2); + } return strcmp(str1, str2); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kexec-tools-2.0.8/kexec/kexec.c new/kexec-tools-2.0.9/kexec/kexec.c --- old/kexec-tools-2.0.8/kexec/kexec.c 2014-09-04 02:37:46.000000000 +0200 +++ new/kexec-tools-2.0.9/kexec/kexec.c 2015-01-05 02:48:43.000000000 +0100 @@ -662,10 +662,6 @@ int guess_only = 0; memset(&info, 0, sizeof(info)); - info.segment = NULL; - info.nr_segments = 0; - info.entry = NULL; - info.backup_start = 0; info.kexec_flags = kexec_flags; result = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kexec-tools-2.0.8/kexec-tools.spec new/kexec-tools-2.0.9/kexec-tools.spec --- old/kexec-tools-2.0.8/kexec-tools.spec 2014-10-08 07:17:20.000000000 +0200 +++ new/kexec-tools-2.0.9/kexec-tools.spec 2015-02-09 06:32:29.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Load one kernel from another Name: kexec-tools -Version: 2.0.8 +Version: 2.0.9 Release: 0 License: GPL Group: Development/Tools -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
