pool/kexec-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 70409 from home:jirislaby:branches:Kernel:kdump

Browse Source 
fix build with gcc that doesn't understand --no-undefined

OBS-URL: https://build.opensuse.org/request/show/70409
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=13
This commit is contained in:
Petr Tesařík 2011-05-17 10:23:28 +00:00 committed by Git OBS Bridge
parent c5d61b3e1d
commit d073e322d1
8 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gcc-no-undefined-flag-fix.patch Normal file
View File

@ -0,0 +1,35 @@
From 8880e5b8a295788dcae8f5cc038de92cd97b6807 Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@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.over@gmail.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jiri Slaby <jirislaby@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

3
kexec-tools-2.0.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f61f7be8896d4e3ee788712c564296bcb431e2e0b0564cc14b40a81b6df8d311
size 269432

0
kexec-tools-2.0.1-rpmlintrc → kexec-tools-2.0.2-rpmlintrc
View File

3
kexec-tools-2.0.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9acb94dcf4cee2a04da18112a6e5732cdcbe98f893039a93582d88307e0103f
size 305961

13
kexec-tools-increase-kernel-text-size.diff
View File

@ -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)

34
kexec-tools-xen-static.diff
View File

@ -8,35 +8,11 @@ to use Xen support without a runtime dependency to the Xen package.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
================================================================================
--- 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,

13
kexec-tools.changes
View File

@ -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

12
kexec-tools.spec
View File

@ -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=/ \