Changeset 0171693 in clfs-embedded


Ignore:
Timestamp:
Mar 31, 2011, 4:39:57 AM (12 years ago)
Author:
Andrew Bradford <bradfa@…>
Branches:
master
Children:
f4b0bd8
Parents:
1b109e6
git-author:
Andrew Bradford <bradfa@…> (03/30/2011 04:55:49 AM)
git-committer:
Andrew Bradford <bradfa@…> (03/31/2011 04:39:57 AM)
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:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/busybox.xml

    r1b109e6 r0171693  
    3131    <title>Installation of Busybox</title>
    3232
     33<!-- Version 1.18.4 does not require any "fixes" patch, none exists, yet
    3334    <para os="p1">The following patch contains a number of fixes to version
    3435    &busybox-version; by the Busybox developers:</para>
    3536
    3637<screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
     38-->
    3739
    3840    <para os="a">The following patch contains a default configuration for busybox:</para>
  • BOOK/materials/common/patches.xml

    r1b109e6 r0171693  
    2828    </varlistentry>
    2929
     30<!--
    3031    <varlistentry>
    3132      <term>Busybox Fixes Patch - <token>&busybox-fixes-patch-size;</token>:</term>
     
    3637      </listitem>
    3738    </varlistentry>
     39-->
    3840
    3941    <varlistentry>
  • BOOK/packages.ent

    r1b109e6 r0171693  
    1111<!ENTITY binutils-home "http://sourceware.org/binutils/">
    1212
    13 <!ENTITY busybox-version "1.17.3">
    14 <!ENTITY busybox-size "2,048 KB">
     13<!ENTITY busybox-version "1.18.4">
     14<!ENTITY busybox-size "2,081 KB">
    1515<!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2">
    16 <!ENTITY busybox-md5 "a2ce1a951571da8c6e0eaf75b1acef60">
     16<!ENTITY busybox-md5 "b03c5b46ced732679e525a920a1a62f5">
    1717<!ENTITY busybox-home "http://www.busybox.net">
    1818
  • BOOK/patches.ent

    r1b109e6 r0171693  
    99<!ENTITY busybox-config-patch-size "4 KB">
    1010
     11<!--
    1112<!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
    1213<!ENTITY busybox-fixes-patch-md5 "64bee07ba3efbb512fb4f348e814bf31">
    1314<!ENTITY busybox-fixes-patch-size "4 KB">
     15-->
    1416
    1517<!ENTITY iana-etc-update-patch "iana-etc-&iana-etc-version;-update-1.patch">
  • patches/busybox-1.18.4-config-1.patch

    r1b109e6 r0171693  
    1 Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 2010-11-28
    3 Initial Package Version: 0.17.3
    4 Origin: Joe Ciccone
     1Submitted By: Andrew Bradford <bradfa@gmail.com>
     2Date: 2011-03-31
     3Initial Package Version: 1.18.4
     4Origin: Andrew Bradford, Joe Ciccone
    55Upstream Status: None - CLFS Specific
    6 Description: Default configuration for CLFS builds of BusyBox
     6Description: Default configuration for CLFS builds of BusyBox.
     7             A modified version of Joe's 1.17.3 patch.
    78
    8 diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
    9 --- busybox-1.17.3.orig/clfs/config     1969-12-31 19:00:00.000000000 -0500
    10 +++ busybox-1.17.3/clfs/config  2010-11-28 11:15:17.074781789 -0500
    11 @@ -0,0 +1,970 @@
     9diff -Naur busybox-1.18.4.orig/clfs/config busybox-1.18.4/clfs/config
     10--- busybox-1.18.4.orig/clfs/config     1969-12-31 19:00:00.000000000 -0500
     11+++ busybox-1.18.4/clfs/config  2011-03-31 07:04:13.000000000 -0400
     12@@ -0,0 +1,990 @@
    1213+#
    1314+# Automatically generated make config: don't edit
    14 +# Busybox version: 1.17.3
    15 +# Sun Nov 28 11:13:16 2010
     15+# Busybox version: 1.18.4
     16+# Thu Mar 31 06:49:24 2011
    1617+#
    1718+CONFIG_HAVE_DOT_CONFIG=y
     
    2829+# CONFIG_INCLUDE_SUSv2 is not set
    2930+# CONFIG_USE_PORTABLE_CODE is not set
     31+CONFIG_PLATFORM_LINUX=y
    3032+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
    3133+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
     
    3537+CONFIG_FEATURE_COMPRESS_USAGE=y
    3638+CONFIG_FEATURE_INSTALLER=y
     39+# CONFIG_INSTALL_NO_USR is not set
    3740+# CONFIG_LOCALE_SUPPORT is not set
    3841+CONFIG_UNICODE_SUPPORT=y
     
    4952+CONFIG_FEATURE_DEVPTS=y
    5053+# CONFIG_FEATURE_CLEAN_UP is not set
     54+CONFIG_FEATURE_WTMP=y
    5155+CONFIG_FEATURE_UTMP=y
    52 +CONFIG_FEATURE_WTMP=y
    5356+CONFIG_FEATURE_PIDFILE=y
    5457+CONFIG_FEATURE_SUID=y
     
    8588+
    8689+#
    87 +# Installation Options
    88 +#
    89 +# CONFIG_INSTALL_NO_USR is not set
     90+# Installation Options ("make install" behavior)
     91+#
    9092+# CONFIG_INSTALL_APPLET_SYMLINKS is not set
    9193+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
     
    104106+CONFIG_FEATURE_FAST_TOP=y
    105107+# CONFIG_FEATURE_ETC_NETWORKS is not set
     108+CONFIG_FEATURE_USE_TERMIOS=y
    106109+CONFIG_FEATURE_EDITING=y
    107110+CONFIG_FEATURE_EDITING_MAX_LEN=1024
     
    184187+CONFIG_FEATURE_TR_CLASSES=y
    185188+CONFIG_FEATURE_TR_EQUIV=y
     189+CONFIG_BASE64=y
    186190+CONFIG_CAL=y
    187191+CONFIG_CATV=y
     
    358362+# Editors
    359363+#
     364+CONFIG_PATCH=y
    360365+CONFIG_AWK=y
    361366+CONFIG_FEATURE_AWK_LIBM=y
     
    365370+CONFIG_FEATURE_DIFF_DIR=y
    366371+# CONFIG_ED is not set
    367 +CONFIG_PATCH=y
    368372+CONFIG_SED=y
    369373+CONFIG_VI=y
     
    425429+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
    426430+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
     431+CONFIG_HALT=y
     432+# CONFIG_FEATURE_CALL_TELINIT is not set
     433+CONFIG_TELINIT_PATH=""
    427434+CONFIG_INIT=y
    428435+CONFIG_FEATURE_USE_INITTAB=y
     
    434441+# CONFIG_FEATURE_INIT_COREDUMPS is not set
    435442+# CONFIG_FEATURE_INITRD is not set
    436 +CONFIG_HALT=y
    437 +# CONFIG_FEATURE_CALL_TELINIT is not set
    438 +CONFIG_TELINIT_PATH=""
     443+CONFIG_INIT_TERMINAL_TYPE="linux"
    439444+CONFIG_MESG=y
    440445+
     
    442447+# Login/Password Management Utilities
    443448+#
     449+# CONFIG_ADD_SHELL is not set
     450+# CONFIG_REMOVE_SHELL is not set
    444451+CONFIG_FEATURE_SHADOWPASSWDS=y
    445452+CONFIG_USE_BB_PWD_GRP=y
     
    447454+CONFIG_USE_BB_CRYPT=y
    448455+CONFIG_USE_BB_CRYPT_SHA=y
     456+CONFIG_ADDUSER=y
     457+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
     458+# CONFIG_FEATURE_CHECK_NAMES is not set
     459+CONFIG_FIRST_SYSTEM_ID=100
     460+CONFIG_LAST_SYSTEM_ID=999
    449461+CONFIG_ADDGROUP=y
    450462+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
    451463+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
     464+CONFIG_DELUSER=y
    452465+CONFIG_DELGROUP=y
    453466+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
    454 +# CONFIG_FEATURE_CHECK_NAMES is not set
    455 +CONFIG_ADDUSER=y
    456 +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
    457 +CONFIG_FIRST_SYSTEM_ID=100
    458 +CONFIG_LAST_SYSTEM_ID=999
    459 +CONFIG_DELUSER=y
    460467+CONFIG_GETTY=y
    461468+CONFIG_LOGIN=y
     
    516523+# Linux System Utilities
    517524+#
     525+CONFIG_BLOCKDEV=y
    518526+CONFIG_REV=y
    519527+# CONFIG_ACPID is not set
     
    534542+# CONFIG_FEATURE_SUN_LABEL is not set
    535543+# CONFIG_FEATURE_OSF_LABEL is not set
     544+# CONFIG_FEATURE_GPT_LABEL is not set
    536545+CONFIG_FEATURE_FDISK_ADVANCED=y
    537546+CONFIG_FINDFS=y
     
    566575+CONFIG_FEATURE_MKSWAP_UUID=y
    567576+CONFIG_MORE=y
    568 +CONFIG_FEATURE_USE_TERMIOS=y
    569577+CONFIG_MOUNT=y
    570578+CONFIG_FEATURE_MOUNT_FAKE=y
     
    604612+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
    605613+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
    606 +# CONFIG_FEATURE_VOLUMEID_FAT is not set
     614+CONFIG_FEATURE_VOLUMEID_FAT=y
    607615+# CONFIG_FEATURE_VOLUMEID_HFS is not set
    608616+# CONFIG_FEATURE_VOLUMEID_JFS is not set
     
    623631+#
    624632+# CONFIG_CONSPY is not set
     633+CONFIG_NANDWRITE=y
     634+CONFIG_NANDDUMP=y
    625635+# CONFIG_UBIATTACH is not set
    626636+# CONFIG_UBIDETACH is not set
    627637+CONFIG_ADJTIMEX=y
    628638+# CONFIG_BBCONFIG is not set
     639+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
    629640+# CONFIG_BEEP is not set
    630641+CONFIG_FEATURE_BEEP_FREQ=0
     
    655666+CONFIG_FEATURE_EJECT_SCSI=y
    656667+# CONFIG_FBSPLASH is not set
    657 +# CONFIG_FLASHCP is not set
    658 +# CONFIG_FLASH_LOCK is not set
    659 +# CONFIG_FLASH_UNLOCK is not set
    660 +# CONFIG_FLASH_ERASEALL is not set
     668+CONFIG_FLASHCP=y
     669+CONFIG_FLASH_LOCK=y
     670+CONFIG_FLASH_UNLOCK=y
     671+CONFIG_FLASH_ERASEALL=y
    661672+# CONFIG_IONICE is not set
    662673+CONFIG_INOTIFYD=y
     
    706717+# Networking Utilities
    707718+#
     719+CONFIG_NBDCLIENT=y
    708720+# CONFIG_NC is not set
    709721+# CONFIG_NC_SERVER is not set
     
    741753+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
    742754+# CONFIG_FEATURE_HTTPD_PROXY is not set
     755+# CONFIG_FEATURE_HTTPD_GZIP is not set
    743756+CONFIG_IFCONFIG=y
    744757+CONFIG_FEATURE_IFCONFIG_STATUS=y
     
    820833+CONFIG_TUNCTL=y
    821834+# CONFIG_FEATURE_TUNCTL_UG is not set
    822 +CONFIG_UDHCPD=y
    823 +CONFIG_DHCPRELAY=y
    824 +CONFIG_DUMPLEASES=y
     835+# CONFIG_UDHCPD is not set
     836+# CONFIG_DHCPRELAY is not set
     837+# CONFIG_DUMPLEASES is not set
    825838+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
    826839+CONFIG_DHCPD_LEASES_FILE=""
     
    828841+CONFIG_FEATURE_UDHCPC_ARPING=y
    829842+CONFIG_FEATURE_UDHCP_PORT=y
    830 +CONFIG_UDHCP_DEBUG=0
     843+CONFIG_UDHCP_DEBUG=1
    831844+CONFIG_FEATURE_UDHCP_RFC3397=y
    832845+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
     
    839852+CONFIG_FEATURE_WGET_AUTHENTICATION=y
    840853+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
     854+CONFIG_FEATURE_WGET_TIMEOUT=y
    841855+# CONFIG_ZCIP is not set
    842856+
     
    862876+# Process Utilities
    863877+#
     878+CONFIG_IOSTAT=y
     879+CONFIG_MPSTAT=y
     880+CONFIG_PMAP=y
     881+CONFIG_POWERTOP=y
    864882+CONFIG_SMEMCAP=y
    865883+CONFIG_FREE=y
     
    938956+CONFIG_ASH_RANDOM_SUPPORT=y
    939957+CONFIG_ASH_EXPAND_PRMT=y
     958+CONFIG_CTTYHACK=y
    940959+CONFIG_HUSH=y
    941960+CONFIG_HUSH_BASH_COMPAT=y
     961+CONFIG_HUSH_BRACE_EXPANSION=y
    942962+CONFIG_HUSH_HELP=y
    943963+CONFIG_HUSH_INTERACTIVE=y
     964+CONFIG_HUSH_SAVEHISTORY=y
    944965+CONFIG_HUSH_JOB=y
    945966+CONFIG_HUSH_TICK=y
     
    949970+CONFIG_HUSH_FUNCTIONS=y
    950971+CONFIG_HUSH_LOCAL=y
     972+CONFIG_HUSH_RANDOM_SUPPORT=y
    951973+CONFIG_HUSH_EXPORT_N=y
    952 +CONFIG_HUSH_RANDOM_SUPPORT=y
     974+CONFIG_HUSH_MODE_X=y
     975+# CONFIG_MSH is not set
    953976+CONFIG_FEATURE_SH_IS_ASH=y
    954977+# CONFIG_FEATURE_SH_IS_HUSH is not set
    955978+# CONFIG_FEATURE_SH_IS_NONE is not set
    956 +# CONFIG_FEATURE_BASH_IS_ASH is not set
     979+CONFIG_FEATURE_BASH_IS_ASH=y
    957980+# CONFIG_FEATURE_BASH_IS_HUSH is not set
    958 +CONFIG_FEATURE_BASH_IS_NONE=y
    959 +# CONFIG_LASH is not set
    960 +# CONFIG_MSH is not set
     981+# CONFIG_FEATURE_BASH_IS_NONE is not set
    961982+CONFIG_SH_MATH_SUPPORT=y
    962983+# CONFIG_SH_MATH_SUPPORT_64 is not set
     
    964985+# CONFIG_FEATURE_SH_STANDALONE is not set
    965986+# CONFIG_FEATURE_SH_NOFORK is not set
    966 +CONFIG_CTTYHACK=y
    967987+
    968988+#
     
    979999+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
    9801000+CONFIG_KLOGD=y
     1001+CONFIG_FEATURE_KLOGD_KLOGCTL=y
    9811002+CONFIG_LOGGER=y
Note: See TracChangeset for help on using the changeset viewer.