rpms/busybox/devel busybox-1.7.2-gc-section.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 busybox.spec, 1.68, 1.69 sources, 1.17, 1.18 busybox-1.6.1-st_err.patch, 1.1, NONE busybox-1.7.2-grep.patch, 1.1, NONE busybox-1.7.2-sed.patch, 1.2, NONE

Tue Nov 6 10:12:10 UTC 2007

Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12072

Modified Files:
	.cvsignore busybox.spec sources 
Added Files:
	busybox-1.7.2-gc-section.patch 
Removed Files:
	busybox-1.6.1-st_err.patch busybox-1.7.2-grep.patch 
	busybox-1.7.2-sed.patch 
Log Message:
- update to 1.7.3
- remove --gc-sections from static build Makefile


busybox-1.7.2-gc-section.patch:

--- NEW FILE busybox-1.7.2-gc-section.patch ---
diff -up busybox-1.7.2/Makefile.pom busybox-1.7.2/Makefile
--- busybox-1.7.2/Makefile.pom	2007-11-06 10:21:45.000000000 +0100
+++ busybox-1.7.2/Makefile	2007-11-06 10:23:43.000000000 +0100
@@ -570,7 +570,7 @@ busybox-all  := $(core-y) $(libs-y)
 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)
 
diff -up busybox-1.7.2/applets/applets.c.pom busybox-1.7.2/applets/applets.c
--- busybox-1.7.2/applets/applets.c.pom	2007-09-16 20:48:10.000000000 +0200
+++ busybox-1.7.2/applets/applets.c	2007-11-06 10:23:20.000000000 +0100
@@ -15,18 +15,6 @@
 #include <assert.h>
 #include "busybox.h"
 
-/* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
-#if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__)
-#warning Static linking against glibc produces buggy executables
-#warning (glibc does not cope well with ld --gc-sections).
-#warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
-#warning Note that glibc is unsuitable for static linking anyway.
-#warning If you still want to do it, remove -Wl,--gc-sections
-#warning from top-level Makefile and remove this warning.
-#error Aborting compilation.
-#endif
-
-
 /* Declare <applet>_main() */
 #define PROTOTYPES
 #include "applets.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Oct 2007 12:21:31 -0000	1.17
+++ .cvsignore	6 Nov 2007 10:11:37 -0000	1.18
@@ -1 +1 @@
-busybox-1.7.2.tar.bz2
+busybox-1.7.3.tar.bz2


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- busybox.spec	1 Nov 2007 12:10:16 -0000	1.68
+++ busybox.spec	6 Nov 2007 10:11:37 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.7.2
-Release: 4%{?dist}
+Version: 1.7.3
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -15,9 +15,7 @@
 Patch12: busybox-1.2.2-ls.patch
 Patch13: busybox-1.5.1-clean.patch
 Patch14: busybox-1.5.1-msh.patch
-Patch15: busybox-1.6.1-st_err.patch
-Patch16: busybox-1.7.2-sed.patch
-Patch17: busybox-1.7.2-grep.patch
+Patch15: busybox-1.7.2-gc-section.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -61,27 +59,26 @@
 %patch11 -b .iptunnel -p1
 %patch12 -b .ls -p1
 %patch14 -b .msh -p1
-%patch15 -b .st_err -p1
-%patch16 -b .ffl -p1
-%patch17 -b .ffl -p1
+%patch15 -b .sect -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
 make defconfig
 make CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox-static
-make clean
 
 # create busybox optimized for anaconda 
-# revert the static patch
+make clean
+# revert the static patches
 patch -R -p1 <%{PATCH0}
+patch -R -p1 <%{PATCH15}
 # applied anaconda patch
 patch -b --suffix .anaconda -p1 < %{PATCH1}
 make defconfig
 make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox.anaconda
 
-#create busybox optimized for petitboot
+# create busybox optimized for petitboot
 make clean
 # copy new configuration file
 cp %{SOURCE1} .config
@@ -116,6 +113,10 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Tue Nov  6 2007 Ivana Varekova <varekova at redhat.com> - 1:1.7.3-1
+- update to 1.7.3 
+- remove --gc-sections from static build Makefile
+
 * Thu Nov  1 2007 Ivana Varekova <varekova at redhat.com> - 1:1.7.2-4
 - fix 359371 - problem with grep output
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Oct 2007 12:21:31 -0000	1.17
+++ sources	6 Nov 2007 10:11:37 -0000	1.18
@@ -1 +1 @@
-c91ec9756e2000073a9dd8fa9fc3f89e  busybox-1.7.2.tar.bz2
+d595c930e3eb7d0037b227dcd6e745d5  busybox-1.7.3.tar.bz2


--- busybox-1.6.1-st_err.patch DELETED ---


--- busybox-1.7.2-grep.patch DELETED ---


--- busybox-1.7.2-sed.patch DELETED ---


