rpms/busybox/devel busybox-1.9.0-gc-section.patch, NONE, 1.1 busybox-1.9.0-msh.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 busybox.spec, 1.73, 1.74 sources, 1.20, 1.21 busybox-1.5.1-msh.patch, 1.1, NONE busybox-1.8.2-gc-section.patch, 1.1, NONE
Ivana Varekova (varekova)
fedora-extras-commits at redhat.com
Tue Jan 8 08:12:31 UTC 2008
Author: varekova
Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6400
Modified Files:
.cvsignore busybox.spec sources
Added Files:
busybox-1.9.0-gc-section.patch busybox-1.9.0-msh.patch
Removed Files:
busybox-1.5.1-msh.patch busybox-1.8.2-gc-section.patch
Log Message:
update to 1.9.0
busybox-1.9.0-gc-section.patch:
--- NEW FILE busybox-1.9.0-gc-section.patch ---
diff -up busybox-1.9.0/scripts/trylink.sect busybox-1.9.0/scripts/trylink
--- busybox-1.9.0/scripts/trylink.sect 2007-12-21 23:00:25.000000000 +0100
+++ busybox-1.9.0/scripts/trylink 2008-01-07 11:59:14.000000000 +0100
@@ -76,7 +76,6 @@ try $CC $LDFLAGS \
-o $EXE \
-Wl,--sort-common \
$SORT_SECTION \
- -Wl,--gc-sections \
-Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
$l_list \
|| {
@@ -100,7 +99,6 @@ while test "$LDLIBS"; do
-o $EXE \
-Wl,--sort-common \
$SORT_SECTION \
- -Wl,--gc-sections \
-Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
$l_list
if test $? = 0; then
@@ -129,7 +127,6 @@ if ! test -f busybox_ldscript; then
-o $EXE \
-Wl,--sort-common \
$SORT_SECTION \
- -Wl,--gc-sections \
-Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
$l_list \
-Wl,--warn-common \
@@ -151,7 +148,6 @@ else
-o $EXE \
-Wl,--sort-common \
$SORT_SECTION \
- -Wl,--gc-sections \
-Wl,-T -Wl,busybox_ldscript \
-Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
$l_list \
@@ -207,7 +203,6 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX"
-o $EXE \
-Wl,--sort-common \
$SORT_SECTION \
- -Wl,--gc-sections \
-Wl,--start-group $O_FILES -Wl,--end-group \
-L"$sharedlib_dir" -lbusybox \
-Wl,--warn-common \
@@ -246,7 +241,6 @@ int main(int argc, char **argv)
-o $EXE \
-Wl,--sort-common \
$SORT_SECTION \
- -Wl,--gc-sections \
-L"$sharedlib_dir" -lbusybox \
-Wl,--warn-common \
|| {
diff -up busybox-1.9.0/applets/applets.c.sect busybox-1.9.0/applets/applets.c
--- busybox-1.9.0/applets/applets.c.sect 2007-12-21 23:00:32.000000000 +0100
+++ busybox-1.9.0/applets/applets.c 2008-01-07 12:00:45.000000000 +0100
@@ -10,17 +10,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 scripts/trylink and remove this warning.
-#error Aborting compilation.
-#endif
-
#if ENABLE_BUILD_LIBBUSYBOX
int main(int argc, char **argv)
{
busybox-1.9.0-msh.patch:
--- NEW FILE busybox-1.9.0-msh.patch ---
diff -up busybox-1.9.0/scripts/defconfig.pom busybox-1.9.0/scripts/defconfig
--- busybox-1.9.0/scripts/defconfig.pom 2008-01-07 12:39:03.000000000 +0100
+++ busybox-1.9.0/scripts/defconfig 2008-01-07 12:42:10.000000000 +0100
@@ -686,7 +686,7 @@ CONFIG_WATCH=y
#
CONFIG_FEATURE_SH_IS_ASH=y
# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
+CONFIG_FEATURE_SH_IS_MSH=y
# CONFIG_FEATURE_SH_IS_NONE is not set
CONFIG_ASH=y
@@ -715,7 +715,7 @@ CONFIG_ASH_RANDOM_SUPPORT=y
# CONFIG_HUSH_IF is not set
# CONFIG_HUSH_LOOPS is not set
# CONFIG_LASH is not set
-# CONFIG_MSH is not set
+CONFIG_MSH=y
#
# Bourne Shell Options
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 3 Dec 2007 10:48:58 -0000 1.20
+++ .cvsignore 8 Jan 2008 08:11:52 -0000 1.21
@@ -1 +1 @@
-busybox-1.8.2.tar.bz2
+busybox-1.9.0.tar.bz2
Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- busybox.spec 3 Dec 2007 10:48:58 -0000 1.73
+++ busybox.spec 8 Jan 2008 08:11:52 -0000 1.74
@@ -1,6 +1,6 @@
Summary: Statically linked binary providing simplified versions of system commands
Name: busybox
-Version: 1.8.2
+Version: 1.9.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2
@@ -13,8 +13,8 @@
Patch11: busybox-1.2.2-iptunnel.patch
Patch12: busybox-1.2.2-ls.patch
Patch13: busybox-1.5.1-clean.patch
-Patch14: busybox-1.5.1-msh.patch
-Patch15: busybox-1.8.2-gc-section.patch
+Patch14: busybox-1.9.0-msh.patch
+Patch15: busybox-1.9.0-gc-section.patch
URL: http://www.busybox.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libselinux-devel >= 1.27.7-2
@@ -111,6 +111,9 @@
/sbin/busybox.petitboot
%changelog
+* Mon Jan 7 2008 Ivana Varekova <varekova at redhat.com> - 1:1.9.0-1
+- update to 1.9.0
+
* Mon Dec 3 2007 Ivana Varekova <varekova at redhat.com> - 1:1.8.2-1
- update to 1.8.2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 3 Dec 2007 10:48:58 -0000 1.20
+++ sources 8 Jan 2008 08:11:52 -0000 1.21
@@ -1 +1 @@
-5794c6187c7cc8176c52b96af9bf2478 busybox-1.8.2.tar.bz2
+2a6e0df1fd2a77caa541a7e8002851cb busybox-1.9.0.tar.bz2
--- busybox-1.5.1-msh.patch DELETED ---
--- busybox-1.8.2-gc-section.patch DELETED ---
More information about the fedora-extras-commits
mailing list