diff options
| author | jk <jk@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-04-12 23:20:31 +0000 |
|---|---|---|
| committer | jk <jk@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-04-12 23:20:31 +0000 |
| commit | aff6fa1a1d0d4ce7debefa250e4845e4b86811e4 (patch) | |
| tree | 66f0f8bb902d096a01dd6d60b80fee64e2c03ce5 /package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch | |
| parent | 7e4be8edea219e2e688c2557961b1603bb71a7c2 (diff) | |
[package/kexec] Use new kexec tools
Horms' new kexec-tools repository has a number of updates and fixes for
kexec, and also supports the PS3.
This change updates the kexec repo, and adds a few build-system patches
to make it work with OpenWRT.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10803 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch')
| -rw-r--r-- | package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch b/package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch new file mode 100644 index 000000000..1a6473210 --- /dev/null +++ b/package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch @@ -0,0 +1,39 @@ +From ee274ca1ae88bef43da3090d0e1e9155e3b493ad Mon Sep 17 00:00:00 2001 +From: Jeremy Kerr <jk@ozlabs.org> +Date: Wed, 19 Mar 2008 17:06:24 +1100 +Subject: [PATCH] Use separate CPPFLAGS and LDFLAGS for purgatory + +Currently, CPPFLAGS and LDFLAGS can 'leak' into the purgatory build +from the main kexec/kexec object. Because of this, the purgatory +is build with -lz, but we may not have a zlib present for the +architecture of the purgatory object. + +This change uses fresh CPPFLAGS and LDFLAGS for the purgatory object. + +Signed-off-by: Jeremy Kerr <jk@ozlabs.org> +--- + purgatory/Makefile | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/purgatory/Makefile b/purgatory/Makefile +index 6c747b1..ac58719 100644 +--- a/purgatory/Makefile ++++ b/purgatory/Makefile +@@ -49,11 +49,12 @@ $(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -Os -fno-builtin -ffreestanding \ + -fno-zero-initialized-in-bss + +-$(PURGATORY): CPPFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ ++$(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -I$(srcdir)/purgatory/include \ + -I$(srcdir)/purgatory/arch/$(ARCH)/include \ ++ -I$(srcdir)/util_lib/include \ + -I$(shell $(CC) -print-file-name=include) +-$(PURGATORY): LDFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ ++$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ + --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ + -e purgatory_start -r + +-- +1.5.0.rc4.g85b1 + |