Changeset 0171693 in clfs-embedded

Timestamp:

Mar 31, 2011, 4:39:57 AM (14 years ago)

Author:

Andrew Bradford <bradfa@…>

Branches:

master

Children:

f4b0bd8

Parents:

1b109e6

git-author:

Andrew Bradford <bradfa@…> (03/30/11 04:55:49)

git-committer:

Andrew Bradford <bradfa@…> (03/31/11 04:39:57)

Message:

Updated BusyBox to version 1.18.4

Simply commented out the fixes patch info since there will be patches
to fix things in the future and editing existing info is more
straightforward than putting new info in.

Updated config patch is based off the 1.17.3 patch from Joe.

Files:

• BOOK/final-system/common/busybox.xml (modified) (1 diff)
• BOOK/materials/common/patches.xml (modified) (2 diffs)
• BOOK/packages.ent (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/busybox-1.18.4-config-1.patch (moved) (moved from patches/busybox-1.17.3-config-1.patch ) (29 diffs)

BOOK/final-system/common/busybox.xml

@@ -31 +31 @@
     <title>Installation of Busybox</title>
 
+<!-- Version 1.18.4 does not require any "fixes" patch, none exists, yet
     <para os="p1">The following patch contains a number of fixes to version
     &busybox-version; by the Busybox developers:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
+-->
 
     <para os="a">The following patch contains a default configuration for busybox:</para>

BOOK/materials/common/patches.xml

@@ -28 +28 @@
     </varlistentry>
 
+<!--
     <varlistentry>
       <term>Busybox Fixes Patch - <token>&busybox-fixes-patch-size;</token>:</term>
@@ -36 +37 @@
       </listitem>
     </varlistentry>
+-->
 
     <varlistentry>

BOOK/packages.ent

@@ -11 +11 @@
 <!ENTITY binutils-home "http://sourceware.org/binutils/">
 
-<!ENTITY busybox-version "1.17.3">
-<!ENTITY busybox-size "2,048 KB">
+<!ENTITY busybox-version "1.18.4">
+<!ENTITY busybox-size "2,081 KB">
 <!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2">
-<!ENTITY busybox-md5 "a2ce1a951571da8c6e0eaf75b1acef60">
+<!ENTITY busybox-md5 "b03c5b46ced732679e525a920a1a62f5">
 <!ENTITY busybox-home "http://www.busybox.net">
 

BOOK/patches.ent

@@ -9 +9 @@
 <!ENTITY busybox-config-patch-size "4 KB">
 
+<!--
 <!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
 <!ENTITY busybox-fixes-patch-md5 "64bee07ba3efbb512fb4f348e814bf31">
 <!ENTITY busybox-fixes-patch-size "4 KB">
+-->
 
 <!ENTITY iana-etc-update-patch "iana-etc-&iana-etc-version;-update-1.patch">

patches/busybox-1.18.4-config-1.patch

@@ -1 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2010-11-28
-Initial Package Version: 0.17.3
-Origin: Joe Ciccone
+Submitted By: Andrew Bradford <bradfa@gmail.com>
+Date: 2011-03-31
+Initial Package Version: 1.18.4
+Origin: Andrew Bradford, Joe Ciccone
 Upstream Status: None - CLFS Specific
-Description: Default configuration for CLFS builds of BusyBox
+Description: Default configuration for CLFS builds of BusyBox.
+             A modified version of Joe's 1.17.3 patch.
 
-diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
---- busybox-1.17.3.orig/clfs/config     1969-12-31 19:00:00.000000000 -0500
-+++ busybox-1.17.3/clfs/config  2010-11-28 11:15:17.074781789 -0500
-@@ -0,0 +1,970 @@
+diff -Naur busybox-1.18.4.orig/clfs/config busybox-1.18.4/clfs/config
+--- busybox-1.18.4.orig/clfs/config     1969-12-31 19:00:00.000000000 -0500
++++ busybox-1.18.4/clfs/config  2011-03-31 07:04:13.000000000 -0400
+@@ -0,0 +1,990 @@
 +#
 +# Automatically generated make config: don't edit
-+# Busybox version: 1.17.3
-+# Sun Nov 28 11:13:16 2010
++# Busybox version: 1.18.4
++# Thu Mar 31 06:49:24 2011
 +#
 +CONFIG_HAVE_DOT_CONFIG=y
@@ -28 +29 @@
 +# CONFIG_INCLUDE_SUSv2 is not set
 +# CONFIG_USE_PORTABLE_CODE is not set
++CONFIG_PLATFORM_LINUX=y
 +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
@@ -35 +37 @@
 +CONFIG_FEATURE_COMPRESS_USAGE=y
 +CONFIG_FEATURE_INSTALLER=y
++# CONFIG_INSTALL_NO_USR is not set
 +# CONFIG_LOCALE_SUPPORT is not set
 +CONFIG_UNICODE_SUPPORT=y
@@ -49 +52 @@
 +CONFIG_FEATURE_DEVPTS=y
 +# CONFIG_FEATURE_CLEAN_UP is not set
++CONFIG_FEATURE_WTMP=y
 +CONFIG_FEATURE_UTMP=y
-+CONFIG_FEATURE_WTMP=y
 +CONFIG_FEATURE_PIDFILE=y
 +CONFIG_FEATURE_SUID=y
@@ -85 +88 @@
 +
 +#
-+# Installation Options
-+#
-+# CONFIG_INSTALL_NO_USR is not set
++# Installation Options ("make install" behavior)
++#
 +# CONFIG_INSTALL_APPLET_SYMLINKS is not set
 +# CONFIG_INSTALL_APPLET_HARDLINKS is not set
@@ -104 +106 @@
 +CONFIG_FEATURE_FAST_TOP=y
 +# CONFIG_FEATURE_ETC_NETWORKS is not set
++CONFIG_FEATURE_USE_TERMIOS=y
 +CONFIG_FEATURE_EDITING=y
 +CONFIG_FEATURE_EDITING_MAX_LEN=1024
@@ -184 +187 @@
 +CONFIG_FEATURE_TR_CLASSES=y
 +CONFIG_FEATURE_TR_EQUIV=y
++CONFIG_BASE64=y
 +CONFIG_CAL=y
 +CONFIG_CATV=y
@@ -358 +362 @@
 +# Editors
 +#
++CONFIG_PATCH=y
 +CONFIG_AWK=y
 +CONFIG_FEATURE_AWK_LIBM=y
@@ -365 +370 @@
 +CONFIG_FEATURE_DIFF_DIR=y
 +# CONFIG_ED is not set
-+CONFIG_PATCH=y
 +CONFIG_SED=y
 +CONFIG_VI=y
@@ -425 +429 @@
 +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
 +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
++CONFIG_HALT=y
++# CONFIG_FEATURE_CALL_TELINIT is not set
++CONFIG_TELINIT_PATH=""
 +CONFIG_INIT=y
 +CONFIG_FEATURE_USE_INITTAB=y
@@ -434 +441 @@
 +# CONFIG_FEATURE_INIT_COREDUMPS is not set
 +# CONFIG_FEATURE_INITRD is not set
-+CONFIG_HALT=y
-+# CONFIG_FEATURE_CALL_TELINIT is not set
-+CONFIG_TELINIT_PATH=""
++CONFIG_INIT_TERMINAL_TYPE="linux"
 +CONFIG_MESG=y
 +
@@ -442 +447 @@
 +# Login/Password Management Utilities
 +#
++# CONFIG_ADD_SHELL is not set
++# CONFIG_REMOVE_SHELL is not set
 +CONFIG_FEATURE_SHADOWPASSWDS=y
 +CONFIG_USE_BB_PWD_GRP=y
@@ -447 +454 @@
 +CONFIG_USE_BB_CRYPT=y
 +CONFIG_USE_BB_CRYPT_SHA=y
++CONFIG_ADDUSER=y
++CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
++# CONFIG_FEATURE_CHECK_NAMES is not set
++CONFIG_FIRST_SYSTEM_ID=100
++CONFIG_LAST_SYSTEM_ID=999
 +CONFIG_ADDGROUP=y
 +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
 +CONFIG_FEATURE_ADDUSER_TO_GROUP=y
++CONFIG_DELUSER=y
 +CONFIG_DELGROUP=y
 +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-+# CONFIG_FEATURE_CHECK_NAMES is not set
-+CONFIG_ADDUSER=y
-+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
-+CONFIG_FIRST_SYSTEM_ID=100
-+CONFIG_LAST_SYSTEM_ID=999
-+CONFIG_DELUSER=y
 +CONFIG_GETTY=y
 +CONFIG_LOGIN=y
@@ -516 +523 @@
 +# Linux System Utilities
 +#
++CONFIG_BLOCKDEV=y
 +CONFIG_REV=y
 +# CONFIG_ACPID is not set
@@ -534 +542 @@
 +# CONFIG_FEATURE_SUN_LABEL is not set
 +# CONFIG_FEATURE_OSF_LABEL is not set
++# CONFIG_FEATURE_GPT_LABEL is not set
 +CONFIG_FEATURE_FDISK_ADVANCED=y
 +CONFIG_FINDFS=y
@@ -566 +575 @@
 +CONFIG_FEATURE_MKSWAP_UUID=y
 +CONFIG_MORE=y
-+CONFIG_FEATURE_USE_TERMIOS=y
 +CONFIG_MOUNT=y
 +CONFIG_FEATURE_MOUNT_FAKE=y
@@ -604 +612 @@
 +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-+# CONFIG_FEATURE_VOLUMEID_FAT is not set
++CONFIG_FEATURE_VOLUMEID_FAT=y
 +# CONFIG_FEATURE_VOLUMEID_HFS is not set
 +# CONFIG_FEATURE_VOLUMEID_JFS is not set
@@ -623 +631 @@
 +#
 +# CONFIG_CONSPY is not set
++CONFIG_NANDWRITE=y
++CONFIG_NANDDUMP=y
 +# CONFIG_UBIATTACH is not set
 +# CONFIG_UBIDETACH is not set
 +CONFIG_ADJTIMEX=y
 +# CONFIG_BBCONFIG is not set
++# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 +# CONFIG_BEEP is not set
 +CONFIG_FEATURE_BEEP_FREQ=0
@@ -655 +666 @@
 +CONFIG_FEATURE_EJECT_SCSI=y
 +# CONFIG_FBSPLASH is not set
-+# CONFIG_FLASHCP is not set
-+# CONFIG_FLASH_LOCK is not set
-+# CONFIG_FLASH_UNLOCK is not set
-+# CONFIG_FLASH_ERASEALL is not set
++CONFIG_FLASHCP=y
++CONFIG_FLASH_LOCK=y
++CONFIG_FLASH_UNLOCK=y
++CONFIG_FLASH_ERASEALL=y
 +# CONFIG_IONICE is not set
 +CONFIG_INOTIFYD=y
@@ -706 +717 @@
 +# Networking Utilities
 +#
++CONFIG_NBDCLIENT=y
 +# CONFIG_NC is not set
 +# CONFIG_NC_SERVER is not set
@@ -741 +753 @@
 +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 +# CONFIG_FEATURE_HTTPD_PROXY is not set
++# CONFIG_FEATURE_HTTPD_GZIP is not set
 +CONFIG_IFCONFIG=y
 +CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -820 +833 @@
 +CONFIG_TUNCTL=y
 +# CONFIG_FEATURE_TUNCTL_UG is not set
-+CONFIG_UDHCPD=y
-+CONFIG_DHCPRELAY=y
-+CONFIG_DUMPLEASES=y
++# CONFIG_UDHCPD is not set
++# CONFIG_DHCPRELAY is not set
++# CONFIG_DUMPLEASES is not set
 +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 +CONFIG_DHCPD_LEASES_FILE=""
@@ -828 +841 @@
 +CONFIG_FEATURE_UDHCPC_ARPING=y
 +CONFIG_FEATURE_UDHCP_PORT=y
-+CONFIG_UDHCP_DEBUG=0
++CONFIG_UDHCP_DEBUG=1
 +CONFIG_FEATURE_UDHCP_RFC3397=y
 +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
@@ -839 +852 @@
 +CONFIG_FEATURE_WGET_AUTHENTICATION=y
 +CONFIG_FEATURE_WGET_LONG_OPTIONS=y
++CONFIG_FEATURE_WGET_TIMEOUT=y
 +# CONFIG_ZCIP is not set
 +
@@ -862 +876 @@
 +# Process Utilities
 +#
++CONFIG_IOSTAT=y
++CONFIG_MPSTAT=y
++CONFIG_PMAP=y
++CONFIG_POWERTOP=y
 +CONFIG_SMEMCAP=y
 +CONFIG_FREE=y
@@ -938 +956 @@
 +CONFIG_ASH_RANDOM_SUPPORT=y
 +CONFIG_ASH_EXPAND_PRMT=y
++CONFIG_CTTYHACK=y
 +CONFIG_HUSH=y
 +CONFIG_HUSH_BASH_COMPAT=y
++CONFIG_HUSH_BRACE_EXPANSION=y
 +CONFIG_HUSH_HELP=y
 +CONFIG_HUSH_INTERACTIVE=y
++CONFIG_HUSH_SAVEHISTORY=y
 +CONFIG_HUSH_JOB=y
 +CONFIG_HUSH_TICK=y
@@ -949 +970 @@
 +CONFIG_HUSH_FUNCTIONS=y
 +CONFIG_HUSH_LOCAL=y
++CONFIG_HUSH_RANDOM_SUPPORT=y
 +CONFIG_HUSH_EXPORT_N=y
-+CONFIG_HUSH_RANDOM_SUPPORT=y
++CONFIG_HUSH_MODE_X=y
++# CONFIG_MSH is not set
 +CONFIG_FEATURE_SH_IS_ASH=y
 +# CONFIG_FEATURE_SH_IS_HUSH is not set
 +# CONFIG_FEATURE_SH_IS_NONE is not set
-+# CONFIG_FEATURE_BASH_IS_ASH is not set
++CONFIG_FEATURE_BASH_IS_ASH=y
 +# CONFIG_FEATURE_BASH_IS_HUSH is not set
-+CONFIG_FEATURE_BASH_IS_NONE=y
-+# CONFIG_LASH is not set
-+# CONFIG_MSH is not set
++# CONFIG_FEATURE_BASH_IS_NONE is not set
 +CONFIG_SH_MATH_SUPPORT=y
 +# CONFIG_SH_MATH_SUPPORT_64 is not set
@@ -964 +985 @@
 +# CONFIG_FEATURE_SH_STANDALONE is not set
 +# CONFIG_FEATURE_SH_NOFORK is not set
-+CONFIG_CTTYHACK=y
 +
 +#
@@ -979 +999 @@
 +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
 +CONFIG_KLOGD=y
++CONFIG_FEATURE_KLOGD_KLOGCTL=y
 +CONFIG_LOGGER=y