diff --git a/gcc-no-undefined-flag-fix.patch b/gcc-no-undefined-flag-fix.patch new file mode 100644 index 0000000..8a627d0 --- /dev/null +++ b/gcc-no-undefined-flag-fix.patch @@ -0,0 +1,35 @@ +From 8880e5b8a295788dcae8f5cc038de92cd97b6807 Mon Sep 17 00:00:00 2001 +From: Simon Horman +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 +Acked-by: "Eric W. Biederman" +Signed-off-by: Simon Horman +Signed-off-by: Jiri Slaby +--- + 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 + diff --git a/kexec-tools-2.0.1.tar.bz2 b/kexec-tools-2.0.1.tar.bz2 deleted file mode 100644 index 19e50e6..0000000 --- a/kexec-tools-2.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f61f7be8896d4e3ee788712c564296bcb431e2e0b0564cc14b40a81b6df8d311 -size 269432 diff --git a/kexec-tools-2.0.1-rpmlintrc b/kexec-tools-2.0.2-rpmlintrc similarity index 100% rename from kexec-tools-2.0.1-rpmlintrc rename to kexec-tools-2.0.2-rpmlintrc diff --git a/kexec-tools-2.0.2.tar.bz2 b/kexec-tools-2.0.2.tar.bz2 new file mode 100644 index 0000000..6f0344f --- /dev/null +++ b/kexec-tools-2.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9acb94dcf4cee2a04da18112a6e5732cdcbe98f893039a93582d88307e0103f +size 305961 diff --git a/kexec-tools-increase-kernel-text-size.diff b/kexec-tools-increase-kernel-text-size.diff deleted file mode 100644 index ef8aae2..0000000 --- a/kexec-tools-increase-kernel-text-size.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kexec/arch/x86_64/crashdump-x86_64.h b/kexec/arch/x86_64/crashdump-x86_64.h -index 9f4dee9..0e83527 100644 ---- a/kexec/arch/x86_64/crashdump-x86_64.h -+++ b/kexec/arch/x86_64/crashdump-x86_64.h -@@ -11,7 +11,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline, - #define MAXMEM 0x3fffffffffffUL - - /* Kernel text size */ --#define KERNEL_TEXT_SIZE (40UL*1024*1024) -+#define KERNEL_TEXT_SIZE (512UL*1024*1024) - - #define CRASH_MAX_MEMMAP_NR (KEXEC_MAX_SEGMENTS + 1) - #define CRASH_MAX_MEMORY_RANGES (MAX_MEMORY_RANGES + 2) diff --git a/kexec-tools-xen-static.diff b/kexec-tools-xen-static.diff index 5f85bd2..08acc05 100644 --- a/kexec-tools-xen-static.diff +++ b/kexec-tools-xen-static.diff @@ -8,35 +8,11 @@ to use Xen support without a runtime dependency to the Xen package. Signed-off-by: Bernhard Walle ================================================================================ ---- kexec-tools-2.0.1/configure -+++ kexec-tools-2.0.1/configure -@@ -5023,8 +5023,7 @@ - - fi - if test "x$ac_cv_header_xenctrl_h" = x""yes; then -- --{ $as_echo "$as_me:$LINENO: checking for xc_version in -lxenctrl" >&5 -+ { $as_echo "$as_me:$LINENO: checking for xc_version in -lxenctrl" >&5 - $as_echo_n "checking for xc_version in -lxenctrl... " >&6; } - if test "${ac_cv_lib_xenctrl_xc_version+set}" = set; then - $as_echo_n "(cached) " >&6 -@@ -5090,12 +5089,7 @@ - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xenctrl_xc_version" >&5 - $as_echo "$ac_cv_lib_xenctrl_xc_version" >&6; } - if test "x$ac_cv_lib_xenctrl_xc_version" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBXENCTRL 1 --_ACEOF -- -- LIBS="-lxenctrl $LIBS" -- -+ LIBS="$LIBS -Wl,-Bstatic -lxenctrl -Wl,-Bdynamic" - else - { $as_echo "$as_me:$LINENO: Xen support disabled" >&5 - $as_echo "$as_me: Xen support disabled" >&6;} ---- kexec-tools-2.0.1/configure.ac -+++ kexec-tools-2.0.1/configure.ac -@@ -145,7 +145,8 @@ +Index: kexec-tools-2.0.2/configure.ac +=================================================================== +--- kexec-tools-2.0.2.orig/configure.ac ++++ kexec-tools-2.0.2/configure.ac +@@ -155,7 +155,8 @@ fi dnl find Xen control stack libraries if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, diff --git a/kexec-tools.changes b/kexec-tools.changes index 248f70d..5b3eb22 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue May 17 11:12:54 CEST 2011 - jslaby@suse.de + +- fix build with gcc that doesn't understand --no-undefined + +------------------------------------------------------------------- +Sun Sep 12 07:26:33 UTC 2010 - bernhard@bwalle.de + +- Update to kexec-tools 2.0.2 (bug fix release). The complete + changelog can be viewed at + http://git.kernel.org/?p=utils/kernel/kexec/kexec-tools.git;a=shortlog;h=refs/tags/v2.0.2. +- Drop kexec-tools-increase-kernel-text-size.diff: Mainline. + ------------------------------------------------------------------- Tue Mar 16 15:39:45 CET 2010 - ro@suse.de diff --git a/kexec-tools.spec b/kexec-tools.spec index fe9895c..8c375c7 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,5 +1,5 @@ # -# spec file for package kexec-tools (Version 2.0.1) +# spec file for package kexec-tools (Version 2.0.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Requires: perl-Bootloader PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Tools for fast kernel loading -Version: 2.0.1 -Release: 2 +Version: 2.0.2 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: kexec-bootloader Source2: kexec-bootloader.8.txt @@ -37,8 +37,8 @@ Source3: kexec.init Source4: %{name}-%{version}-rpmlintrc Patch0: %{name}-no-vga-output.diff Patch1: %{name}-xen-static.diff -Patch2: %{name}-increase-kernel-text-size.diff -Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ +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 BuildRequires: zlib-devel @@ -80,7 +80,7 @@ export SUSE_ASNEEDED=0 %ifarch ia64 RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//') %endif -#autoreconf -f +autoreconf -f CFLAGS=$RPM_OPT_FLAGS BUILD_CFLAGS=$RPM_OPT_FLAGS \ ./configure \ --prefix=/ \