OBS User unknown 2007-04-28 22:40:39 +00:00 committed by Git OBS Bridge
parent b6ab3f22ff
commit 2196c2ad2d
8 changed files with 113 additions and 65 deletions

View File

@ -1,7 +1,9 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.4.2
# Sat Apr 28 20:40:31 2007
#
HAVE_DOT_CONFIG=y
CONFIG_HAVE_DOT_CONFIG=y
#
# Busybox Settings
@ -11,20 +13,23 @@ HAVE_DOT_CONFIG=y
# General Configuration
#
# CONFIG_NITPICK is not set
CONFIG_DESKTOP=y
# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
CONFIG_SHOW_USAGE=y
CONFIG_FEATURE_VERBOSE_USAGE=y
# CONFIG_FEATURE_COMPRESS_USAGE is not set
CONFIG_FEATURE_COMPRESS_USAGE=y
# CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set
CONFIG_GETOPT_LONG=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SYSLOG=y
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
CONFIG_FEATURE_HAVE_RPC=y
# CONFIG_SELINUX is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
@ -35,10 +40,8 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_BUILD_LIBBUSYBOX is not set
# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
# CONFIG_LFS is not set
# USING_CROSS_COMPILER is not set
CROSS_COMPILER_PREFIX=""
# CONFIG_BUILD_AT_ONCE is not set
CONFIG_LFS=y
CONFIG_BUILD_AT_ONCE=y
#
# Debugging Options
@ -48,7 +51,7 @@ CROSS_COMPILER_PREFIX=""
# CONFIG_NO_DEBUG_LIB is not set
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
CONFIG_DEBUG_YANK_SUSv2=y
CONFIG_INCLUDE_SUSv2=y
#
# Installation Options
@ -57,11 +60,12 @@ CONFIG_DEBUG_YANK_SUSv2=y
CONFIG_INSTALL_APPLET_SYMLINKS=y
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
# CONFIG_INSTALL_APPLET_DONT is not set
PREFIX="./_install"
CONFIG_PREFIX="/usr"
#
# Busybox Library Tuning
#
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
#
@ -209,6 +213,7 @@ CONFIG_UUDECODE=y
CONFIG_UUENCODE=y
CONFIG_WATCH=y
CONFIG_WC=y
CONFIG_FEATURE_WC_LARGE=y
CONFIG_WHO=y
CONFIG_WHOAMI=y
CONFIG_YES=y
@ -244,6 +249,8 @@ CONFIG_LOADFONT=y
CONFIG_LOADKMAP=y
CONFIG_OPENVT=y
CONFIG_RESET=y
CONFIG_RESIZE=y
CONFIG_FEATURE_RESIZE_PRINT=y
CONFIG_SETCONSOLE=y
# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
CONFIG_SETKEYCODES=y
@ -282,6 +289,7 @@ CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
CONFIG_FEATURE_ALLOW_EXEC=y
#
# Finding Utilities
@ -333,9 +341,13 @@ CONFIG_GETTY=y
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
CONFIG_LOGIN=y
# CONFIG_LOGIN_SCRIPTS is not set
CONFIG_FEATURE_SECURETTY=y
CONFIG_PASSWD=y
# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
CONFIG_SU=y
CONFIG_FEATURE_SU_SYSLOG=y
CONFIG_FEATURE_SU_CHECKS_SHELLS=y
CONFIG_SULOGIN=y
CONFIG_VLOCK=y
@ -343,21 +355,16 @@ CONFIG_VLOCK=y
# Linux Ext2 FS Progs
#
CONFIG_CHATTR=y
CONFIG_E2FSCK=y
CONFIG_FSCK=y
CONFIG_LSATTR=y
CONFIG_MKE2FS=y
CONFIG_TUNE2FS=y
CONFIG_E2LABEL=y
CONFIG_FINDFS=y
#
# Linux Module Utilities
#
CONFIG_INSMOD=y
CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
CONFIG_FEATURE_INSMOD_LOADINKMEM=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
CONFIG_FEATURE_INSMOD_LOAD_MAP=y
CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
CONFIG_RMMOD=y
@ -365,12 +372,13 @@ CONFIG_LSMOD=y
CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
CONFIG_MODPROBE=y
CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
#
# Options common to multiple modutils
#
CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
CONFIG_FEATURE_2_4_MODULES=y
# CONFIG_FEATURE_2_4_MODULES is not set
CONFIG_FEATURE_2_6_MODULES=y
# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
@ -378,20 +386,21 @@ CONFIG_FEATURE_2_6_MODULES=y
# Linux System Utilities
#
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
# CONFIG_FEATURE_FBSET_FANCY is not set
# CONFIG_FEATURE_FBSET_READMODE is not set
CONFIG_FDFLUSH=y
CONFIG_FDFORMAT=y
# CONFIG_FDFLUSH is not set
# CONFIG_FDFORMAT is not set
# CONFIG_FDISK is not set
# FDISK_SUPPORT_LARGE_DISKS is not set
CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
# CONFIG_FEATURE_FDISK_WRITABLE is not set
# CONFIG_FEATURE_AIX_LABEL is not set
# CONFIG_FEATURE_SGI_LABEL is not set
# CONFIG_FEATURE_SUN_LABEL is not set
# CONFIG_FEATURE_OSF_LABEL is not set
# CONFIG_FEATURE_FDISK_ADVANCED is not set
CONFIG_FREERAMDISK=y
# CONFIG_FREERAMDISK is not set
# CONFIG_FSCK_MINIX is not set
# CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set
@ -412,7 +421,10 @@ CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
CONFIG_FEATURE_MOUNT_CIFS=y
CONFIG_FEATURE_MOUNT_FLAGS=y
CONFIG_FEATURE_MOUNT_FSTAB=y
# CONFIG_PIVOT_ROOT is not set
CONFIG_RDATE=y
CONFIG_READPROFILE=y
# CONFIG_SETARCH is not set
@ -431,7 +443,7 @@ CONFIG_FEATURE_MTAB_SUPPORT=y
# Miscellaneous Utilities
#
CONFIG_ADJTIMEX=y
CONFIG_BBCONFIG=y
# CONFIG_BBCONFIG is not set
CONFIG_CROND=y
# CONFIG_DEBUG_CROND_OPTION is not set
CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
@ -445,6 +457,7 @@ CONFIG_DC=y
CONFIG_EJECT=y
CONFIG_LAST=y
CONFIG_LESS=y
CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
CONFIG_FEATURE_LESS_FLAGS=y
CONFIG_FEATURE_LESS_FLAGCS=y
@ -462,11 +475,15 @@ CONFIG_MAKEDEVS=y
CONFIG_FEATURE_MAKEDEVS_TABLE=y
CONFIG_MOUNTPOINT=y
CONFIG_MT=y
# CONFIG_NMETER is not set
CONFIG_RAIDAUTORUN=y
# CONFIG_READAHEAD is not set
CONFIG_RUNLEVEL=y
CONFIG_RX=y
CONFIG_STRINGS=y
CONFIG_SETSID=y
CONFIG_TASKSET=y
CONFIG_FEATURE_TASKSET_FANCY=y
CONFIG_TIME=y
CONFIG_WATCHDOG=y
@ -474,6 +491,7 @@ CONFIG_WATCHDOG=y
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
CONFIG_ARP=y
CONFIG_ARPING=y
CONFIG_DNSD=y
CONFIG_ETHER_WAKE=y
@ -483,7 +501,6 @@ CONFIG_FTPPUT=y
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
CONFIG_HOSTNAME=y
# CONFIG_HTTPD is not set
# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
# CONFIG_FEATURE_HTTPD_SETUID is not set
# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@ -502,6 +519,7 @@ CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
CONFIG_IFUPDOWN=y
CONFIG_FEATURE_IFUPDOWN_IP=y
CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
CONFIG_FEATURE_IFUPDOWN_IPV4=y
CONFIG_FEATURE_IFUPDOWN_IPV6=y
CONFIG_FEATURE_IFUPDOWN_IPX=y
@ -518,17 +536,20 @@ CONFIG_FEATURE_IP_ADDRESS=y
CONFIG_FEATURE_IP_LINK=y
CONFIG_FEATURE_IP_ROUTE=y
CONFIG_FEATURE_IP_TUNNEL=y
CONFIG_FEATURE_IP_RULE=y
CONFIG_FEATURE_IP_SHORT_FORMS=y
CONFIG_IPADDR=y
CONFIG_IPLINK=y
CONFIG_IPROUTE=y
CONFIG_IPTUNNEL=y
CONFIG_IPRULE=y
CONFIG_IPCALC=y
CONFIG_FEATURE_IPCALC_FANCY=y
CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
CONFIG_NAMEIF=y
CONFIG_NC=y
CONFIG_NC_GAPING_SECURITY_HOLE=y
CONFIG_NC_SERVER=y
CONFIG_NC_EXTRA=y
CONFIG_NETSTAT=y
CONFIG_NSLOOKUP=y
CONFIG_PING=y
@ -540,7 +561,7 @@ CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
CONFIG_TELNETD=y
CONFIG_FEATURE_TELNETD_INETD=y
CONFIG_FEATURE_TELNETD_STANDALONE=y
CONFIG_TFTP=y
CONFIG_FEATURE_TFTP_GET=y
CONFIG_FEATURE_TFTP_PUT=y
@ -550,13 +571,10 @@ CONFIG_TRACEROUTE=y
CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
#
# udhcp Server/Client
#
# CONFIG_APP_UDHCPD is not set
CONFIG_APP_UDHCPC=y
# CONFIG_APP_DHCPRELAY is not set
# CONFIG_APP_DUMPLEASES is not set
CONFIG_APP_UDHCPC=y
# CONFIG_FEATURE_UDHCP_SYSLOG is not set
# CONFIG_FEATURE_UDHCP_DEBUG is not set
CONFIG_VCONFIG=y
@ -574,6 +592,7 @@ CONFIG_FREE=y
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
CONFIG_KILLALL5=y
CONFIG_PIDOF=y
CONFIG_FEATURE_PIDOF_SINGLE=y
CONFIG_FEATURE_PIDOF_OMIT=y
@ -636,8 +655,21 @@ CONFIG_SYSLOGD=y
CONFIG_FEATURE_ROTATE_LOGFILE=y
# CONFIG_FEATURE_REMOTE_LOG is not set
# CONFIG_FEATURE_IPC_SYSLOG is not set
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
# CONFIG_LOGREAD is not set
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
CONFIG_KLOGD=y
CONFIG_LOGGER=y
#
# Runit Utilities
#
# CONFIG_RUNSV is not set
# CONFIG_RUNSVDIR is not set
# CONFIG_SV is not set
CONFIG_SVLOGD=y
# CONFIG_CHPST is not set
# CONFIG_SETUIDGID is not set
# CONFIG_ENVUIDGID is not set
# CONFIG_ENVDIR is not set
# CONFIG_SOFTLIMIT is not set

View File

@ -1,12 +0,0 @@
--- x/coreutils/dd.c
+++ y/coreutils/dd.c
@@ -30,6 +30,9 @@
#include <signal.h> // For FEATURE_DD_SIGNAL_HANDLING
#include "busybox.h"
+#ifdef __x86_64
+#undef ftruncate
+#endif
static const struct suffix_mult dd_suffixes[] = {
{ "c", 1 },
{ "w", 2 },

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4de9fb2bb018e381e64199b38d90cb25e71366c37a8995e9ab5ed206ebcb972f
size 1417198

3
busybox-1.4.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da1a9b1c9e210e3e129ab8a3b4e6af2fe093673e3f60722931e2c722d4c29b0f
size 1509690

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Apr 28 21:32:57 CEST 2007 - olh@suse.de
- update to 1.4.2
reduces binary size after e2fsprogs removal
-------------------------------------------------------------------
Wed Dec 6 17:41:32 CET 2006 - trenn@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package busybox (Version 1.2.2)
# spec file for package busybox (Version 1.4.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -13,7 +13,7 @@
Name: busybox
BuildRequires: dietlibc
URL: http://www.busybox.net/
Version: 1.2.2
Version: 1.4.2
Release: 1
Summary: The Swiss Army Knife of Embedded Linux
License: GNU General Public License (GPL)
@ -21,8 +21,8 @@ Group: System/Base
Autoreqprov: on
Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2
Source2: SuSE.config
Patch0: busybox.taskset-range.patch
Patch1: install.patch
Patch2: amd64-hack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -44,22 +44,18 @@ Authors:
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
cp -av %{S:2} .config
%ifarch ia64 x86_64
echo CONFIG_FEATURE_2_4_MODULES=n >> .config
%endif
%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 -n 2>&1 > /tmp/make.log
make -e oldconfig
# strace -o /tmp/abc -f make
make -e
make -e %{?jobs:-j%jobs}
make -e doc busybox.links %{?jobs:-j%jobs}
%install
find -name ".cvsignore" -exec rm {} \;
@ -81,7 +77,10 @@ install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT%_mandir/man1
%dir /usr/share/busybox
%config /usr/share/busybox/busybox.links
%changelog -n busybox
%changelog
* Sat Apr 28 2007 - olh@suse.de
- update to 1.4.2
reduces binary size after e2fsprogs removal
* Wed Dec 06 2006 - trenn@suse.de
- move to 1.2.2 and enable nearly everything.
Most important (awk,less,vi and much more)

View File

@ -0,0 +1,17 @@
---
miscutils/taskset.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: busybox-1.4.2/miscutils/taskset.c
===================================================================
--- busybox-1.4.2.orig/miscutils/taskset.c
+++ busybox-1.4.2/miscutils/taskset.c
@@ -62,7 +62,7 @@ int taskset_main(int argc, char** argv)
aff = *++argv; /* <aff> <cmd...> */
if (aff) {
unsigned i = 0;
- unsigned long l = xstrtol_range(aff, 16, 1, ULONG_MAX);
+ unsigned long l = xstrtol_range(aff, 0, 1, LONG_MAX);
CPU_ZERO(&new_mask);
while (i < CPU_SETSIZE && l >= (1<<i)) {

View File

@ -1,8 +1,14 @@
--- x/applets/install.sh
+++ y/applets/install.sh
@@ -8,7 +8,7 @@
echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks]"
exit 1;
---
applets/install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: busybox-1.4.2/applets/install.sh
===================================================================
--- busybox-1.4.2.orig/applets/install.sh
+++ busybox-1.4.2/applets/install.sh
@@ -8,7 +8,7 @@ if [ -z "$prefix" ]; then
echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks]"
exit 1;
fi
-h=`sort busybox.links | uniq`
+h=`sort /usr/share/busybox/busybox.links | uniq`