Attachment 316216 Details for Bug 461551 – make that a unidiff (doh!)

[patch] make that a unidiff (doh!)

kexec-spec-patch2 (text/plain), 1.48 KB, created by Jonathan Peatfield on 2008-09-09 17:21:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Peatfield

Created: 2008-09-09 17:21:00 UTC

Size: 1.48 KB

patch

obsolete

>--- SPECS/kexec-tools.spec.orig	2008-08-04 18:01:08.000000000 +0100
>+++ SPECS/kexec-tools.spec	2008-09-09 18:07:17.000000000 +0100
>@@ -1,6 +1,6 @@
> Name: kexec-tools
> Version: 1.102pre
>-Release: 21%{?dist}.2
>+Release: 21%{?dist}.2.test2
> License: GPL
> Group: Applications/System
> Summary: The kexec/kdump userspace component.
>@@ -123,12 +123,29 @@
> export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2"
> %endif
> 
>+# *sigh*, I hate this, but theres not another good way to do it.
>+# kexec needs zlib to handle/load compressed kernel files, it also
>+# needs to be able to reboot the system after everything has been unmounted
>+# This presents a problem, since zlib is located in /usr/lib/libz.so.
>+# The only real solutions we have are:
>+# 1) statically link against zlib 
>+# 2) write a separate statically linked utility
>+# I don't like either solution, especiatlly since Fedora has mandated dynamic
>+# but it seems like (1) is the easiest way forward.  Unfortunatley the config
>+# script automatically adds -lz to everything, so to work around that, I have
>+# to:
>+# a) export LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic"
>+# b) configure --without-zlib
>+# This is rather horrendous, but whatever, kexec is always last on anyones
>+# mind ayway
> %configure \
> %ifarch ppc64
>     --host=powerpc64-redhat-linux-gnu \
>     --build=powerpc64-redhat-linux-gnu \
> %endif
>     --sbindir=/sbin
>+# Hack hack hack
>+sed -i 's/-lz/-Wl,-Bstatic -lz -Wl,-Bdynamic/' Makefile.conf
> rm -f kexec-tools.spec.in
> cp %{SOURCE10} . 
> make

Actions: View | Diff

Attachments on bug 461551: 316198 | 316204 | 316215 | 316216