From 45338094224b8c432722b988f18e7ed24120dc536d8f3c0da24835053dee0f6a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 9 Jan 2009 01:22:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=12 --- busybox-1.12.1.tar.bz2 | 3 -- busybox-1.12.3.tar.bz2 | 3 ++ busybox-static.changes | 11 +++++ busybox-static.spec | 88 ++++++++++++++++++++++++++++++++++ busybox.SuSE.config | 14 +++--- busybox.changes | 12 +++++ busybox.spec | 25 ++++++---- busybox.uClibc-build-fix.patch | 17 +++++++ 8 files changed, 153 insertions(+), 20 deletions(-) delete mode 100644 busybox-1.12.1.tar.bz2 create mode 100644 busybox-1.12.3.tar.bz2 create mode 100644 busybox-static.changes create mode 100644 busybox-static.spec create mode 100644 busybox.uClibc-build-fix.patch diff --git a/busybox-1.12.1.tar.bz2 b/busybox-1.12.1.tar.bz2 deleted file mode 100644 index 47938a2..0000000 --- a/busybox-1.12.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80829f38d719879dcf01db6251015c8aea2567a382dad463f65d2299447e949b -size 2022321 diff --git a/busybox-1.12.3.tar.bz2 b/busybox-1.12.3.tar.bz2 new file mode 100644 index 0000000..64d8481 --- /dev/null +++ b/busybox-1.12.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3efe4b35761301f47569dfeabc87f2c88df2a377647ce69c17279f150e776d24 +size 2022776 diff --git a/busybox-static.changes b/busybox-static.changes new file mode 100644 index 0000000..df4e3ab --- /dev/null +++ b/busybox-static.changes @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 18 11:35:49 CET 2008 - sassmann@suse.de + +- update to 1.12.3 bugfix release + * has fixes for option parsing and line editing + +------------------------------------------------------------------- +Tue Nov 4 14:00:43 CET 2008 - sassmann@suse.de + +- initial release of busybox-static (version 1.12.1) + diff --git a/busybox-static.spec b/busybox-static.spec new file mode 100644 index 0000000..b2e79b7 --- /dev/null +++ b/busybox-static.spec @@ -0,0 +1,88 @@ +# +# spec file for package busybox-static (Version 1.12.3) +# +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + + +Name: busybox-static +Url: http://www.busybox.net/ +Version: 1.12.3 +Release: 2 +Summary: The Swiss Army Knife of Embedded Linux +License: GPL v2 or later +Group: System/Base +AutoReqProv: on +Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2 +Source2: busybox.SuSE.config +Source3: mkinitrd-setup.sh +Source4: mkinitrd-boot.sh +Patch1: busybox.uClibc-build-fix.patch +Patch100: busybox.install.patch +Patch101: busybox.libunarchive-array.patch +Patch102: busybox.dmesg-size.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: uClibc-devel +ExcludeArch: s390 s390x ppc64 + +%description +BusyBox combines tiny versions of many common UNIX utilities into a +small single executable. It provides minimalist replacements for most +of the utilities usually found in fileutils, shellutils, findutils, +textutils, grep, gzip, tar, and more. BusyBox provides a fairly +complete POSIX environment for any small or embedded system. The +utilities in BusyBox generally have fewer options than their +full-featured GNU cousins. The options that are included provide the +expected functionality and behave very much like their GNU +counterparts. + + + +Authors: +-------- + Erik B. Andersen + +%prep +%setup -q -n busybox-%{version} +%patch1 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 + +%build +cp -avL %{S:2} .config +find -name CVS | xargs rm -rf +find -name .svn | xargs rm -rf +export VERBOSE=-v +export BUILD_VERBOSE=2 +make -e oldconfig +make -e CC=gcc-uClibc %{?jobs:-j%jobs} + +%install +find -name ".cvsignore" -exec rm {} \; +install -d $RPM_BUILD_ROOT/usr/bin +install busybox $RPM_BUILD_ROOT/usr/bin/busybox-static + +%files +%defattr(-,root,root) +/usr/bin/busybox-static + +%changelog +* Thu Dec 18 2008 sassmann@suse.de +- update to 1.12.3 bugfix release + * has fixes for option parsing and line editing +* Tue Nov 04 2008 sassmann@suse.de +- initial release of busybox-static (version 1.12.1) diff --git a/busybox.SuSE.config b/busybox.SuSE.config index 706e8ee..a3c300b 100644 --- a/busybox.SuSE.config +++ b/busybox.SuSE.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.12.1 -# Wed Oct 15 12:33:48 2008 +# Tue Nov 4 12:57:27 2008 # CONFIG_HAVE_DOT_CONFIG=y @@ -30,7 +30,7 @@ CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -CONFIG_SELINUX=y +# CONFIG_SELINUX is not set # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y @@ -282,10 +282,10 @@ CONFIG_RESIZE=y CONFIG_FEATURE_RESIZE_PRINT=y CONFIG_SETCONSOLE=y # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETFONT is not set +CONFIG_SETFONT=y CONFIG_SETKEYCODES=y CONFIG_SETLOGCONS=y -# CONFIG_SHOWKEY is not set +CONFIG_SHOWKEY=y # # Debian Utilities @@ -462,9 +462,9 @@ CONFIG_FBSET=y # CONFIG_FEATURE_FBSET_READMODE is not set # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set +CONFIG_FDISK=y CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set +CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set @@ -698,7 +698,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_TELNETD=y CONFIG_FEATURE_TELNETD_STANDALONE=y CONFIG_TFTP=y -# CONFIG_TFTPD is not set +CONFIG_TFTPD=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y diff --git a/busybox.changes b/busybox.changes index d2c863c..dc50b97 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Dec 18 11:35:49 CET 2008 - sassmann@suse.de + +- update to 1.12.3 bugfix release + * has fixes for option parsing and line editing + +------------------------------------------------------------------- +Tue Nov 4 14:01:23 CET 2008 - sassmann@suse.de + +- updated config file to use a single config for + both busybox and busybox-static + ------------------------------------------------------------------- Wed Oct 15 14:17:15 CEST 2008 - sassmann@suse.de diff --git a/busybox.spec b/busybox.spec index 944e0a1..6419132 100644 --- a/busybox.spec +++ b/busybox.spec @@ -1,7 +1,7 @@ # -# spec file for package busybox (Version 1.12.1) +# spec file for package busybox (Version 1.12.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,9 @@ Name: busybox -BuildRequires: libselinux-devel Url: http://www.busybox.net/ -Version: 1.12.1 -Release: 1 +Version: 1.12.3 +Release: 2 Summary: The Swiss Army Knife of Embedded Linux License: GPL v2 or later Group: System/Base @@ -104,6 +103,12 @@ exit 0 /lib/mkinitrd/scripts/boot-busybox.sh %changelog +* Thu Dec 18 2008 sassmann@suse.de +- update to 1.12.3 bugfix release + * has fixes for option parsing and line editing +* Tue Nov 04 2008 sassmann@suse.de +- updated config file to use a single config for + both busybox and busybox-static * Wed Oct 15 2008 sassmann@suse.de - update to 1.12.1 see http://www.busybox.net/ for full changelog @@ -168,13 +173,13 @@ exit 0 * Thu May 12 2005 uli@suse.de - use dietlibc on ARM - uclibc config file needs to be fixed -* Sat Apr 02 2005 mmj@suse.de +* Fri Apr 01 2005 mmj@suse.de - Correct function declaration * Mon Jan 24 2005 nashif@suse.de - Update to 1.00 final * Tue Aug 17 2004 nashif@suse.de - Update to 1.00-rc3 -* Fri Aug 06 2004 nashif@suse.de +* Thu Aug 05 2004 nashif@suse.de - Update to 1.00-rc2 * Wed Jul 21 2004 nashif@suse.de - Update to 1.00-rc1 @@ -186,7 +191,7 @@ exit 0 - Update to 1.0 pre 8 * Wed Feb 11 2004 ro@suse.de - hack to build it on amd64 -* Wed Feb 11 2004 schwab@suse.de +* Tue Feb 10 2004 schwab@suse.de - Fix building on ia64. * Wed Feb 04 2004 kukuk@suse.de - Remove wrong dietlibc requires @@ -224,7 +229,7 @@ exit 0 - Rewrite of tftp * Sat Aug 04 2001 nashif@suse.de - Update to version 0.60.0 -* Fri Jul 13 2001 nashif@suse.de +* Thu Jul 12 2001 nashif@suse.de - Update to version 0.52 * Wed Apr 11 2001 nashif@suse.de - Update to version 0.51 @@ -236,7 +241,7 @@ exit 0 - disabled insmod for all archs except IA32, ARM and SH * Tue Dec 19 2000 nashif@suse.de - Update to 0.48 (Fixes many bugs) -* Tue Nov 28 2000 nashif@suse.de +* Mon Nov 27 2000 nashif@suse.de - Fixed pathes in install script * Tue Nov 07 2000 nashif@suse.de - Added EM_486 and OPEN_MAX fixes diff --git a/busybox.uClibc-build-fix.patch b/busybox.uClibc-build-fix.patch new file mode 100644 index 0000000..6b8a99e --- /dev/null +++ b/busybox.uClibc-build-fix.patch @@ -0,0 +1,17 @@ +--- + scripts/trylink | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/scripts/trylink ++++ b/scripts/trylink +@@ -81,7 +81,9 @@ CFLAGS="$3" + LDFLAGS="$4" + O_FILES="$5" + A_FILES="$6" +-LDLIBS="$7" ++# no extra libraries for uClibc linking ++#LDLIBS="$7" ++LDLIBS= + + # The --sort-section option is not supported by older versions of ld + SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`