Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (26c13bc0712e6613db746ec72da5a7ad8e53f018)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (26c13bc0712e6613db746ec72da5a7ad8e53f018)
  • Date: Sat, 19 Jul 2014 14:37:05 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

shell-term-fm/busybox/BUILD | 2
shell-term-fm/busybox/DETAILS | 44 ++++++++++------
shell-term-fm/busybox/HISTORY | 6 ++
shell-term-fm/busybox/INSTALL | 3 -
shell-term-fm/busybox/PRE_BUILD | 5 +
shell-term-fm/busybox/busybox.config | 94
++++++++++++++++++++---------------
6 files changed, 94 insertions(+), 60 deletions(-)

New commits:
commit 26c13bc0712e6613db746ec72da5a7ad8e53f018
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/busybox: version 1.22.1

diff --git a/shell-term-fm/busybox/BUILD b/shell-term-fm/busybox/BUILD
index 8f58e6d..6dfecc1 100755
--- a/shell-term-fm/busybox/BUILD
+++ b/shell-term-fm/busybox/BUILD
@@ -1 +1 @@
-make
+default_build_make
diff --git a/shell-term-fm/busybox/DETAILS b/shell-term-fm/busybox/DETAILS
index 2e560d1..34f1213 100755
--- a/shell-term-fm/busybox/DETAILS
+++ b/shell-term-fm/busybox/DETAILS
@@ -1,28 +1,38 @@
SPELL=busybox
- VERSION=1.20.2
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
- SOURCE2=$SPELL-$VERSION-sys-resource.patch
-
SOURCE2_HASH=sha512:52341d96d6d9fd9d0835b8ceba6d130840358cf1a7af4e647f77a5cf61ee61ec1fb86cb20d850d88d3e6026462a5f074e2076f0b93cb3545532298e8d5361f89
+ VERSION=1.22.1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80
SOURCE_URL[0]=http://www.busybox.net/downloads/$SOURCE
+
+ SOURCE2=$SPELL-$VERSION-ash.patch
+
SOURCE2_HASH=sha512:297736a2b41badba50a64881e20778e05c9df5f6fed5cbe45cf8c5a31e5486a5fe85ce00897c2ef0c60787cc33467f03fc586f39945f513a7caeaea57aafc8d7
SOURCE2_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE2
+
+ SOURCE3=$SPELL-$VERSION-date.patch
+
SOURCE3_HASH=sha512:0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34
+ SOURCE3_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE3
+
+ SOURCE4=$SPELL-$VERSION-iplink.patch
+
SOURCE4_HASH=sha512:f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889
+ SOURCE4_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE4
+
+ SOURCE5=$SPELL-$VERSION-nc.patch
+
SOURCE5_HASH=sha512:9988abf5936f8b8d952627999630c40cbfb4f6f1b91030a2692bbaa7b7e8516758a1ce0959bb5122c6911cd547ee04fce29a0c60c91ccf25e82f59ca52ac1e8f
+ SOURCE5_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE5
+
WEB_SITE=http://www.busybox.net
ENTERED=20011020
LICENSE[0]=GPL2
KEYWORDS="console"
SHORT="Statically linked rescue shell"
cat << EOF
-BusyBox combines tiny versions of many common
-UNIX utilities into a single small executable.
-It provides minimalist replacements for most
-of the utilities you usually find in GNU
-fileutils, shellutils, etc. The utilities in
-BusyBox generally have fewer options than their
-full-featured GNU cousins; however, the options
-that are included provide the expected
-functionality and behave very much like their
-GNU counterparts. BusyBox provides a fairly
-complete POSIX environment for any small or
-embedded system.
+BusyBox combines tiny versions of many common UNIX utilities into a single
+small executable. It provides minimalist replacements for most of the
utilities
+you usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox
+generally have fewer options than their full-featured GNU cousins; however,
the
+options that are included provide the expected functionality and behave very
+much like their GNU counterparts. BusyBox provides a fairly complete POSIX
+environment for any small or embedded system.
EOF
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index cbbed69..d7fff07 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,9 @@
+2014-07-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, busybox.config: version 1.22.1
+ * INSTALL: install build-time config file to /usr/share/busybox for
+ reference
+ * BUILD: use default_build_make
+
2013-05-10 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS, busybox.config: version 1.20.2
* DETAILS, PRE_BUILD: patch for building with current glibc
diff --git a/shell-term-fm/busybox/INSTALL b/shell-term-fm/busybox/INSTALL
index 24048e5..61aed19 100755
--- a/shell-term-fm/busybox/INSTALL
+++ b/shell-term-fm/busybox/INSTALL
@@ -1,4 +1,5 @@
-install -vm 755 busybox ${INSTALL_ROOT}/sbin
+install -vm 755 busybox ${INSTALL_ROOT}/sbin &&
+install -vDm 644 .config ${INSTALL_ROOT}/usr/share/busybox/busybox.config

#
# This one is needed only when symlinks needed ...
diff --git a/shell-term-fm/busybox/PRE_BUILD b/shell-term-fm/busybox/PRE_BUILD
index b39190a..d9e73d3 100755
--- a/shell-term-fm/busybox/PRE_BUILD
+++ b/shell-term-fm/busybox/PRE_BUILD
@@ -4,11 +4,14 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&

patch -p1 < "$SOURCE_CACHE/$SOURCE2" &&
+patch -p1 < "$SOURCE_CACHE/$SOURCE3" &&
+patch -p1 < "$SOURCE_CACHE/$SOURCE4" &&
+patch -p1 < "$SOURCE_CACHE/$SOURCE5" &&

if [ -f $CONFIG_CACHE/busybox.config ]; then
cp ${CONFIG_CACHE}/busybox.config .config
else
- cp ${SCRIPT_DIRECTORY}/busybox.config .config
+ cp ${SCRIPT_DIRECTORY}/busybox.config .config
fi &&

if [[ "$BB_CONFIG" = "y" ]] && [[ $RECONFIGURE ]] ; then
diff --git a/shell-term-fm/busybox/busybox.config
b/shell-term-fm/busybox/busybox.config
index a3020ca..de40be2 100644
--- a/shell-term-fm/busybox/busybox.config
+++ b/shell-term-fm/busybox/busybox.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.20.2
-# Fri May 10 22:20:46 2013
+# Busybox version: 1.22.1
+# Sat Jul 19 21:24:57 2014
#
CONFIG_HAVE_DOT_CONFIG=y

@@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/var/run"
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
@@ -54,7 +55,7 @@ CONFIG_FEATURE_HAVE_RPC=y
#
# Build Options
#
-# CONFIG_STATIC is not set
+CONFIG_STATIC=y
# CONFIG_PIE is not set
# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
@@ -96,6 +97,7 @@ CONFIG_FEATURE_SYSTEMD=y
CONFIG_FEATURE_RTMINMAX=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=1
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_USE_TERMIOS=y
@@ -133,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_GZ=y
# CONFIG_AR is not set
# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
# CONFIG_FEATURE_AR_CREATE is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_GUNZIP=y
CONFIG_BUNZIP2=y
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
CONFIG_BZIP2=y
CONFIG_CPIO=y
CONFIG_FEATURE_CPIO_O=y
@@ -141,14 +150,13 @@ CONFIG_FEATURE_CPIO_P=y
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
CONFIG_GZIP=y
CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
CONFIG_GZIP_FAST=0
CONFIG_LZOP=y
# CONFIG_LZOP_COMPR_HIGH is not set
-CONFIG_RPM2CPIO=y
CONFIG_RPM=y
+CONFIG_RPM2CPIO=y
CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y
CONFIG_FEATURE_TAR_AUTODETECT=y
@@ -161,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y
CONFIG_FEATURE_TAR_UNAME_GNAME=y
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNLZMA=y
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-CONFIG_XZ=y
CONFIG_UNZIP=y

#
@@ -184,6 +186,7 @@ CONFIG_GROUPS=y
CONFIG_TEST=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_NODEREF=y
CONFIG_FEATURE_TOUCH_SUSV3=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
@@ -263,6 +266,7 @@ CONFIG_SEQ=y
CONFIG_SHA1SUM=y
CONFIG_SHA256SUM=y
CONFIG_SHA512SUM=y
+CONFIG_SHA3SUM=y
CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y
CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -310,7 +314,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
CONFIG_FEATURE_HUMAN_READABLE=y

#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
#
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y

@@ -360,7 +364,16 @@ CONFIG_WHICH=y
#
# Editors
#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_ED=y
CONFIG_PATCH=y
+CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
# CONFIG_FEATURE_VI_8BIT is not set
@@ -375,15 +388,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_SED=y
CONFIG_FEATURE_ALLOW_EXEC=y

#
@@ -526,6 +530,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
# Linux System Utilities
#
CONFIG_BLOCKDEV=y
+CONFIG_FSTRIM=y
CONFIG_MDEV=y
CONFIG_FEATURE_MDEV_CONF=y
CONFIG_FEATURE_MDEV_RENAME=y
@@ -612,23 +617,27 @@ CONFIG_VOLUMEID=y
#
# Filesystem/Volume identification
#
-CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EXFAT=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_F2FS=y
CONFIG_FEATURE_VOLUMEID_FAT=y
CONFIG_FEATURE_VOLUMEID_HFS=y
-CONFIG_FEATURE_VOLUMEID_JFS=y
-CONFIG_FEATURE_VOLUMEID_XFS=y
-CONFIG_FEATURE_VOLUMEID_NTFS=y
CONFIG_FEATURE_VOLUMEID_ISO9660=y
-CONFIG_FEATURE_VOLUMEID_UDF=y
-CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_NILFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
CONFIG_FEATURE_VOLUMEID_ROMFS=y
+# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
CONFIG_FEATURE_VOLUMEID_SYSV=y
-CONFIG_FEATURE_VOLUMEID_OCFS2=y
-CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_XFS=y

#
# Miscellaneous Utilities
@@ -646,6 +655,7 @@ CONFIG_FEATURE_LESS_DASHCMD=y
CONFIG_FEATURE_LESS_LINENUMS=y
CONFIG_NANDWRITE=y
CONFIG_NANDDUMP=y
+# CONFIG_RFKILL is not set
CONFIG_SETSERIAL=y
CONFIG_UBIATTACH=y
CONFIG_UBIDETACH=y
@@ -653,6 +663,7 @@ CONFIG_UBIMKVOL=y
CONFIG_UBIRMVOL=y
CONFIG_UBIRSVOL=y
CONFIG_UBIUPDATEVOL=y
+CONFIG_WALL=y
CONFIG_ADJTIMEX=y
# CONFIG_BBCONFIG is not set
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -709,7 +720,6 @@ CONFIG_MOUNTPOINT=y
CONFIG_MT=y
CONFIG_RAIDAUTORUN=y
CONFIG_READAHEAD=y
-# CONFIG_RFKILL is not set
CONFIG_RUNLEVEL=y
CONFIG_RX=y
CONFIG_SETSID=y
@@ -720,7 +730,6 @@ CONFIG_TIME=y
CONFIG_TIMEOUT=y
CONFIG_TTYSIZE=y
CONFIG_VOLNAME=y
-CONFIG_WALL=y
CONFIG_WATCHDOG=y

#
@@ -898,6 +907,13 @@ CONFIG_POWERTOP=y
CONFIG_PSTREE=y
CONFIG_PWDX=y
CONFIG_SMEMCAP=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_SMP_CPU=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
+CONFIG_FEATURE_TOPMEM=y
CONFIG_UPTIME=y
CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
CONFIG_FREE=y
@@ -918,13 +934,6 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-CONFIG_FEATURE_TOP_SMP_CPU=y
-CONFIG_FEATURE_TOP_DECIMALS=y
-CONFIG_FEATURE_TOP_SMP_PROCESS=y
-CONFIG_FEATURE_TOPMEM=y
CONFIG_FEATURE_SHOW_THREADS=y
CONFIG_WATCH=y

@@ -1019,6 +1028,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_LOGREAD=y
CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_FEATURE_KMSG_SYSLOG=y
CONFIG_KLOGD=y
+
+#
+# klogd should not be used together with syslog to kernel printk buffer
+#
CONFIG_FEATURE_KLOGD_KLOGCTL=y
CONFIG_LOGGER=y



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (26c13bc0712e6613db746ec72da5a7ad8e53f018), Florian Franzmann, 07/19/2014

Archive powered by MHonArc 2.6.24.

Top of Page