From 6f9764a3302b29038a8d96f2f7e230739ea49b25 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Wed, 12 Mar 2008 11:41:14 +0000 Subject: [PATCH] Update busybox static-error patch to actually work git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@623 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 4 ++++ patches/busybox/1.7.4/1.7.4-static-error.diff | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index c5ffca9..a5acbd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Mar 2008; Andrew Gaffney + patches/busybox/1.7.4/1.7.4-static-error.diff: + Update busybox static-error patch to actually work + 12 Mar 2008; Chris Gianelloni genkernel.conf: Change BUSYBOX_VER to VERSION_BUSYBOX for genkernel-9999 ebuild. diff --git a/patches/busybox/1.7.4/1.7.4-static-error.diff b/patches/busybox/1.7.4/1.7.4-static-error.diff index e3c5405..1e3b59c 100644 --- a/patches/busybox/1.7.4/1.7.4-static-error.diff +++ b/patches/busybox/1.7.4/1.7.4-static-error.diff @@ -1,3 +1,4 @@ +diff -ur busybox-1.7.4.orig/applets/applets.c busybox-1.7.4/applets/applets.c --- busybox-1.7.4.orig/applets/applets.c 2007-09-16 13:48:10.000000000 -0500 +++ busybox-1.7.4/applets/applets.c 2008-03-11 13:53:18.000000000 -0500 @@ -23,7 +23,6 @@ @@ -8,3 +9,15 @@ #endif +diff -ur busybox-1.7.4.orig/Makefile busybox-1.7.4/Makefile +--- busybox-1.7.4.orig/Makefile 2007-11-23 22:34:41.000000000 -0600 ++++ busybox-1.7.4/Makefile 2008-03-12 06:35:25.000000000 -0500 +@@ -570,7 +570,7 @@ + quiet_cmd_busybox__ ?= LINK $@ + cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \ + -o $@ -Wl,-Map -Wl,$@.map \ +- -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ ++ -Wl,--warn-common -Wl,--sort-common \ + -Wl,--start-group $(busybox-all) -Wl,--end-group \ + $(LDLIBS) + -- 2.26.2