* [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2
@ 2017-09-01 16:39 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 02/19] dbus: version bump 1.10.18 -> 1.10.22 Clemens Gruber
` (18 more replies)
0 siblings, 19 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
config/busybox/Config.in | 47 ++--
config/busybox/archival/Config.in | 113 +++++----
config/busybox/console-tools/Config.in | 10 +-
config/busybox/coreutils/Config.in | 144 ++++++------
config/busybox/debianutils/Config.in | 20 +-
config/busybox/editors/Config.in | 37 ++-
config/busybox/findutils/Config.in | 18 +-
config/busybox/init/Config.in | 34 +--
config/busybox/libbb/Config.in | 17 +-
config/busybox/loginutils/Config.in | 36 +--
config/busybox/miscutils/Config.in | 112 ++-------
config/busybox/modutils/Config.in | 108 ++++-----
config/busybox/networking/Config.in | 142 ++++++-----
config/busybox/networking/udhcp/Config.in | 80 ++++---
config/busybox/procps/Config.in | 52 +++--
config/busybox/selinux/Config.in | 4 -
config/busybox/shell/Config.in | 259 +++++++++++++--------
config/busybox/sysklogd/Config.in | 2 +-
config/busybox/util-linux/Config.in | 146 +++++++++++-
config/busybox/util-linux/volume_id/Config.in | 134 -----------
.../0200-reactivate-check-for-tty.patch | 0
...mat-warning-when-building-applets-usage_p.patch | 0
...ystem-only-pass-real-libs-to-SELINUX_LIBS.patch | 0
...link-honour-SKIP_STRIP-and-don-t-strip-if.patch | 0
patches/{busybox-1.26.2 => busybox-1.27.2}/series | 2 +-
rules/busybox.make | 4 +-
26 files changed, 766 insertions(+), 755 deletions(-)
rename patches/{busybox-1.26.2 => busybox-1.27.2}/0200-reactivate-check-for-tty.patch (100%)
rename patches/{busybox-1.26.2 => busybox-1.27.2}/0201-Fix-the-format-warning-when-building-applets-usage_p.patch (100%)
rename patches/{busybox-1.26.2 => busybox-1.27.2}/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch (100%)
rename patches/{busybox-1.26.2 => busybox-1.27.2}/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch (100%)
rename patches/{busybox-1.26.2 => busybox-1.27.2}/series (86%)
diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index b8a4d795c..a15c05cce 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -22,7 +22,7 @@ config BUSYBOX_DESKTOP
If you are preparing your build to be used on an embedded box
where you have tighter control over the entire set of userspace
- tools, you can unselect this option for smaller code size.
+ tools, you can unselect this option for smaller code size.
config BUSYBOX_EXTRA_COMPAT
bool "Provide compatible behavior for rare corner cases (bigger code)"
@@ -33,6 +33,19 @@ config BUSYBOX_EXTRA_COMPAT
some GNU extensions in libc. You probably only need this option
if you plan to run busybox on desktop.
+config BUSYBOX_FEDORA_COMPAT
+ bool "Building for Fedora distribution"
+ default n
+ help
+ This option makes some tools behave like they do on Fedora.
+
+ At the time of this writing (2017-08) this only affects uname:
+ normally, uname -p (processor) and uname -i (platform)
+ are shown as "unknown", but with this option uname -p
+ shows the same string as uname -m (machine type),
+ and so does uname -i unless machine type is i486/i586/i686 -
+ then uname -i shows "i386".
+
config BUSYBOX_INCLUDE_SUSv2
bool "Enable obsolete features removed before SUSv3"
default y
@@ -50,17 +63,6 @@ config BUSYBOX_USE_PORTABLE_CODE
compiler other than gcc.
If you do use gcc, this option may needlessly increase code size.
-config BUSYBOX_PLATFORM_LINUX
- bool "Enable Linux-specific applets and features"
- default y
- help
- For the most part, busybox requires only POSIX compatibility
- from the target system, but some applets and features use
- Linux-specific interfaces.
-
- Answering 'N' here will disable such applets and hide the
- corresponding configuration options.
-
config BUSYBOX_SHOW_USAGE
bool "Show applet usage messages"
default y
@@ -124,14 +126,14 @@ config BUSYBOX_INSTALL_NO_USR
never to /usr/bin or /usr/sbin.
config BUSYBOX_PAM
- bool "Support for PAM (Pluggable Authentication Modules)"
+ bool "Support PAM (Pluggable Authentication Modules)"
default n
help
Use PAM in some busybox applets (currently login and httpd) instead
of direct access to password database.
config BUSYBOX_LONG_OPTS
- bool "Support for --long-options"
+ bool "Support --long-options"
default y
help
Enable this if you want busybox applets to use the gnu --long-option
@@ -198,7 +200,7 @@ config BUSYBOX_PID_FILE_PATH
specify a pidfile path.
config BUSYBOX_FEATURE_SUID
- bool "Support for SUID/SGID handling"
+ bool "Support SUID/SGID handling"
default y
help
With this option you can install the busybox binary belonging
@@ -338,6 +340,17 @@ config BUSYBOX_FEATURE_HAVE_RPC
# This is automatically selected if any of enabled applets need it.
# You do not need to select it manually.
+config BUSYBOX_PLATFORM_LINUX
+ bool #No description makes it a hidden option
+ default n
+ #help
+ # For the most part, busybox requires only POSIX compatibility
+ # from the target system, but some applets and features use
+ # Linux-specific interfaces.
+ #
+ # This is automatically selected if any applet or feature requires
+ # Linux-specific interfaces. You do not need to select it manually.
+
comment 'Build Options'
config BUSYBOX_STATIC
@@ -611,6 +624,8 @@ config BUSYBOX_DEBUG_SANITIZE
catch bad memory accesses (e.g. buffer overflows), but will make
the executable larger and slow down runtime a bit.
+ This adds -fsanitize=foo options to gcc command line.
+
If you aren't developing/testing busybox, say N here.
config BUSYBOX_UNIT_TEST
@@ -625,7 +640,7 @@ config BUSYBOX_WERROR
bool "Abort compilation on any warning"
default n
help
- Selecting this will add -Werror to gcc command line.
+ This adds -Werror to gcc command line.
Most people should answer N.
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index 92abf98c9..750df33c7 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -9,32 +9,22 @@ menu "Archival Utilities"
config BUSYBOX_FEATURE_SEAMLESS_XZ
bool "Make tar, rpm, modprobe etc understand .xz data"
default y
- help
- Make tar, rpm, modprobe etc understand .xz data.
config BUSYBOX_FEATURE_SEAMLESS_LZMA
bool "Make tar, rpm, modprobe etc understand .lzma data"
default y
- help
- Make tar, rpm, modprobe etc understand .lzma data.
config BUSYBOX_FEATURE_SEAMLESS_BZ2
bool "Make tar, rpm, modprobe etc understand .bz2 data"
default y
- help
- Make tar, rpm, modprobe etc understand .bz2 data.
config BUSYBOX_FEATURE_SEAMLESS_GZ
bool "Make tar, rpm, modprobe etc understand .gz data"
default y
- help
- Make tar, rpm, modprobe etc understand .gz data.
config BUSYBOX_FEATURE_SEAMLESS_Z
bool "Make tar, rpm, modprobe etc understand .Z data"
default n # it is ancient
- help
- Make tar, rpm, modprobe etc understand .Z data.
config BUSYBOX_AR
bool "ar"
@@ -50,7 +40,7 @@ config BUSYBOX_AR
probably say N here: most compilers come with their own ar utility.
config BUSYBOX_FEATURE_AR_LONG_FILENAMES
- bool "Support for long filenames (not needed for debs)"
+ bool "Support long filenames (not needed for debs)"
default y
depends on BUSYBOX_AR
help
@@ -74,6 +64,7 @@ config BUSYBOX_UNCOMPRESS
config BUSYBOX_GUNZIP
bool "gunzip"
default y
+ select BUSYBOX_FEATURE_GZIP_DECOMPRESS
help
gunzip is used to decompress archives created by gzip.
You can use the `-t' option to test the integrity of
@@ -82,6 +73,7 @@ config BUSYBOX_GUNZIP
config BUSYBOX_ZCAT
bool "zcat"
default y
+ select BUSYBOX_FEATURE_GZIP_DECOMPRESS
help
Alias to "gunzip -c".
@@ -89,11 +81,10 @@ config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS
bool "Enable long options"
default y
depends on (BUSYBOX_GUNZIP || BUSYBOX_ZCAT) && BUSYBOX_LONG_OPTS
- help
- Enable use of long options.
config BUSYBOX_BUNZIP2
bool "bunzip2"
default y
+ select BUSYBOX_FEATURE_BZIP2_DECOMPRESS
help
bunzip2 is a compression utility using the Burrows-Wheeler block
sorting text compression algorithm, and Huffman coding. Compression
@@ -107,6 +98,7 @@ config BUSYBOX_BUNZIP2
config BUSYBOX_BZCAT
bool "bzcat"
default y
+ select BUSYBOX_FEATURE_BZIP2_DECOMPRESS
help
Alias to "bunzip2 -c".
config BUSYBOX_UNLZMA
@@ -141,7 +133,7 @@ config BUSYBOX_LZMA
IOW: you'll get lzma applet, but it will always require -d option.
config BUSYBOX_FEATURE_LZMA_FAST
- bool "Optimize unlzma for speed"
+ bool "Optimize for speed"
default n
depends on BUSYBOX_UNLZMA || BUSYBOX_LZCAT || BUSYBOX_LZMA
help
@@ -177,6 +169,15 @@ config BUSYBOX_BZIP2
Unless you have a specific application which requires bzip2, you
should probably say N here.
+
+config BUSYBOX_FEATURE_BZIP2_DECOMPRESS
+ bool "Enable decompression"
+ default y
+ depends on BUSYBOX_BZIP2 || BUSYBOX_BUNZIP2 || BUSYBOX_BZCAT
+ help
+ Enable -d (--decompress) and -t (--test) options for bzip2.
+ This will be automatically selected if bunzip2 or bzcat is
+ enabled.
config BUSYBOX_CPIO
bool "cpio"
default y
@@ -192,7 +193,7 @@ config BUSYBOX_CPIO
should probably say N here.
config BUSYBOX_FEATURE_CPIO_O
- bool "Support for archive creation"
+ bool "Support archive creation"
default y
depends on BUSYBOX_CPIO
help
@@ -200,7 +201,7 @@ config BUSYBOX_FEATURE_CPIO_O
format only.
config BUSYBOX_FEATURE_CPIO_P
- bool "Support for passthrough mode"
+ bool "Support passthrough mode"
default y
depends on BUSYBOX_FEATURE_CPIO_O
help
@@ -237,11 +238,9 @@ config BUSYBOX_FEATURE_GZIP_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_GZIP && BUSYBOX_LONG_OPTS
- help
- Enable use of long options, increases size by about 106 Bytes
config BUSYBOX_GZIP_FAST
- int "Trade memory for gzip speed (0:small,slow - 2:fast,big)"
+ int "Trade memory for speed (0:small,slow - 2:fast,big)"
default 0
range 0 2
depends on BUSYBOX_GZIP
@@ -261,6 +260,15 @@ config BUSYBOX_FEATURE_GZIP_LEVELS
is 6. If levels 1-3 are specified, 4 is used.
If this option is not selected, -N options are ignored and -9
is used.
+
+config BUSYBOX_FEATURE_GZIP_DECOMPRESS
+ bool "Enable decompression"
+ default y
+ depends on BUSYBOX_GZIP || BUSYBOX_GUNZIP || BUSYBOX_ZCAT
+ help
+ Enable -d (--decompress) and -t (--test) options for gzip.
+ This will be automatically selected if gunzip or zcat is
+ enabled.
config BUSYBOX_LZOP
bool "lzop"
default y
@@ -269,13 +277,13 @@ config BUSYBOX_LZOP
config BUSYBOX_UNLZOP
bool "unlzop"
- default y
+ default n # INCOMPAT: upstream lzop does not provide such tool
help
Lzop decompresion.
config BUSYBOX_LZOPCAT
bool "lzopcat"
- default y
+ default n # INCOMPAT: upstream lzop does not provide such tool
help
Alias to "unlzop -c".
@@ -305,13 +313,15 @@ config BUSYBOX_TAR
create compressed archives. It's probably the most widely used
UNIX archive program.
+config BUSYBOX_FEATURE_TAR_LONG_OPTIONS
+ bool "Enable long options"
+ default y
+ depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS
+
config BUSYBOX_FEATURE_TAR_CREATE
- bool "Enable archive creation"
+ bool "Enable -c (archive creation)"
default y
depends on BUSYBOX_TAR
- help
- If you enable this option you'll be able to create
- tar archives using the `-c' option.
config BUSYBOX_FEATURE_TAR_AUTODETECT
bool "Autodetect compressed tarballs"
@@ -330,7 +340,7 @@ config BUSYBOX_FEATURE_TAR_FROM
a list of files to include or exclude from an archive.
config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
- bool "Support for old tar header format"
+ bool "Support old tar header format"
default y
depends on BUSYBOX_TAR || BUSYBOX_DPKG
help
@@ -349,22 +359,12 @@ config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY
tarballs still exist.
config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS
- bool "Support for GNU tar extensions (long filenames)"
+ bool "Support GNU tar extensions (long filenames)"
default y
depends on BUSYBOX_TAR || BUSYBOX_DPKG
- help
- With this option busybox supports GNU long filenames and
- linknames.
-
-config BUSYBOX_FEATURE_TAR_LONG_OPTIONS
- bool "Enable long options"
- default y
- depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS
- help
- Enable use of long options, increases size by about 400 Bytes
config BUSYBOX_FEATURE_TAR_TO_COMMAND
- bool "Support for writing to an external program"
+ bool "Support writing to an external program (--to-command)"
default y
depends on BUSYBOX_TAR && BUSYBOX_FEATURE_TAR_LONG_OPTIONS
help
@@ -377,20 +377,17 @@ config BUSYBOX_FEATURE_TAR_UNAME_GNAME
default y
depends on BUSYBOX_TAR
help
- Enables use of user and group names in tar. This affects contents
+ Enable use of user and group names in tar. This affects contents
listings (-t) and preserving permissions when unpacking (-p).
+200 bytes.
config BUSYBOX_FEATURE_TAR_NOPRESERVE_TIME
- bool "Enable -m (do not preserve time) option"
+ bool "Enable -m (do not preserve time) GNU option"
default y
depends on BUSYBOX_TAR
- help
- With this option busybox supports GNU tar -m
- (do not preserve time) option.
config BUSYBOX_FEATURE_TAR_SELINUX
- bool "Support for extracting SELinux labels"
+ bool "Support extracting SELinux labels"
default n
depends on BUSYBOX_TAR && BUSYBOX_SELINUX
help
@@ -403,7 +400,31 @@ config BUSYBOX_UNZIP
unzip will list or extract files from a ZIP archive,
commonly found on DOS/WIN systems. The default behavior
(with no options) is to extract the archive into the
- current directory. Use the `-d' option to extract to a
- directory of your choice.
+ current directory.
+
+config BUSYBOX_FEATURE_UNZIP_CDF
+ bool "Read and use Central Directory data"
+ default y
+ depends on BUSYBOX_UNZIP
+ help
+ If you know that you only need to deal with simple
+ ZIP files without deleted/updated files, SFX archives etc,
+ you can reduce code size by unselecting this option.
+ To support less trivial ZIPs, say Y.
+
+config BUSYBOX_FEATURE_UNZIP_BZIP2
+ bool "Support compression method 12 (bzip2)"
+ default y
+ depends on BUSYBOX_FEATURE_UNZIP_CDF && BUSYBOX_DESKTOP
+
+config BUSYBOX_FEATURE_UNZIP_LZMA
+ bool "Support compression method 14 (lzma)"
+ default y
+ depends on BUSYBOX_FEATURE_UNZIP_CDF && BUSYBOX_DESKTOP
+
+config BUSYBOX_FEATURE_UNZIP_XZ
+ bool "Support compression method 95 (xz)"
+ default y
+ depends on BUSYBOX_FEATURE_UNZIP_CDF && BUSYBOX_DESKTOP
endmenu
diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in
index ea2e77255..331a09af0 100644
--- a/config/busybox/console-tools/Config.in
+++ b/config/busybox/console-tools/Config.in
@@ -76,18 +76,14 @@ comment "Common options for loadfont and setfont"
depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT
config BUSYBOX_FEATURE_LOADFONT_PSF2
- bool "Support for PSF2 console fonts"
+ bool "Support PSF2 console fonts"
default y
depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT
- help
- Support PSF2 console fonts.
config BUSYBOX_FEATURE_LOADFONT_RAW
- bool "Support for old (raw) console fonts"
+ bool "Support old (raw) console fonts"
default y
depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT
- help
- Support old (raw) console fonts.
config BUSYBOX_LOADKMAP
bool "loadkmap"
default y
@@ -136,8 +132,6 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_SETCONSOLE && BUSYBOX_LONG_OPTS
- help
- Support long options for the setconsole applet.
config BUSYBOX_SETKEYCODES
bool "setkeycodes"
default y
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 91bfc115f..f8dd7b0aa 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -13,23 +13,19 @@ config BUSYBOX_BASENAME
basename is used to strip the directory and suffix from filenames,
leaving just the filename itself. Enable this option if you wish
to enable the 'basename' utility.
-config BUSYBOX_CAL
- bool "cal"
- default y
- help
- cal is used to display a monthly calendar.
config BUSYBOX_CAT
bool "cat"
default y
help
cat is used to concatenate files and print them to the standard
output. Enable this option if you wish to enable the 'cat' utility.
-config BUSYBOX_CATV
- bool "catv"
+
+config BUSYBOX_FEATURE_CATV
+ bool "cat -v[etA]"
default y
+ depends on BUSYBOX_CAT
help
- Display nonprinting characters as escape sequences (like some
- implementations' cat -v option).
+ Display nonprinting characters as escape sequences
config BUSYBOX_CHGRP
bool "chgrp"
default y
@@ -51,8 +47,6 @@ config BUSYBOX_FEATURE_CHOWN_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_CHOWN && BUSYBOX_LONG_OPTS
- help
- Enable use of long options
config BUSYBOX_CHROOT
bool "chroot"
default y
@@ -77,11 +71,11 @@ config BUSYBOX_CP
cp is used to copy files and directories.
config BUSYBOX_FEATURE_CP_LONG_OPTIONS
- bool "Enable long options for cp"
+ bool "Enable long options"
default y
depends on BUSYBOX_CP && BUSYBOX_LONG_OPTS
help
- Enable long options for cp.
+ Enable long options.
Also add support for --parents option.
config BUSYBOX_CUT
bool "cut"
@@ -163,7 +157,7 @@ config BUSYBOX_FEATURE_DD_IBS_OBS
default y
depends on BUSYBOX_DD
help
- Enables support for writing a certain number of bytes in and out,
+ Enable support for writing a certain number of bytes in and out,
at a time, and performing conversions on the data stream.
config BUSYBOX_FEATURE_DD_STATUS
@@ -171,7 +165,7 @@ config BUSYBOX_FEATURE_DD_STATUS
default y
depends on BUSYBOX_DD
help
- Enables support for status=noxfer/none option.
+ Enable support for status=noxfer/none option.
config BUSYBOX_DF
bool "df"
default y
@@ -184,11 +178,9 @@ config BUSYBOX_FEATURE_DF_FANCY
default y
depends on BUSYBOX_DF
help
- This option enables -a, -i and -B.
-
- -a Show all filesystems
- -i Inodes
- -B <SIZE> Blocksize
+ -a Show all filesystems
+ -i Inodes
+ -B <SIZE> Blocksize
config BUSYBOX_DIRNAME
bool "dirname"
default y
@@ -229,11 +221,9 @@ config BUSYBOX_ECHO
# this entry also appears in shell/Config.in, next to the echo builtin
config BUSYBOX_FEATURE_FANCY_ECHO
- bool "Enable echo options (-n and -e)"
+ bool "Enable -n and -e options"
default y
- depends on BUSYBOX_ECHO || BUSYBOX_ASH_BUILTIN_ECHO || BUSYBOX_HUSH
- help
- This adds options (-n and -e) to echo.
+ depends on BUSYBOX_ECHO || BUSYBOX_ASH_ECHO || BUSYBOX_HUSH_ECHO
config BUSYBOX_ENV
bool "env"
default y
@@ -246,8 +236,6 @@ config BUSYBOX_FEATURE_ENV_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_ENV && BUSYBOX_LONG_OPTS
- help
- Support long options for the env applet.
config BUSYBOX_EXPAND
bool "expand"
default y
@@ -258,8 +246,6 @@ config BUSYBOX_FEATURE_EXPAND_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_EXPAND && BUSYBOX_LONG_OPTS
- help
- Support long options for the expand applet.
config BUSYBOX_UNEXPAND
bool "unexpand"
@@ -271,8 +257,6 @@ config BUSYBOX_FEATURE_UNEXPAND_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_UNEXPAND && BUSYBOX_LONG_OPTS
- help
- Support long options for the unexpand applet.
config BUSYBOX_EXPR
bool "expr"
default y
@@ -288,6 +272,11 @@ config BUSYBOX_EXPR_MATH_SUPPORT_64
Enable 64-bit math support in the expr applet. This will make
the applet slightly larger, but will allow computation with very
large numbers.
+config BUSYBOX_FACTOR
+ bool "factor"
+ default y
+ help
+ factor factorizes integers
config BUSYBOX_FALSE
bool "false"
default y
@@ -311,11 +300,9 @@ config BUSYBOX_HEAD
from files.
config BUSYBOX_FEATURE_FANCY_HEAD
- bool "Enable head options (-c, -q, and -v)"
+ bool "Enable -c, -q, and -v"
default y
depends on BUSYBOX_HEAD
- help
- This enables the head options (-c, -q, and -v).
config BUSYBOX_HOSTID
bool "hostid"
default y
@@ -343,8 +330,11 @@ config BUSYBOX_FEATURE_INSTALL_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_INSTALL && BUSYBOX_LONG_OPTS
+config BUSYBOX_LINK
+ bool "link"
+ default y
help
- Support long options for the install applet.
+ link creates hard links between files.
config BUSYBOX_LN
bool "ln"
default y
@@ -365,22 +355,21 @@ config BUSYBOX_FEATURE_LS_FILETYPES
bool "Enable filetyping options (-p and -F)"
default y
depends on BUSYBOX_LS
- help
- Enable the ls options (-p and -F).
config BUSYBOX_FEATURE_LS_FOLLOWLINKS
bool "Enable symlinks dereferencing (-L)"
default y
depends on BUSYBOX_LS
- help
- Enable the ls option (-L).
config BUSYBOX_FEATURE_LS_RECURSIVE
bool "Enable recursion (-R)"
default y
depends on BUSYBOX_LS
- help
- Enable the ls option (-R).
+
+config BUSYBOX_FEATURE_LS_WIDTH
+ bool "Enable -w WIDTH and window size autodetection"
+ default y
+ depends on BUSYBOX_LS
config BUSYBOX_FEATURE_LS_SORTFILES
bool "Sort the file names"
@@ -460,7 +449,6 @@ config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
help
Enabling the -c options allows files to be checked
against pre-calculated hash values.
-
-s and -w are useful options when verifying checksums.
config BUSYBOX_MKDIR
bool "mkdir"
@@ -472,8 +460,6 @@ config BUSYBOX_FEATURE_MKDIR_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_MKDIR && BUSYBOX_LONG_OPTS
- help
- Support long options for the mkdir applet.
config BUSYBOX_MKFIFO
bool "mkfifo"
default y
@@ -486,6 +472,11 @@ config BUSYBOX_MKNOD
help
mknod is used to create FIFOs or block/character special
files with the specified names.
+config BUSYBOX_MKTEMP
+ bool "mktemp"
+ default y
+ help
+ mktemp is used to create unique temporary files
config BUSYBOX_MV
bool "mv"
default y
@@ -496,23 +487,37 @@ config BUSYBOX_FEATURE_MV_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_MV && BUSYBOX_LONG_OPTS
- help
- Support long options for the mv applet.
config BUSYBOX_NICE
bool "nice"
default y
help
nice runs a program with modified scheduling priority.
+config BUSYBOX_NL
+ bool "nl"
+ default y
+ help
+ nl is used to number lines of files.
config BUSYBOX_NOHUP
bool "nohup"
default y
help
run a command immune to hangups, with output to a non-tty.
+config BUSYBOX_NPROC
+ bool "nproc"
+ default y
+ help
+ Print number of CPUs
config BUSYBOX_OD
bool "od"
default y
help
od is used to dump binary files in octal and other formats.
+config BUSYBOX_PASTE
+ bool "paste"
+ default y
+ help
+ paste is used to paste lines of different files together
+ and write the result to stdout
config BUSYBOX_PRINTENV
bool "printenv"
default y
@@ -571,6 +576,11 @@ config BUSYBOX_SEQ
default y
help
print a sequence of numbers
+config BUSYBOX_SHRED
+ bool "shred"
+ default y
+ help
+ Overwrite a file to hide its contents, and optionally delete it
config BUSYBOX_SHUF
bool "shuf"
default y
@@ -624,7 +634,7 @@ config BUSYBOX_SPLIT
bool "split"
default y
help
- split a file into pieces.
+ Split a file into pieces.
config BUSYBOX_FEATURE_SPLIT_FANCY
bool "Fancy extensions"
@@ -692,13 +702,12 @@ config BUSYBOX_TAIL
from files.
config BUSYBOX_FEATURE_FANCY_TAIL
- bool "Enable extra tail options (-q, -s, -v, and -F)"
+ bool "Enable -q, -s, -v, and -F options"
default y
depends on BUSYBOX_TAIL
help
- The options (-q, -s, -v and -F) are provided by GNU tail, but
- are not specific in the SUSv3 standard.
-
+ These options are provided by GNU tail, but
+ are not specific in the SUSv3 standard:
-q Never output headers giving file names
-s SEC Wait SEC seconds between reads with -f
-v Always output headers giving file names
@@ -739,9 +748,15 @@ config BUSYBOX_TEST2
config BUSYBOX_FEATURE_TEST_64
bool "Extend test to 64 bit"
default y
- depends on BUSYBOX_TEST || BUSYBOX_TEST1 || BUSYBOX_TEST2 || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH
+ depends on BUSYBOX_TEST || BUSYBOX_TEST1 || BUSYBOX_TEST2 || BUSYBOX_ASH_TEST || BUSYBOX_HUSH_TEST
help
Enable 64-bit support in test.
+config BUSYBOX_TIMEOUT
+ bool "timeout"
+ default y
+ help
+ Runs a program and watches it. If it does not terminate in
+ specified number of seconds, it is sent a signal.
config BUSYBOX_TOUCH
bool "touch"
default y
@@ -856,11 +871,11 @@ config BUSYBOX_WC
in specified files.
config BUSYBOX_FEATURE_WC_LARGE
- bool "Support very large files in wc"
+ bool "Support very large counts"
default y
depends on BUSYBOX_WC
help
- Use "unsigned long long" in wc for counter variables.
+ Use "unsigned long long" for counter variables.
config BUSYBOX_WHO
bool "who"
default y
@@ -868,6 +883,13 @@ config BUSYBOX_WHO
help
who is used to show who is logged on.
+config BUSYBOX_W
+ bool "w"
+ default y
+ depends on BUSYBOX_FEATURE_UTMP
+ help
+ w is used to show who is logged on.
+
config BUSYBOX_USERS
bool "users"
default y
@@ -907,25 +929,11 @@ config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
help
Allow cp and mv to preserve hard links.
-comment "Common options for ls, more and telnet"
- depends on BUSYBOX_LS || BUSYBOX_MORE || BUSYBOX_TELNET
-
-config BUSYBOX_FEATURE_AUTOWIDTH
- bool "Calculate terminal & column widths"
- default y
- depends on BUSYBOX_LS || BUSYBOX_MORE || BUSYBOX_TELNET
- help
- This option allows utilities such as 'ls', 'more' and 'telnet'
- to determine the width of the screen, which can allow them to
- display additional text or avoid wrapping text onto the next line.
- If you leave this disabled, your utilities will be especially
- primitive and will be unable to determine the current screen width.
-
comment "Common options for df, du, ls"
depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
config BUSYBOX_FEATURE_HUMAN_READABLE
- bool "Support for human readable output (example 13k, 23M, 235G)"
+ bool "Support human readable output (example 13k, 23M, 235G)"
default y
depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
help
diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in
index 632c36e25..12015e095 100644
--- a/config/busybox/debianutils/Config.in
+++ b/config/busybox/debianutils/Config.in
@@ -6,11 +6,6 @@
menu "Debian Utilities"
-config BUSYBOX_MKTEMP
- bool "mktemp"
- default y
- help
- mktemp is used to create unique temporary files
config BUSYBOX_PIPE_PROGRESS
bool "pipe_progress"
default y
@@ -35,8 +30,6 @@ config BUSYBOX_FEATURE_RUN_PARTS_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_RUN_PARTS && BUSYBOX_LONG_OPTS
- help
- Support long options for the run-parts applet.
config BUSYBOX_FEATURE_RUN_PARTS_FANCY
bool "Support additional arguments"
@@ -54,22 +47,19 @@ config BUSYBOX_START_STOP_DAEMON
termination of system-level processes, usually the ones
started during the startup of the system.
+config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+ bool "Enable long options"
+ default y
+ depends on BUSYBOX_START_STOP_DAEMON && BUSYBOX_LONG_OPTS
+
config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY
bool "Support additional arguments"
default y
depends on BUSYBOX_START_STOP_DAEMON
help
- Support additional arguments.
-o|--oknodo ignored since we exit with 0 anyway
-v|--verbose
-N|--nicelevel N
-
-config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
- bool "Enable long options"
- default y
- depends on BUSYBOX_START_STOP_DAEMON && BUSYBOX_LONG_OPTS
- help
- Support long options for the start-stop-daemon applet.
config BUSYBOX_WHICH
bool "which"
default y
diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index 510cca5b1..30da5d05e 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -49,8 +49,6 @@ config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS
- help
- Enable use of long options.
config BUSYBOX_FEATURE_DIFF_DIR
bool "Enable directory support"
@@ -87,7 +85,7 @@ config BUSYBOX_VI
you may wish to use something else.
config BUSYBOX_FEATURE_VI_MAX_LEN
- int "Maximum screen width in vi"
+ int "Maximum screen width"
range 256 16384
default 4096
depends on BUSYBOX_VI
@@ -96,7 +94,7 @@ config BUSYBOX_FEATURE_VI_MAX_LEN
Make it smaller than 4k only if you are very limited on memory.
config BUSYBOX_FEATURE_VI_8BIT
- bool "Allow vi to display 8-bit chars (otherwise shows dots)"
+ bool "Allow to display 8-bit chars (otherwise shows dots)"
default n
depends on BUSYBOX_VI
help
@@ -110,7 +108,7 @@ config BUSYBOX_FEATURE_VI_COLON
default y
depends on BUSYBOX_VI
help
- Enable a limited set of colon commands for vi. This does not
+ Enable a limited set of colon commands. This does not
provide an "ex" mode.
config BUSYBOX_FEATURE_VI_YANKMARK
@@ -118,16 +116,14 @@ config BUSYBOX_FEATURE_VI_YANKMARK
default y
depends on BUSYBOX_VI
help
- This will enable you to use yank and put, as well as mark in
- busybox vi.
+ This will enable you to use yank and put, as well as mark.
config BUSYBOX_FEATURE_VI_SEARCH
bool "Enable search and replace cmds"
default y
depends on BUSYBOX_VI
help
- Select this if you wish to be able to do search and replace in
- busybox vi.
+ Select this if you wish to be able to do search and replace.
config BUSYBOX_FEATURE_VI_REGEX_SEARCH
bool "Enable regex in search and replace"
@@ -141,16 +137,15 @@ config BUSYBOX_FEATURE_VI_USE_SIGNALS
default y
depends on BUSYBOX_VI
help
- Selecting this option will make busybox vi signal aware. This will
- make busybox vi support SIGWINCH to deal with Window Changes, catch
- Ctrl-Z and Ctrl-C and alarms.
+ Selecting this option will make vi signal aware. This will support
+ SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms.
config BUSYBOX_FEATURE_VI_DOT_CMD
bool "Remember previous cmd and \".\" cmd"
default y
depends on BUSYBOX_VI
help
- Make busybox vi remember the last command and be able to repeat it.
+ Make vi remember the last command and be able to repeat it.
config BUSYBOX_FEATURE_VI_READONLY
bool "Enable -R option and \"view\" mode"
@@ -161,25 +156,23 @@ config BUSYBOX_FEATURE_VI_READONLY
open a file in read-only mode.
config BUSYBOX_FEATURE_VI_SETOPTS
- bool "Enable set-able options, ai ic showmatch"
+ bool "Enable settable options, ai ic showmatch"
default y
depends on BUSYBOX_VI
help
Enable the editor to set some (ai, ic, showmatch) options.
config BUSYBOX_FEATURE_VI_SET
- bool "Support for :set"
+ bool "Support :set"
default y
depends on BUSYBOX_VI
- help
- Support for ":set".
config BUSYBOX_FEATURE_VI_WIN_RESIZE
bool "Handle window resize"
default y
depends on BUSYBOX_VI
help
- Make busybox vi behave nicely with terminals that get resized.
+ Behave nicely with terminals that get resized.
config BUSYBOX_FEATURE_VI_ASK_TERMINAL
bool "Use 'tell me cursor position' ESC sequence to measure window"
@@ -190,15 +183,16 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
this option makes vi perform a last-ditch effort to find it:
position cursor to 999,999 and ask terminal to report real
cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-
This is not clean but helps a lot on serial lines and such.
+
config BUSYBOX_FEATURE_VI_UNDO
- bool "Support undo command 'u'"
+ bool "Support undo command \"u\""
default y
depends on BUSYBOX_VI
help
Support the 'u' command to undo insertion, deletion, and replacement
of text.
+
config BUSYBOX_FEATURE_VI_UNDO_QUEUE
bool "Enable undo operation queuing"
default y
@@ -209,6 +203,7 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE
reached, the contents of the queue are committed to the undo stack.
This increases the size of the undo code and allows some undo
operations (especially un-typing/backspacing) to be far more useful.
+
config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
int "Maximum undo character queue size"
default 256
@@ -228,7 +223,7 @@ config BUSYBOX_FEATURE_ALLOW_EXEC
default y
depends on BUSYBOX_VI || BUSYBOX_AWK
help
- Enables vi and awk features which allows user to execute
+ Enables vi and awk features which allow user to execute
shell commands (using system() C call).
endmenu
diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in
index 26de6c83f..1a6a5d343 100644
--- a/config/busybox/findutils/Config.in
+++ b/config/busybox/findutils/Config.in
@@ -42,8 +42,6 @@ config BUSYBOX_FEATURE_FIND_PERM
bool "Enable -perm: permissions matching"
default y
depends on BUSYBOX_FIND
- help
- Enable searching based on file permissions.
config BUSYBOX_FEATURE_FIND_TYPE
bool "Enable -type: file type matching (file/dir/link/...)"
@@ -57,15 +55,11 @@ config BUSYBOX_FEATURE_FIND_XDEV
bool "Enable -xdev: 'stay in filesystem'"
default y
depends on BUSYBOX_FIND
- help
- This option allows find to restrict searches to a single filesystem.
config BUSYBOX_FEATURE_FIND_MAXDEPTH
bool "Enable -mindepth N and -maxdepth N"
default y
depends on BUSYBOX_FIND
- help
- This option enables -mindepth N and -maxdepth N option.
config BUSYBOX_FEATURE_FIND_NEWER
bool "Enable -newer: compare file modification times"
@@ -79,8 +73,6 @@ config BUSYBOX_FEATURE_FIND_INUM
bool "Enable -inum: inode number matching"
default y
depends on BUSYBOX_FIND
- help
- Support the 'find -inum' option for searching by inode number.
config BUSYBOX_FEATURE_FIND_EXEC
bool "Enable -exec: execute commands"
@@ -104,15 +96,11 @@ config BUSYBOX_FEATURE_FIND_USER
bool "Enable -user: username/uid matching"
default y
depends on BUSYBOX_FIND
- help
- Support the 'find -user' option for searching by username or uid.
config BUSYBOX_FEATURE_FIND_GROUP
bool "Enable -group: group/gid matching"
default y
depends on BUSYBOX_FIND
- help
- Support the 'find -group' option for searching by group name or gid.
config BUSYBOX_FEATURE_FIND_NOT
bool "Enable the 'not' (!) operator"
@@ -141,15 +129,13 @@ config BUSYBOX_FEATURE_FIND_SIZE
bool "Enable -size: file size matching"
default y
depends on BUSYBOX_FIND
- help
- Support the 'find -size' option for searching by file size.
config BUSYBOX_FEATURE_FIND_PRUNE
bool "Enable -prune: exclude subdirectories"
default y
depends on BUSYBOX_FIND
help
- If the file is a directory, dont descend into it. Useful for
+ If the file is a directory, don't descend into it. Useful for
exclusion .svn and CVS directories.
config BUSYBOX_FEATURE_FIND_DELETE
@@ -209,7 +195,7 @@ config BUSYBOX_FGREP
config BUSYBOX_FEATURE_GREP_CONTEXT
bool "Enable before and after context flags (-A, -B and -C)"
default y
- depends on BUSYBOX_GREP || BUSYBOX_EGREP
+ depends on BUSYBOX_GREP || BUSYBOX_EGREP || BUSYBOX_FGREP
help
Print the specified number of leading (-B) and/or trailing (-A)
context surrounding our matching lines.
diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in
index 70bac7d4d..4c9e13671 100644
--- a/config/busybox/init/Config.in
+++ b/config/busybox/init/Config.in
@@ -89,7 +89,7 @@ config BUSYBOX_INIT
init is the first program run when the system boots.
config BUSYBOX_LINUXRC
- bool "Support running init from within an initrd (not initramfs)"
+ bool "linuxrc: support running init from initrd (not initramfs)"
default y
select BUSYBOX_FEATURE_SYSLOG
help
@@ -145,13 +145,15 @@ config BUSYBOX_FEATURE_INIT_SYSLOG
bool "Enable init to write to syslog"
default y
depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
+ help
+ If selected, some init messages are sent to syslog.
+ Otherwise, they are sent to VT #5 if linux virtual tty is detected
+ (if not, no separate logging is done).
-config BUSYBOX_FEATURE_EXTRA_QUIET
- bool "Be _extra_ quiet on boot"
+config BUSYBOX_FEATURE_INIT_QUIET
+ bool "Be quiet on boot (no 'init started:' message)"
default y
depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
- help
- Prevent init from logging some messages to the console during boot.
config BUSYBOX_FEATURE_INIT_COREDUMPS
bool "Support dumping core for child processes (debugging only)"
@@ -176,36 +178,18 @@ config BUSYBOX_INIT_TERMINAL_TYPE
sets TERM to "vt102" if one is found.
config BUSYBOX_FEATURE_INIT_MODIFY_CMDLINE
- bool "Modify the command-line to \"init\""
+ bool "Clear init's command line"
default y
depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
help
When launched as PID 1 and after parsing its arguments, init
wipes all the arguments but argv[0] and rewrites argv[0] to
- contain only "init", so that its command-line appears solely as
+ contain only "init", so that its command line appears solely as
"init" in tools such as ps.
If this option is set to Y, init will keep its original behavior,
otherwise, all the arguments including argv[0] will be preserved,
be they parsed or ignored by init.
The original command-line used to launch init can then be
retrieved in /proc/1/cmdline on Linux, for example.
-config BUSYBOX_MESG
- bool "mesg"
- default y
- help
- Mesg controls access to your terminal by others. It is typically
- used to allow or disallow other users to write to your terminal
-
-config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP
- bool "Enable writing to tty only by group, not by everybody"
- default y
- depends on BUSYBOX_MESG
- help
- Usually, ttys are owned by group "tty", and "write" tool is
- setgid to this group. This way, "mesg y" only needs to enable
- "write by owning group" bit in tty mode.
-
- If you set this option to N, "mesg y" will enable writing
- by anybody at all. This is not recommended.
endmenu
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 967442436..600f089ef 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -108,24 +108,13 @@ config BUSYBOX_FEATURE_FAST_TOP
but code size is slightly bigger.
config BUSYBOX_FEATURE_ETC_NETWORKS
- bool "Support for /etc/networks"
+ bool "Support /etc/networks"
default n
help
Enable support for network names in /etc/networks. This is
a rarely used feature which allows you to use names
instead of IP/mask pairs in route command.
-config BUSYBOX_FEATURE_USE_TERMIOS
- bool "Use termios to manipulate the screen"
- default y
- depends on BUSYBOX_MORE || BUSYBOX_TOP || BUSYBOX_POWERTOP
- help
- This option allows utilities such as 'more' and 'top' to determine
- the size of the screen. If you leave this disabled, your utilities
- that display things on the screen will be especially primitive and
- will be unable to determine the current screen size, and will be
- unable to move the cursor.
-
config BUSYBOX_FEATURE_EDITING
bool "Command line editing"
default y
@@ -185,15 +174,11 @@ config BUSYBOX_FEATURE_TAB_COMPLETION
bool "Tab completion"
default y
depends on BUSYBOX_FEATURE_EDITING
- help
- Enable tab completion.
config BUSYBOX_FEATURE_USERNAME_COMPLETION
bool "Username completion"
default y
depends on BUSYBOX_FEATURE_TAB_COMPLETION
- help
- Enable username completion.
config BUSYBOX_FEATURE_EDITING_FANCY_PROMPT
bool "Fancy shell prompts"
diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in
index fb3edd1d4..11dd33b1b 100644
--- a/config/busybox/loginutils/Config.in
+++ b/config/busybox/loginutils/Config.in
@@ -7,7 +7,7 @@
menu "Login/Password Management Utilities"
config BUSYBOX_FEATURE_SHADOWPASSWDS
- bool "Support for shadow passwords"
+ bool "Support shadow passwords"
default y
help
Build support for shadow password in /etc/shadow. This file is only
@@ -113,15 +113,13 @@ config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS
- help
- Support long options for the addgroup applet.
config BUSYBOX_FEATURE_ADDUSER_TO_GROUP
- bool "Support for adding users to groups"
+ bool "Support adding users to groups"
default y
depends on BUSYBOX_ADDGROUP
help
- If called with two non-option arguments,
+ If called with two non-option arguments,
addgroup will add an existing user to an
existing group.
config BUSYBOX_ADDUSER
@@ -134,8 +132,6 @@ config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS
- help
- Support long options for the adduser applet.
config BUSYBOX_FEATURE_CHECK_NAMES
bool "Enable sanity check on user/group names in adduser and addgroup"
@@ -179,9 +175,9 @@ config BUSYBOX_CHPASSWD
and uses this information to update a group of existing users.
config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO
- string "Default password encryption method (passwd -a, cryptpw -m parameter)"
+ string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)"
default "des"
- depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW
+ depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW || BUSYBOX_CHPASSWD
help
Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
config BUSYBOX_CRYPTPW
@@ -211,7 +207,7 @@ config BUSYBOX_DELGROUP
Utility for deleting a group account.
config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP
- bool "Support for removing users from groups"
+ bool "Support removing users from groups"
default y
depends on BUSYBOX_DELGROUP
help
@@ -257,7 +253,7 @@ config BUSYBOX_LOGIN_SESSION_AS_CHILD
will not be cleaned up.
config BUSYBOX_LOGIN_SCRIPTS
- bool "Support for login scripts"
+ bool "Support login scripts"
depends on BUSYBOX_LOGIN
default y
help
@@ -265,7 +261,7 @@ config BUSYBOX_LOGIN_SCRIPTS
just prior to switching from root to logged-in user.
config BUSYBOX_FEATURE_NOLOGIN
- bool "Support for /etc/nologin"
+ bool "Support /etc/nologin"
default y
depends on BUSYBOX_LOGIN
help
@@ -273,7 +269,7 @@ config BUSYBOX_FEATURE_NOLOGIN
If it exists, non-root logins are prohibited.
config BUSYBOX_FEATURE_SECURETTY
- bool "Support for /etc/securetty"
+ bool "Support /etc/securetty"
default y
depends on BUSYBOX_LOGIN
help
@@ -306,19 +302,23 @@ config BUSYBOX_SU
help
su is used to become another user during a login session.
Invoked without a username, su defaults to becoming the super user.
-
- Note that Busybox binary must be setuid root for this applet to
+ Note that busybox binary must be setuid root for this applet to
work properly.
config BUSYBOX_FEATURE_SU_SYSLOG
- bool "Enable su to write to syslog"
+ bool "Log to syslog all attempts to use su"
default y
depends on BUSYBOX_SU
config BUSYBOX_FEATURE_SU_CHECKS_SHELLS
- bool "Enable su to check user's shell to be listed in /etc/shells"
- depends on BUSYBOX_SU
+ bool "If user's shell is not in /etc/shells, disallow -s PROG"
default y
+ depends on BUSYBOX_SU
+
+config BUSYBOX_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY
+ bool "Allow blank passwords only on TTYs in /etc/securetty"
+ default n
+ depends on BUSYBOX_SU
config BUSYBOX_SULOGIN
bool "sulogin"
default y
diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in
index 311003f8e..6255c42f3 100644
--- a/config/busybox/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -42,7 +42,7 @@ config BUSYBOX_BEEP
config BUSYBOX_FEATURE_BEEP_FREQ
int "default frequency"
- range 0 2147483647
+ range 20 50000 # allowing 0 here breaks the build
default 4000
depends on BUSYBOX_BEEP
help
@@ -121,12 +121,6 @@ config BUSYBOX_FEATURE_CHAT_CLR_ABORT
default y
help
Support CLR_ABORT directive.
-config BUSYBOX_CHRT
- bool "chrt"
- default y
- help
- manipulate real-time attributes of a process.
- This requires sched_{g,s}etparam support in your libc.
config BUSYBOX_CONSPY
bool "conspy"
default y
@@ -220,7 +214,7 @@ config BUSYBOX_DEVFSD_MODLOAD
the external modutils.
config BUSYBOX_DEVFSD_FG_NP
- bool "Enables the -fg and -np options"
+ bool "Enable the -fg and -np options"
default y
depends on BUSYBOX_DEVFSD
help
@@ -253,20 +247,6 @@ config BUSYBOX_DEVMEM
help
devmem is a small program that reads and writes from physical
memory using /dev/mem.
-config BUSYBOX_EJECT
- bool "eject"
- default y
- select BUSYBOX_PLATFORM_LINUX
- help
- Used to eject cdroms. (defaults to /dev/cdrom)
-
-config BUSYBOX_FEATURE_EJECT_SCSI
- bool "SCSI support"
- default y
- depends on BUSYBOX_EJECT
- help
- Add the -s option to eject, this allows to eject SCSI-Devices and
- usb-storage devices.
config BUSYBOX_FBSPLASH
bool "fbsplash"
default y
@@ -327,7 +307,7 @@ config BUSYBOX_FEATURE_HDPARM_GET_IDENTITY
default y
depends on BUSYBOX_HDPARM
help
- Enables the -I and -i options to obtain detailed information
+ Enable the -I and -i options to obtain detailed information
directly from drives about their capabilities and supported ATA
feature set. If no device name is specified, hdparm will read
identify data from stdin. Enabling this option will add about 16k...
@@ -337,7 +317,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_SCAN_HWIF
default y
depends on BUSYBOX_HDPARM
help
- Enables the 'hdparm -R' option to register an IDE interface.
+ Enable the 'hdparm -R' option to register an IDE interface.
This is dangerous stuff, so you should probably say N.
config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
@@ -345,7 +325,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
default y
depends on BUSYBOX_HDPARM
help
- Enables the 'hdparm -U' option to un-register an IDE interface.
+ Enable the 'hdparm -U' option to un-register an IDE interface.
This is dangerous stuff, so you should probably say N.
config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET
@@ -353,7 +333,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET
default y
depends on BUSYBOX_HDPARM
help
- Enables the 'hdparm -w' option to perform a device reset.
+ Enable the 'hdparm -w' option to perform a device reset.
This is dangerous stuff, so you should probably say N.
config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
@@ -361,7 +341,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
default y
depends on BUSYBOX_HDPARM
help
- Enables the 'hdparm -x' option to tristate device for hotswap,
+ Enable the 'hdparm -x' option to tristate device for hotswap,
and the '-b' option to get/set bus state. This is dangerous
stuff, so you should probably say N.
@@ -370,7 +350,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_GETSET_DMA
default y
depends on BUSYBOX_HDPARM
help
- Enables the 'hdparm -d' option to get/set using_dma flag.
+ Enable the 'hdparm -d' option to get/set using_dma flag.
config BUSYBOX_I2CGET
bool "i2cget"
default y
@@ -405,27 +385,6 @@ config BUSYBOX_INOTIFYD
help
Simple inotify daemon. Reports filesystem changes. Requires
kernel >= 2.6.13
-config BUSYBOX_IONICE
- bool "ionice"
- default y
- select BUSYBOX_PLATFORM_LINUX
- help
- Set/set program io scheduling class and priority
- Requires kernel >= 2.6.13
-config BUSYBOX_LAST
- bool "last"
- default y
- depends on BUSYBOX_FEATURE_WTMP
- help
- 'last' displays a list of the last users that logged into the system.
-
-config BUSYBOX_FEATURE_LAST_FANCY
- bool "Turn on output of extra information"
- default y
- depends on BUSYBOX_LAST
- help
- 'last' displays detailed information about the last users that
- logged into the system (mimics sysvinit last). +900 bytes.
config BUSYBOX_LESS
bool "less"
default y
@@ -492,7 +451,6 @@ config BUSYBOX_FEATURE_LESS_ASK_TERMINAL
this option makes less perform a last-ditch effort to find it:
position cursor to 999,999 and ask terminal to report real
cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-
This is not clean but helps a lot on serial lines and such.
config BUSYBOX_FEATURE_LESS_DASHCMD
@@ -504,11 +462,18 @@ config BUSYBOX_FEATURE_LESS_DASHCMD
less itself ('-' keyboard command).
config BUSYBOX_FEATURE_LESS_LINENUMS
- bool "Enable dynamic switching of line numbers"
+ bool "Enable -N (dynamic switching of line numbers)"
default y
depends on BUSYBOX_FEATURE_LESS_DASHCMD
+config BUSYBOX_LSSCSI
+ bool "lsscsi"
+ default y
+ #select PLATFORM_LINUX
help
- Enables "-N" command.
+ lsscsi is a utility for displaying information about SCSI buses in the
+ system and devices connected to them.
+
+ This version uses sysfs (/sys/bus/scsi/devices) only.
config BUSYBOX_MAKEDEVS
bool "makedevs"
default y
@@ -550,11 +515,6 @@ config BUSYBOX_MICROCOM
default y
help
The poor man's minicom utility for chatting with serial port devices.
-config BUSYBOX_MOUNTPOINT
- bool "mountpoint"
- default y
- help
- mountpoint checks if the directory is a mountpoint.
config BUSYBOX_MT
bool "mt"
default y
@@ -575,6 +535,12 @@ config BUSYBOX_NANDDUMP
select BUSYBOX_PLATFORM_LINUX
help
Dump the content of raw NAND chip
+config BUSYBOX_PARTPROBE
+ bool "partprobe"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ Ask kernel to rescan partition table.
config BUSYBOX_RAIDAUTORUN
bool "raidautorun"
default y
@@ -632,32 +598,12 @@ config BUSYBOX_SETSERIAL
select BUSYBOX_PLATFORM_LINUX
help
Retrieve or set Linux serial port.
-config BUSYBOX_SETSID
- bool "setsid"
- default y
- help
- setsid runs a program in a new session
config BUSYBOX_STRINGS
bool "strings"
default y
help
strings prints the printable character sequences for each file
specified.
-config BUSYBOX_TASKSET
- bool "taskset"
- default n # doesn't build on some non-x86 targets (m68k)
- help
- Retrieve or set a processes's CPU affinity.
- This requires sched_{g,s}etaffinity support in your libc.
-
-config BUSYBOX_FEATURE_TASKSET_FANCY
- bool "Fancy output"
- default y
- depends on BUSYBOX_TASKSET
- help
- Add code for fancy output. This merely silences a compiler-warning
- and adds about 135 Bytes. May be needed for machines with alot
- of CPUs.
config BUSYBOX_TIME
bool "time"
default y
@@ -665,12 +611,6 @@ config BUSYBOX_TIME
The time command runs the specified program with the given arguments.
When the command finishes, time writes a message to standard output
giving timing statistics about this program run.
-config BUSYBOX_TIMEOUT
- bool "timeout"
- default y
- help
- Runs a program and watches it. If it does not terminate in
- specified number of seconds, it is sent a signal.
config BUSYBOX_TTYSIZE
bool "ttysize"
default y
@@ -731,12 +671,6 @@ config BUSYBOX_VOLNAME
default y
help
Prints a CD-ROM volume name.
-config BUSYBOX_WALL
- bool "wall"
- default y
- depends on BUSYBOX_FEATURE_UTMP
- help
- Write a message to all users that are logged in.
config BUSYBOX_WATCHDOG
bool "watchdog"
default y
diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in
index 62e1ee439..98f0e9b05 100644
--- a/config/busybox/modutils/Config.in
+++ b/config/busybox/modutils/Config.in
@@ -9,9 +9,11 @@ menu "Linux Module Utilities"
config BUSYBOX_MODPROBE_SMALL
bool "Simplified modutils"
default y
- select BUSYBOX_PLATFORM_LINUX
help
- Simplified modutils.
+ Build smaller (~1.5 kbytes), simplified module tools.
+
+ This option by itself does not enable any applets -
+ you need to select applets individually below.
With this option modprobe does not require modules.dep file
and does not use /etc/modules.conf file.
@@ -32,11 +34,6 @@ config BUSYBOX_MODPROBE_SMALL
Additional module parameters can be stored in
/etc/modules/$module_name files.
- Apart from modprobe, other utilities are also provided:
- - insmod is an alias to modprobe
- - rmmod is an alias to modprobe -r
- - depmod generates modules.dep.bb
-
config BUSYBOX_DEPMOD
bool "depmod"
default y
@@ -62,7 +59,6 @@ config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
bool "Pretty output"
default y
depends on BUSYBOX_LSMOD && !BUSYBOX_MODPROBE_SMALL
- select BUSYBOX_PLATFORM_LINUX
help
This option makes output format of lsmod adjusted to
the format of module-init-tools for Linux kernel 2.6.
@@ -73,20 +69,6 @@ config BUSYBOX_MODINFO
select BUSYBOX_PLATFORM_LINUX
help
Show information about a Linux Kernel module
-config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
- bool "Accept module options on modprobe command line"
- default y
- depends on BUSYBOX_MODPROBE_SMALL
- select BUSYBOX_PLATFORM_LINUX
- help
- Allow insmod and modprobe take module options from command line.
-
-config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
- bool "Skip loading of already loaded modules"
- default y
- depends on BUSYBOX_MODPROBE_SMALL
- help
- Check if the module is already loaded.
config BUSYBOX_MODPROBE
bool "modprobe"
default y
@@ -99,7 +81,6 @@ config BUSYBOX_FEATURE_MODPROBE_BLACKLIST
bool "Blacklist support"
default y
depends on BUSYBOX_MODPROBE && !BUSYBOX_MODPROBE_SMALL
- select BUSYBOX_PLATFORM_LINUX
help
Say 'y' here to enable support for the 'blacklist' command in
modprobe.conf. This prevents the alias resolver to resolve
@@ -115,38 +96,34 @@ config BUSYBOX_RMMOD
comment "Options common to multiple modutils"
+config BUSYBOX_FEATURE_CMDLINE_MODULE_OPTIONS
+ bool "Accept module options on modprobe command line"
+ default y
+ depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE
+ help
+ Allow insmod and modprobe take module options from the applets'
+ command line.
+
+config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
+ bool "Skip loading of already loaded modules"
+ default y
+ depends on BUSYBOX_MODPROBE_SMALL && (BUSYBOX_DEPMOD || BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
+ help
+ Check if the module is already loaded.
+
config BUSYBOX_FEATURE_2_4_MODULES
bool "Support version 2.2/2.4 Linux kernels"
default n
- depends on BUSYBOX_INSMOD || BUSYBOX_RMMOD || BUSYBOX_LSMOD
- select BUSYBOX_PLATFORM_LINUX
+ depends on (BUSYBOX_INSMOD || BUSYBOX_LSMOD || BUSYBOX_MODPROBE || BUSYBOX_RMMOD) && !BUSYBOX_MODPROBE_SMALL
help
Support module loading for 2.2.x and 2.4.x Linux kernels.
This increases size considerably. Say N unless you plan
to run ancient kernels.
-config BUSYBOX_FEATURE_INSMOD_TRY_MMAP
- bool "Try to load module from a mmap'ed area"
- default n
- depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE_SMALL
- select BUSYBOX_PLATFORM_LINUX
- help
- This option causes module loading code to try to mmap
- module first. If it does not work (for example,
- it does not work for compressed modules), module will be read
- (and unpacked if needed) into a memory block allocated by malloc.
-
- The only case when mmap works but malloc does not is when
- you are trying to load a big module on a very memory-constrained
- machine. Malloc will momentarily need 2x as much memory as mmap.
-
- Choosing N saves about 250 bytes of code (on 32-bit x86).
-
config BUSYBOX_FEATURE_INSMOD_VERSION_CHECKING
bool "Enable module version checking"
default n
depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
- select BUSYBOX_PLATFORM_LINUX
help
Support checking of versions for modules. This is used to
ensure that the kernel and module are made for each other.
@@ -155,10 +132,9 @@ config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
bool "Add module symbols to kernel symbol table"
default n
depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
- select BUSYBOX_PLATFORM_LINUX
help
By adding module symbols to the kernel symbol table, Oops messages
- occuring within kernel modules can be properly debugged. By enabling
+ occurring within kernel modules can be properly debugged. By enabling
this feature, module symbols will always be added to the kernel symbol
table for proper debugging support. If you are not interested in
Oops messages from kernel modules, say N.
@@ -167,7 +143,6 @@ config BUSYBOX_FEATURE_INSMOD_LOADINKMEM
bool "In kernel memory optimization (uClinux only)"
default n
depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
- select BUSYBOX_PLATFORM_LINUX
help
This is a special uClinux only memory optimization that lets insmod
load the specified kernel module directly into kernel space, reducing
@@ -178,7 +153,6 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP
bool "Enable insmod load map (-m) option"
default n
depends on BUSYBOX_FEATURE_2_4_MODULES && BUSYBOX_INSMOD
- select BUSYBOX_PLATFORM_LINUX
help
Enabling this, one would be able to get a load map
output on stdout. This makes kernel module debugging
@@ -189,8 +163,7 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP
config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL
bool "Symbols in load map"
default y
- depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_MODPROBE_SMALL
- select BUSYBOX_PLATFORM_LINUX
+ depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP
help
Without this option, -m will only output section
load map. With this option, -m will also output
@@ -200,18 +173,32 @@ config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE
bool "Support tainted module checking with new kernels"
default y
depends on (BUSYBOX_LSMOD || BUSYBOX_FEATURE_2_4_MODULES) && !BUSYBOX_MODPROBE_SMALL
- select BUSYBOX_PLATFORM_LINUX
help
Support checking for tainted modules. These are usually binary
only modules that will make the linux-kernel list ignore your
support request.
This option is required to support GPLONLY modules.
+config BUSYBOX_FEATURE_INSMOD_TRY_MMAP
+ bool "Try to load module from a mmap'ed area"
+ default n
+ depends on (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL
+ help
+ This option causes module loading code to try to mmap
+ module first. If it does not work (for example,
+ it does not work for compressed modules), module will be read
+ (and unpacked if needed) into a memory block allocated by malloc.
+
+ The only case when mmap works but malloc does not is when
+ you are trying to load a big module on a very memory-constrained
+ machine. Malloc will momentarily need 2x as much memory as mmap.
+
+ Choosing N saves about 250 bytes of code (on 32-bit x86).
+
config BUSYBOX_FEATURE_MODUTILS_ALIAS
- bool "Support for module.aliases file"
+ bool "Support module.aliases file"
default y
- depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE
- select BUSYBOX_PLATFORM_LINUX
+ depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL
help
Generate and parse modules.alias containing aliases for bus
identifiers:
@@ -225,10 +212,9 @@ config BUSYBOX_FEATURE_MODUTILS_ALIAS
Say Y if unsure.
config BUSYBOX_FEATURE_MODUTILS_SYMBOLS
- bool "Support for module.symbols file"
+ bool "Support module.symbols file"
default y
- depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE
- select BUSYBOX_PLATFORM_LINUX
+ depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL
help
Generate and parse modules.symbols containing aliases for
symbol_request() kernel calls, such as:
@@ -239,7 +225,7 @@ config BUSYBOX_FEATURE_MODUTILS_SYMBOLS
config BUSYBOX_DEFAULT_MODULES_DIR
string "Default directory containing modules"
default "/lib/modules"
- depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL || BUSYBOX_MODINFO
+ depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO
help
Directory that contains kernel modules.
Defaults to "/lib/modules"
@@ -247,9 +233,13 @@ config BUSYBOX_DEFAULT_MODULES_DIR
config BUSYBOX_DEFAULT_DEPMOD_FILE
string "Default name of modules.dep"
default "modules.dep"
- depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL || BUSYBOX_MODINFO
+ depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO
help
Filename that contains kernel modules dependencies.
- Defaults to "modules.dep"
+ Defaults to "modules.dep".
+ If you configured the "simplified modutils" (MODPROBE_SMALL), a
+ ".bb" suffix will be added after this name. Do not specify ".bb"
+ here unless you intend your depmod or modprobe to work on
+ "modules.dep.bb.bb" or such.
endmenu
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index fa6a318d4..b859cb9f3 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -101,7 +101,7 @@ config BUSYBOX_FTPD
bool "ftpd"
default y
help
- simple FTP daemon. You have to run it via inetd.
+ Simple FTP daemon. You have to run it via inetd.
config BUSYBOX_FEATURE_FTPD_WRITE
bool "Enable upload commands"
@@ -143,8 +143,6 @@ config BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS
bool "Enable long options in ftpget/ftpput"
default y
depends on BUSYBOX_LONG_OPTS && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT)
- help
- Support long options for the ftpget/ftpput applet.
config BUSYBOX_HOSTNAME
bool "hostname"
default y
@@ -160,7 +158,7 @@ config BUSYBOX_HTTPD
bool "httpd"
default y
help
- Serve web pages via an HTTP server.
+ HTTP server.
config BUSYBOX_FEATURE_HTTPD_RANGES
bool "Support 'Ranges:' header"
@@ -214,7 +212,7 @@ config BUSYBOX_FEATURE_HTTPD_CGI
when specific URLs are requested.
config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
- bool "Support for running scripts through an interpreter"
+ bool "Support running scripts through an interpreter"
default y
depends on BUSYBOX_FEATURE_HTTPD_CGI
help
@@ -243,7 +241,7 @@ config BUSYBOX_FEATURE_HTTPD_ENCODE_URL_STR
"<Hello World>".
config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES
- bool "Support for custom error pages"
+ bool "Support custom error pages"
default y
depends on BUSYBOX_HTTPD
help
@@ -256,7 +254,7 @@ config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES
message.
config BUSYBOX_FEATURE_HTTPD_PROXY
- bool "Support for reverse proxy"
+ bool "Support reverse proxy"
default y
depends on BUSYBOX_HTTPD
help
@@ -268,7 +266,7 @@ config BUSYBOX_FEATURE_HTTPD_PROXY
http://hostname[:port]/new/path/myfile.
config BUSYBOX_FEATURE_HTTPD_GZIP
- bool "Support for GZIP content encoding"
+ bool "Support GZIP content encoding"
default y
depends on BUSYBOX_HTTPD
help
@@ -383,14 +381,14 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP
utilities, or enable these applets in Busybox.
config BUSYBOX_FEATURE_IFUPDOWN_IPV4
- bool "Support for IPv4"
+ bool "Support IPv4"
default y
depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
help
If you want ifup/ifdown to talk IPv4, leave this on.
config BUSYBOX_FEATURE_IFUPDOWN_IPV6
- bool "Support for IPv6"
+ bool "Support IPv6"
default y
depends on (BUSYBOX_IFUP || BUSYBOX_IFDOWN) && BUSYBOX_FEATURE_IPV6
help
@@ -406,7 +404,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
a weird network setup you don't need it.
config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP
- bool "Support for external dhcp clients"
+ bool "Support external DHCP clients"
default n
depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
help
@@ -585,6 +583,11 @@ config BUSYBOX_IPCALC
ipcalc takes an IP address and netmask and calculates the
resulting broadcast, network, and host range.
+config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS
+ bool "Enable long options"
+ default y
+ depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS
+
config BUSYBOX_FEATURE_IPCALC_FANCY
bool "Fancy IPCALC, more options, adds 1 kbyte"
default y
@@ -592,13 +595,6 @@ config BUSYBOX_FEATURE_IPCALC_FANCY
help
Adds the options hostname, prefix and silent to the output of
"ipcalc".
-
-config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS
- bool "Enable long options"
- default y
- depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS
- help
- Support long options for the ipcalc applet.
config BUSYBOX_FAKEIDENTD
bool "fakeidentd"
default y
@@ -680,7 +676,7 @@ config BUSYBOX_NETSTAT
netstat prints information about the Linux networking subsystem.
config BUSYBOX_FEATURE_NETSTAT_WIDE
- bool "Enable wide netstat output"
+ bool "Enable wide output"
default y
depends on BUSYBOX_NETSTAT
help
@@ -761,6 +757,12 @@ config BUSYBOX_SLATTACH
help
slattach is a small utility to attach network interfaces to serial
lines.
+config BUSYBOX_SSL_CLIENT
+ bool "ssl_client"
+ default y
+ select BUSYBOX_TLS
+ help
+ This tool pipes data to/from a socket, TLS-encrypting it.
config BUSYBOX_TCPSVD
bool "tcpsvd"
default y
@@ -799,6 +801,11 @@ config BUSYBOX_FEATURE_TELNET_AUTOLOGIN
remote host you are connecting to. This is useful when you need to
log into a machine without telling the username (autologin). This
option enables `-a' and `-l USER' arguments.
+
+config BUSYBOX_FEATURE_TELNET_WIDTH
+ bool "Enable window size autodetection"
+ default y
+ depends on BUSYBOX_TELNET
config BUSYBOX_TELNETD
bool "telnetd"
default y
@@ -918,11 +925,9 @@ config BUSYBOX_FEATURE_TFTP_BLOCKSIZE
"blksize" and "tsize" options.
config BUSYBOX_FEATURE_TFTP_PROGRESS_BAR
- bool "Enable tftp progress meter"
+ bool "Enable progress bar"
default y
depends on BUSYBOX_TFTP && BUSYBOX_FEATURE_TFTP_BLOCKSIZE
- help
- Show progress bar.
config BUSYBOX_TFTP_DEBUG
bool "Enable debug"
@@ -931,6 +936,9 @@ config BUSYBOX_TFTP_DEBUG
help
Make tftp[d] print debugging messages on stderr.
This is useful if you are diagnosing a bug in tftp[d].
+config BUSYBOX_TLS
+ bool #No description makes it a hidden option
+ default n
config BUSYBOX_TRACEROUTE
bool "traceroute"
default y
@@ -957,8 +965,6 @@ config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP
bool "Enable -I option (use ICMP instead of UDP)"
default y
depends on BUSYBOX_TRACEROUTE || BUSYBOX_TRACEROUTE6
- help
- Add option -I to use ICMP ECHO instead of UDP datagrams.
config BUSYBOX_TUNCTL
bool "tunctl"
default y
@@ -986,12 +992,15 @@ config BUSYBOX_WGET
wget is a utility for non-interactive download of files from HTTP
and FTP servers.
+config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
+ bool "Enable long options"
+ default y
+ depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
+
config BUSYBOX_FEATURE_WGET_STATUSBAR
- bool "Enable a nifty process meter (+2k)"
+ bool "Enable progress bar (+2k)"
default y
depends on BUSYBOX_WGET
- help
- Enable the transfer progress bar for wget transfers.
config BUSYBOX_FEATURE_WGET_AUTHENTICATION
bool "Enable HTTP authentication"
@@ -1000,13 +1009,6 @@ config BUSYBOX_FEATURE_WGET_AUTHENTICATION
help
Support authenticated HTTP transfers.
-config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
- bool "Enable long options"
- default y
- depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
- help
- Support long options for the wget applet.
-
config BUSYBOX_FEATURE_WGET_TIMEOUT
bool "Enable timeout option -T SEC"
default y
@@ -1021,18 +1023,59 @@ config BUSYBOX_FEATURE_WGET_TIMEOUT
FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
will work in addition to -T.
+config BUSYBOX_FEATURE_WGET_HTTPS
+ bool "Support HTTPS using internal TLS code"
+ default y
+ depends on BUSYBOX_WGET
+ select BUSYBOX_TLS
+ help
+ wget will use internal TLS code to connect to https:// URLs.
+ Note:
+ On NOMMU machines, ssl_helper applet should be available
+ in the $PATH for this to work. Make sure to select that applet.
+
+ Note: currently, TLS code only makes TLS I/O work, it
+ does *not* check that the peer is who it claims to be, etc.
+ IOW: it uses peer-supplied public keys to establish encryption
+ and signing keys, then encrypts and signs outgoing data and
+ decrypts incoming data.
+ It does not check signature hashes on the incoming data:
+ this means that attackers manipulating TCP packets can
+ send altered data and we unknowingly receive garbage.
+ (This check might be relatively easy to add).
+ It does not check public key's certificate:
+ this means that the peer may be an attacker impersonating
+ the server we think we are talking to.
+
+ If you think this is unacceptable, consider this. As more and more
+ servers switch to HTTPS-only operation, without such "crippled"
+ TLS code it is *impossible* to simply download a kernel source
+ from kernel.org. Which can in real world translate into
+ "my small automatic tooling to build cross-compilers from sources
+ no longer works, I need to additionally keep a local copy
+ of ~4 megabyte source tarball of a SSL library and ~2 megabyte
+ source "config/busybox/of wget, need to compile and built both before I can"
+ download anything. All this despite the fact that the build
+ is done in a QEMU sandbox on a machine with absolutely nothing
+ worth stealing, so I don't care if someone would go to a lot
+ of trouble to intercept my HTTPS download to send me an altered
+ kernel tarball".
+
+ If you still think this is unacceptable, send patches.
+
+ If you still think this is unacceptable, do not want to send
+ patches, but do want to waste bandwidth expaining how wrong
+ it is, you will be ignored.
+
config BUSYBOX_FEATURE_WGET_OPENSSL
bool "Try to connect to HTTPS using openssl"
default y
depends on BUSYBOX_WGET
help
- Choose how wget establishes SSL connection for https:// URLs.
-
- Busybox itself contains no SSL code. wget will spawn
- a helper program to talk over HTTPS.
+ Try to use openssl to handle HTTPS.
OpenSSL has a simple SSL client for debug purposes.
- If you select "openssl" helper, wget will effectively run:
+ If you select this option, wget will effectively run:
"openssl s_client -quiet -connect hostname:443
-servername hostname 2>/dev/null" and pipe its data
through it. -servername is not used if hostname is numeric.
@@ -1045,24 +1088,9 @@ config BUSYBOX_FEATURE_WGET_OPENSSL
openssl is also a big binary, often dynamically linked
against ~15 libraries.
-config BUSYBOX_FEATURE_WGET_SSL_HELPER
- bool "Try to connect to HTTPS using ssl_helper"
- default y
- depends on BUSYBOX_WGET
- help
- Choose how wget establishes SSL connection for https:// URLs.
-
- Busybox itself contains no SSL code. wget will spawn
- a helper program to talk over HTTPS.
-
- ssl_helper is a tool which can be built statically
- from busybox sources against a small embedded SSL library.
- Please see networking/ssl_helper/README.
- It does not require double host resolution and emits
- error messages to stderr.
-
- Precompiled static binary may be available at
- http://busybox.net/downloads/binaries/
+ If openssl can't be executed, internal TLS code will be used
+ (if you enabled it); if openssl can be executed but fails later,
+ wget can't detect this, and download will fail.
config BUSYBOX_WHOIS
bool "whois"
default y
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index 4be268aac..75dd99c09 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -5,35 +5,43 @@
#
config BUSYBOX_UDHCPC6
- bool "udhcp client for DHCPv6 (udhcpc6)"
+ bool "udhcpc6 (DHCPv6 client, EXPERIMENTAL)"
default n # not yet ready
depends on BUSYBOX_FEATURE_IPV6
help
udhcpc6 is a DHCPv6 client
-config BUSYBOX_UDHCPD
- bool "udhcp server (udhcpd)"
+config BUSYBOX_FEATURE_UDHCPC6_RFC3646
+ bool "Support RFC 3646 (DNS server and search list)"
default y
- select BUSYBOX_PLATFORM_LINUX
+ depends on BUSYBOX_UDHCPC6
help
- udhcpd is a DHCP server geared primarily toward embedded systems,
- while striving to be fully functional and RFC compliant.
+ List of DNS servers and domain search list can be requested with
+ "-O dns" and "-O search". If server gives these values,
+ they will be set in environment variables "dns" and "search".
-config BUSYBOX_DHCPRELAY
- bool "dhcprelay"
+config BUSYBOX_FEATURE_UDHCPC6_RFC4704
+ bool "Support RFC 4704 (Client FQDN)"
default y
+ depends on BUSYBOX_UDHCPC6
help
- dhcprelay listens for dhcp requests on one or more interfaces
- and forwards these requests to a different interface or dhcp
- server.
+ You can request FQDN to be given by server using "-O fqdn".
-config BUSYBOX_DUMPLEASES
- bool "Lease display utility (dumpleases)"
+config BUSYBOX_FEATURE_UDHCPC6_RFC4833
+ bool "Support RFC 4833 (Timezones)"
default y
+ depends on BUSYBOX_UDHCPC6
help
- dumpleases displays the leases written out by the udhcpd server.
- Lease times are stored in the file by time remaining in lease, or
- by the absolute time that it expires in seconds from epoch.
+ You can request POSIX timezone with "-O tz" and timezone name
+ with "-O timezone".
+
+config BUSYBOX_UDHCPD
+ bool "udhcpd (DHCP server)"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ udhcpd is a DHCP server geared primarily toward embedded systems,
+ while striving to be fully functional and RFC compliant.
config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY
bool "Rewrite the lease file at every new acknowledge"
@@ -67,8 +75,24 @@ config BUSYBOX_DHCPD_LEASES_FILE
udhcpd stores addresses in a lease file. This is the absolute path
of the file. Normally it is safe to leave it untouched.
+config BUSYBOX_DUMPLEASES
+ bool "dumpleases"
+ default y
+ help
+ dumpleases displays the leases written out by the udhcpd.
+ Lease times are stored in the file by time remaining in lease, or
+ by the absolute time that it expires in seconds from epoch.
+
+config BUSYBOX_DHCPRELAY
+ bool "dhcprelay"
+ default y
+ help
+ dhcprelay listens for dhcp requests on one or more interfaces
+ and forwards these requests to a different interface or dhcp
+ server.
+
config BUSYBOX_UDHCPC
- bool "udhcp client (udhcpc)"
+ bool "udhcpc (DHCP client)"
default y
select BUSYBOX_PLATFORM_LINUX
help
@@ -99,6 +123,15 @@ config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT
they will be replaced with string "bad" when exporting
to the environment.
+config BUSYBOX_UDHCPC_DEFAULT_SCRIPT
+ string "Absolute path to config script"
+ default "/usr/share/udhcpc/default.script"
+ depends on BUSYBOX_UDHCPC
+ help
+ This script is called after udhcpc receives an answer. See
+ examples/udhcp for a working example. Normally it is safe
+ to leave this untouched.
+
config BUSYBOX_FEATURE_UDHCP_PORT
bool "Enable '-P port' option for udhcpd and udhcpc"
default n
@@ -120,7 +153,7 @@ config BUSYBOX_UDHCP_DEBUG
are very verbose and useful for debugging only.
config BUSYBOX_FEATURE_UDHCP_RFC3397
- bool "Support for RFC3397 domain search (experimental)"
+ bool "Support RFC3397 domain search (experimental)"
default y
depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
help
@@ -129,22 +162,13 @@ config BUSYBOX_FEATURE_UDHCP_RFC3397
and SIP servers option 120, specified in RFC 3361.
config BUSYBOX_FEATURE_UDHCP_8021Q
- bool "Support for 802.1Q VLAN parameters"
+ bool "Support 802.1Q VLAN parameters"
default y
depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
help
If selected, both client and server will support passing of VLAN
ID and priority via options 132 and 133 as per 802.1Q.
-config BUSYBOX_UDHCPC_DEFAULT_SCRIPT
- string "Absolute path to config script"
- default "/usr/share/udhcpc/default.script"
- depends on BUSYBOX_UDHCPC
- help
- This script is called after udhcpc receives an answer. See
- examples/udhcp for a working example. Normally it is safe
- to leave this untouched.
-
config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS
int "DHCP options slack buffer size"
default 80
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index 783d3bfc6..da93002bd 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -85,18 +85,18 @@ config BUSYBOX_PIDOF
those id's on the standard output.
config BUSYBOX_FEATURE_PIDOF_SINGLE
- bool "Enable argument for single shot (-s)"
+ bool "Enable single shot (-s)"
default y
depends on BUSYBOX_PIDOF
help
- Support argument '-s' for returning only the first pid found.
+ Support '-s' for returning only the first pid found.
config BUSYBOX_FEATURE_PIDOF_OMIT
- bool "Enable argument for omitting pids (-o)"
+ bool "Enable omitting pids (-o PID)"
default y
depends on BUSYBOX_PIDOF
help
- Support argument '-o' for omitting the given pids in output.
+ Support '-o PID' for omitting the given pid(s) in output.
The special pid %PPID can be used to name the parent process
of the pidof, in other words the calling shell or shell script.
config BUSYBOX_PMAP
@@ -109,6 +109,14 @@ config BUSYBOX_POWERTOP
default y
help
Analyze power consumption on Intel-based laptops
+
+config BUSYBOX_FEATURE_POWERTOP_INTERACTIVE
+ bool "Accept keyboard commands"
+ default y
+ depends on BUSYBOX_POWERTOP
+ help
+ Without this, powertop will only refresh display every 10 seconds.
+ No keyboard commands will work, only ^C to terminate.
config BUSYBOX_PS
bool "ps"
default y
@@ -133,19 +141,10 @@ config BUSYBOX_FEATURE_PS_LONG
Adds fields PPID, RSS, START, TIME & TTY
config BUSYBOX_FEATURE_PS_TIME
- bool "Enable time and elapsed time output"
+ bool "Support -o time and -o etime output specifiers"
default y
depends on BUSYBOX_PS && BUSYBOX_DESKTOP
select BUSYBOX_PLATFORM_LINUX
- help
- Support -o time and -o etime output specifiers.
-
-config BUSYBOX_FEATURE_PS_ADDITIONAL_COLUMNS
- bool "Enable additional ps columns"
- default y
- depends on BUSYBOX_PS && BUSYBOX_DESKTOP
- help
- Support -o rgroup, -o ruser, -o nice output specifiers.
config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS
bool "Support Linux prior to 2.4.0 and non-ELF systems"
@@ -154,6 +153,11 @@ config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS
help
Include support for measuring HZ on old kernels and non-ELF systems
(if you are on Linux 2.4.0+ and use ELF, you don't need this)
+
+config BUSYBOX_FEATURE_PS_ADDITIONAL_COLUMNS
+ bool "Support -o rgroup, -o ruser, -o nice specifiers"
+ default y
+ depends on BUSYBOX_PS && BUSYBOX_DESKTOP
config BUSYBOX_PSTREE
bool "pstree"
default y
@@ -164,12 +168,6 @@ config BUSYBOX_PWDX
default y
help
Report current working directory of a process
-config BUSYBOX_RENICE
- bool "renice"
- default y
- help
- Renice alters the scheduling priority of one or more running
- processes.
config BUSYBOX_SMEMCAP
bool "smemcap"
default y
@@ -188,6 +186,14 @@ config BUSYBOX_TOP
The top program provides a dynamic real-time view of a running
system.
+config BUSYBOX_FEATURE_TOP_INTERACTIVE
+ bool "Accept keyboard commands"
+ default y
+ depends on BUSYBOX_TOP
+ help
+ Without this, top will only refresh display every 5 seconds.
+ No keyboard commands will work, only ^C to terminate.
+
config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
bool "Show CPU per-process usage percentage"
default y
@@ -244,11 +250,11 @@ config BUSYBOX_UPTIME
on, and the system load averages for the past 1, 5, and 15 minutes.
config BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT
- bool "Support for showing the number of users"
+ bool "Show the number of users"
default y
depends on BUSYBOX_UPTIME && BUSYBOX_FEATURE_UTMP
help
- Makes uptime display the number of users currently logged on.
+ Display the number of users currently logged on.
config BUSYBOX_WATCH
bool "watch"
default y
@@ -257,7 +263,7 @@ config BUSYBOX_WATCH
output to the screen.
config BUSYBOX_FEATURE_SHOW_THREADS
- bool "Support for showing threads in ps/pstree/top"
+ bool "Support thread display in ps/pstree/top"
default y
depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
help
diff --git a/config/busybox/selinux/Config.in b/config/busybox/selinux/Config.in
index 6dc3e75ea..9f062a3ed 100644
--- a/config/busybox/selinux/Config.in
+++ b/config/busybox/selinux/Config.in
@@ -18,8 +18,6 @@ config BUSYBOX_FEATURE_CHCON_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_CHCON && BUSYBOX_LONG_OPTS
- help
- Support long options for the chcon applet.
config BUSYBOX_GETENFORCE
bool "getenforce"
default n
@@ -56,8 +54,6 @@ config BUSYBOX_FEATURE_RUNCON_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_RUNCON && BUSYBOX_LONG_OPTS
- help
- Support long options for the runcon applet.
config BUSYBOX_SELINUXENABLED
bool "selinuxenabled"
default n
diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in
index 3d41fb5f8..201dcfeec 100644
--- a/config/busybox/shell/Config.in
+++ b/config/busybox/shell/Config.in
@@ -18,9 +18,19 @@ choice
config BUSYBOX_SH_IS_ASH
depends on !BUSYBOX_NOMMU
bool "ash"
+ help
+ Choose ash to be the shell executed by 'sh' name.
+ The ash code will be built into busybox. If you don't select
+ "ash" choice (CONFIG_ASH), this shell may only be invoked by
+ the name 'sh' (and not 'ash').
config BUSYBOX_SH_IS_HUSH
bool "hush"
+ help
+ Choose hush to be the shell executed by 'sh' name.
+ The hush code will be built into busybox. If you don't select
+ "hush" choice (CONFIG_HUSH), this shell may only be invoked by
+ the name 'sh' (and not 'hush').
config BUSYBOX_SH_IS_NONE
bool "none"
@@ -32,7 +42,8 @@ choice
default BUSYBOX_BASH_IS_NONE
help
Choose which shell you want to be executed by 'bash' alias.
- The ash shell is the most bash compatible and full featured one.
+ The ash shell is the most bash compatible and full featured one,
+ although compatibility is far from being complete.
Note that selecting this option does not switch on any bash
compatibility code. It merely makes it possible to install
@@ -47,9 +58,19 @@ choice
config BUSYBOX_BASH_IS_ASH
depends on !BUSYBOX_NOMMU
bool "ash"
+ help
+ Choose ash to be the shell executed by 'bash' name.
+ The ash code will be built into busybox. If you don't select
+ "ash" choice (CONFIG_ASH), this shell may only be invoked by
+ the name 'bash' (and not 'ash').
config BUSYBOX_BASH_IS_HUSH
bool "hush"
+ help
+ Choose hush to be the shell executed by 'bash' name.
+ The hush code will be built into busybox. If you don't select
+ "hush" choice (CONFIG_HUSH), this shell may only be invoked by
+ the name 'bash' (and not 'hush').
config BUSYBOX_BASH_IS_NONE
bool "none"
@@ -68,12 +89,15 @@ config BUSYBOX_ASH
shell (by Herbert Xu), which was created by porting the 'ash' shell
(written by Kenneth Almquist) from NetBSD.
+# ash options
+# note: Don't remove !NOMMU part in the next line; it would break
+# menuconfig's indenting.
+if !BUSYBOX_NOMMU && (BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH)
+
config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE
bool "Optimize for size instead of speed"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Compile ash for reduced size at the price of speed.
config BUSYBOX_ASH_INTERNAL_GLOB
bool "Use internal glob() implementation"
@@ -83,6 +107,23 @@ config BUSYBOX_ASH_INTERNAL_GLOB
Do not use glob() function from libc, use internal implementation.
Use this if you are getting "glob.h: No such file or directory"
or similar build errors.
+ Note that as of now (2017-01), uclibc and musl glob() both have bugs
+ which would break ash if you select N here.
+
+config BUSYBOX_ASH_BASH_COMPAT
+ bool "bash-compatible extensions"
+ default y
+ depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+
+config BUSYBOX_ASH_JOB_CONTROL
+ bool "Job control"
+ default y
+ depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+
+config BUSYBOX_ASH_ALIAS
+ bool "Alias support"
+ default y
+ depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
config BUSYBOX_ASH_RANDOM_SUPPORT
bool "Pseudorandom generator and $RANDOM variable"
@@ -100,88 +141,62 @@ config BUSYBOX_ASH_EXPAND_PRMT
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
help
- "PS#" may contain volatile content, such as backquote commands.
+ $PS# may contain volatile content, such as backquote commands.
This option recreates the prompt string from the environment
variable each time it is displayed.
-config BUSYBOX_ASH_BASH_COMPAT
- bool "bash-compatible extensions"
- default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enable bash-compatible extensions.
-
config BUSYBOX_ASH_IDLE_TIMEOUT
- bool "Idle timeout variable"
- default n
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enables bash-like auto-logout after $TMOUT seconds of idle time.
-
-config BUSYBOX_ASH_JOB_CONTROL
- bool "Job control"
+ bool "Idle timeout variable $TMOUT"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
help
- Enable job control in the ash shell.
+ Enable bash-like auto-logout after $TMOUT seconds of idle time.
-config BUSYBOX_ASH_ALIAS
- bool "Alias support"
- default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enable alias support in the ash shell.
-
-config BUSYBOX_ASH_GETOPTS
- bool "Builtin getopt to parse positional parameters"
+config BUSYBOX_ASH_MAIL
+ bool "Check for new mail in interactive shell"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
help
- Enable support for getopts builtin in ash.
+ Enable "check for new mail" function:
+ if set, $BUSYBOX_MAIL file and $BUSYBOX_MAILPATH list of files
+ are checked for mtime changes, and "you have mail"
+ message is printed if change is detected.
-config BUSYBOX_ASH_BUILTIN_ECHO
- bool "Builtin version of 'echo'"
+config BUSYBOX_ASH_ECHO
+ bool "echo builtin"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enable support for echo builtin in ash.
-config BUSYBOX_ASH_BUILTIN_PRINTF
- bool "Builtin version of 'printf'"
+config BUSYBOX_ASH_PRINTF
+ bool "printf builtin"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enable support for printf builtin in ash.
-config BUSYBOX_ASH_BUILTIN_TEST
- bool "Builtin version of 'test'"
+config BUSYBOX_ASH_TEST
+ bool "test builtin"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enable support for test builtin in ash.
config BUSYBOX_ASH_HELP
bool "help builtin"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enable help builtin in ash.
-config BUSYBOX_ASH_CMDCMD
- bool "'command' command to override shell builtins"
+config BUSYBOX_ASH_GETOPTS
+ bool "getopts builtin"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
- help
- Enable support for the ash 'command' builtin, which allows
- you to run the specified command with the specified arguments,
- even when there is an ash builtin command with the same name.
-config BUSYBOX_ASH_MAIL
- bool "Check for new mail on interactive shells"
+config BUSYBOX_ASH_CMDCMD
+ bool "command builtin"
default y
depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
help
- Enable "check for new mail" function in the ash shell.
+ Enable support for the 'command' builtin, which allows
+ you to run the specified command or builtin,
+ even when there is a function with the same name.
+
+endif # ash options
config BUSYBOX_CTTYHACK
bool "cttyhack"
default y
@@ -243,8 +258,6 @@ config BUSYBOX_HUSH_BASH_COMPAT
bool "bash-compatible extensions"
default y
depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
- help
- Enable bash-compatible extensions.
config BUSYBOX_HUSH_BRACE_EXPANSION
bool "Brace expansion"
@@ -253,13 +266,6 @@ config BUSYBOX_HUSH_BRACE_EXPANSION
help
Enable {abc,def} extension.
-config BUSYBOX_HUSH_HELP
- bool "help builtin"
- default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
- help
- Enable help builtin in hush. Code size + ~1 kbyte.
-
config BUSYBOX_HUSH_INTERACTIVE
bool "Interactive mode"
default y
@@ -274,8 +280,6 @@ config BUSYBOX_HUSH_SAVEHISTORY
bool "Save command history to .hush_history"
default y
depends on BUSYBOX_HUSH_INTERACTIVE && BUSYBOX_FEATURE_EDITING_SAVEHISTORY
- help
- Enable history saving in hush.
config BUSYBOX_HUSH_JOB
bool "Job control"
@@ -289,42 +293,38 @@ config BUSYBOX_HUSH_JOB
but no separate process group is formed.
config BUSYBOX_HUSH_TICK
- bool "Process substitution"
+ bool "Support process substitution"
default y
depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
help
- Enable process substitution `command` and $(command) in hush.
+ Enable `command` and $(command).
config BUSYBOX_HUSH_IF
bool "Support if/then/elif/else/fi"
default y
depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
- help
- Enable if/then/elif/else/fi in hush.
config BUSYBOX_HUSH_LOOPS
bool "Support for, while and until loops"
default y
depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
- help
- Enable for, while and until loops in hush.
config BUSYBOX_HUSH_CASE
bool "Support case ... esac statement"
default y
depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
help
- Enable case ... esac statement in hush. +400 bytes.
+ Enable case ... esac statement. +400 bytes.
config BUSYBOX_HUSH_FUNCTIONS
bool "Support funcname() { commands; } syntax"
default y
depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
help
- Enable support for shell functions in hush. +800 bytes.
+ Enable support for shell functions. +800 bytes.
config BUSYBOX_HUSH_LOCAL
- bool "Support local builtin"
+ bool "local builtin"
default y
depends on BUSYBOX_HUSH_FUNCTIONS
help
@@ -338,20 +338,95 @@ config BUSYBOX_HUSH_RANDOM_SUPPORT
Enable pseudorandom generator and dynamic variable "$RANDOM".
Each read of "$RANDOM" will generate a new pseudorandom value.
+config BUSYBOX_HUSH_MODE_X
+ bool "Support 'hush -x' option and 'set -x' command"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ help
+ This instructs hush to print commands before execution.
+ Adds ~300 bytes.
+
+config BUSYBOX_HUSH_ECHO
+ bool "echo builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_PRINTF
+ bool "printf builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_TEST
+ bool "test builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_HELP
+ bool "help builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_EXPORT
+ bool "export builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
config BUSYBOX_HUSH_EXPORT_N
bool "Support 'export -n' option"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_HUSH_EXPORT
help
export -n unexports variables. It is a bash extension.
-config BUSYBOX_HUSH_MODE_X
- bool "Support 'hush -x' option and 'set -x' command"
+config BUSYBOX_HUSH_KILL
+ bool "kill builtin (supports kill %jobspec)"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_WAIT
+ bool "wait builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_TRAP
+ bool "trap builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_TYPE
+ bool "type builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_READ
+ bool "read builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_SET
+ bool "set builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_UNSET
+ bool "unset builtin"
default y
depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
- help
- This instructs hush to print commands before execution.
- Adds ~300 bytes.
+
+config BUSYBOX_HUSH_ULIMIT
+ bool "ulimit builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_UMASK
+ bool "umask builtin"
+ default y
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
+config BUSYBOX_HUSH_MEMLEAK
+ bool "memleak builtin (debugging)"
+ default n
+ depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
config BUSYBOX_MSH
bool "msh (deprecated: aliased to hush)"
@@ -361,6 +436,9 @@ config BUSYBOX_MSH
msh is deprecated and will be removed, please migrate to hush.
+comment "Options common to all shells"
+if BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
config BUSYBOX_FEATURE_SH_MATH
bool "POSIX math support"
default y
@@ -399,23 +477,11 @@ config BUSYBOX_FEATURE_SH_STANDALONE
for use as a rescue shell, in the event that you screw up your system.
This is implemented by re-execing /proc/self/exe (typically)
- with right parameters. Some selected applets ("NOFORK" applets)
- can even be executed without creating new process.
- Instead, busybox will call <applet>_main() internally.
-
- However, this causes problems in chroot jails without mounted /proc
- and with ps/top (command name can be shown as 'exe' for applets
- started this way).
-# untrue?
-# Note that this will *also* cause applets to take precedence
-# over shell builtins of the same name. So turning this on will
-# eliminate any performance gained by turning on the builtin "echo"
-# and "test" commands in ash.
-# untrue?
-# Note that when using this option, the shell will attempt to directly
-# run '/bin/busybox'. If you do not have the busybox binary sitting in
-# that exact location with that exact name, this option will not work at
-# all.
+ with right parameters.
+
+ However, there are drawbacks: it is problematic in chroot jails
+ without mounted /proc, and ps/top may show command name as 'exe'
+ for applets started this way.
config BUSYBOX_FEATURE_SH_NOFORK
bool "Run 'nofork' applets directly"
@@ -444,5 +510,6 @@ config BUSYBOX_FEATURE_SH_HISTFILESIZE
to set shell history size. Note that its max value is capped
by "History size" setting in library tuning section.
+endif # Options common to all shells
endmenu
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 6ebb77d06..513adc0f2 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -58,7 +58,7 @@ config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING
default y
depends on BUSYBOX_LOGREAD
help
- 'logread' ouput to slow serial terminals can have
+ 'logread' output to slow serial terminals can have
side effects on syslog because of the semaphore.
This option make logread to double buffer copy
from circular buffer, minimizing semaphore
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index 9968f3489..dc878e670 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -54,6 +54,17 @@ config BUSYBOX_BLOCKDEV
default y
help
Performs some ioctls with block devices.
+config BUSYBOX_CAL
+ bool "cal"
+ default y
+ help
+ cal is used to display a monthly calendar.
+config BUSYBOX_CHRT
+ bool "chrt"
+ default y
+ help
+ manipulate real-time attributes of a process.
+ This requires sched_{g,s}etparam support in your libc.
config BUSYBOX_DMESG
bool "dmesg"
default y
@@ -68,7 +79,7 @@ config BUSYBOX_DMESG
wish to enable the 'dmesg' utility.
config BUSYBOX_FEATURE_DMESG_PRETTY
- bool "Pretty dmesg output"
+ bool "Pretty output"
default y
depends on BUSYBOX_DMESG
help
@@ -87,6 +98,25 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
<5>Linux version 2.6.17.4 .....
<6>BIOS-provided physical RAM map:
<6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+config BUSYBOX_EJECT
+ bool "eject"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ Used to eject cdroms. (defaults to /dev/cdrom)
+
+config BUSYBOX_FEATURE_EJECT_SCSI
+ bool "SCSI support"
+ default y
+ depends on BUSYBOX_EJECT
+ help
+ Add the -s option to eject, this allows to eject SCSI-Devices and
+ usb-storage devices.
+config BUSYBOX_FALLOCATE
+ bool "fallocate"
+ default y
+ help
+ Preallocate space for files.
config BUSYBOX_FATATTR
bool "fatattr"
default y
@@ -104,7 +134,7 @@ config BUSYBOX_FBSET
if you wish to enable the 'fbset' utility.
config BUSYBOX_FEATURE_FBSET_FANCY
- bool "Turn on extra fbset options"
+ bool "Enable extra options"
default y
depends on BUSYBOX_FBSET
help
@@ -114,7 +144,7 @@ config BUSYBOX_FEATURE_FBSET_FANCY
options.
config BUSYBOX_FEATURE_FBSET_READMODE
- bool "Turn on fbset readmode support"
+ bool "Enable readmode support"
default y
depends on BUSYBOX_FBSET
help
@@ -142,8 +172,6 @@ config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
default y
depends on BUSYBOX_FDISK
depends on !BUSYBOX_LFS # with LFS no special code is needed
- help
- Enable this option to support large disks > 4GB.
config BUSYBOX_FEATURE_FDISK_WRITABLE
bool "Write support"
@@ -251,6 +279,13 @@ config BUSYBOX_FSCK_MINIX
power goes off in the middle of a write. This utility allows you to
check for and attempt to repair any corruption that occurs to a minix
filesystem.
+config BUSYBOX_FSFREEZE
+ bool "fsfreeze"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ select BUSYBOX_LONG_OPTS
+ help
+ Halt new accesses and flush writes on a mounted filesystem.
config BUSYBOX_FSTRIM
bool "fstrim"
default y
@@ -296,6 +331,12 @@ config BUSYBOX_HD
default y
help
hd is an alias to hexdump -C.
+config BUSYBOX_XXD
+ bool "xxd"
+ default y
+ help
+ The xxd utility is used to display binary data in a readable
+ way that is comparable to the output from most hex editors.
config BUSYBOX_HWCLOCK
bool "hwclock"
default y
@@ -310,10 +351,6 @@ config BUSYBOX_FEATURE_HWCLOCK_LONG_OPTIONS
bool "Support long options (--hctosys,...)"
default y
depends on BUSYBOX_HWCLOCK && BUSYBOX_LONG_OPTS
- help
- By default, the hwclock utility only uses short options. If you
- are overly fond of its long options, such as --hctosys, --utc, etc)
- then enable this option.
config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS
bool "Use FHS /var/lib/hwclock/adjtime"
@@ -326,6 +363,13 @@ config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS
classic /etc/adjtime path.
pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
+config BUSYBOX_IONICE
+ bool "ionice"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ Set/set program io scheduling class and priority
+ Requires kernel >= 2.6.13
config BUSYBOX_IPCRM
bool "ipcrm"
default y
@@ -340,6 +384,20 @@ config BUSYBOX_IPCS
help
The ipcs utility is used to provide information on the currently
allocated System V interprocess (IPC) objects in the system.
+config BUSYBOX_LAST
+ bool "last"
+ default y
+ depends on BUSYBOX_FEATURE_WTMP
+ help
+ 'last' displays a list of the last users that logged into the system.
+
+config BUSYBOX_FEATURE_LAST_FANCY
+ bool "Output extra information"
+ default y
+ depends on BUSYBOX_LAST
+ help
+ 'last' displays detailed information about the last users that
+ logged into the system (mimics sysvinit last). +900 bytes.
config BUSYBOX_LOSETUP
bool "losetup"
default y
@@ -423,6 +481,24 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
These devices will request userspace look up the files in
/lib/firmware/ and if it exists, send it to the kernel for
loading into the hardware.
+config BUSYBOX_MESG
+ bool "mesg"
+ default y
+ help
+ Mesg controls access to your terminal by others. It is typically
+ used to allow or disallow other users to write to your terminal
+
+config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP
+ bool "Enable writing to tty only by group, not by everybody"
+ default y
+ depends on BUSYBOX_MESG
+ help
+ Usually, ttys are owned by group "tty", and "write" tool is
+ setgid to this group. This way, "mesg y" only needs to enable
+ "write by owning group" bit in tty mode.
+
+ If you set this option to N, "mesg y" will enable writing
+ by anybody at all. This is not recommended.
config BUSYBOX_MKE2FS
bool "mke2fs"
default y
@@ -574,7 +650,7 @@ config BUSYBOX_FEATURE_MOUNT_CIFS
config BUSYBOX_FEATURE_MOUNT_FLAGS
depends on BUSYBOX_MOUNT
- bool "Support lots of -o flags in mount"
+ bool "Support lots of -o flags"
default y
help
Without this, mount only supports ro/rw/remount. With this, it
@@ -595,6 +671,11 @@ config BUSYBOX_FEATURE_MOUNT_OTHERTAB
default y
help
Support mount -T (specifying an alternate fstab)
+config BUSYBOX_MOUNTPOINT
+ bool "mountpoint"
+ default y
+ help
+ mountpoint checks if the directory is a mountpoint.
config BUSYBOX_NSENTER
bool "nsenter"
default y
@@ -640,6 +721,12 @@ config BUSYBOX_READPROFILE
#select PLATFORM_LINUX
help
This allows you to parse /proc/profile for basic profiling.
+config BUSYBOX_RENICE
+ bool "renice"
+ default y
+ help
+ Renice alters the scheduling priority of one or more running
+ processes.
config BUSYBOX_REV
bool "rev"
default y
@@ -685,6 +772,19 @@ config BUSYBOX_LINUX64
select BUSYBOX_PLATFORM_LINUX
help
Alias to "setarch linux64".
+config BUSYBOX_SETPRIV
+ bool "setpriv"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ select BUSYBOX_LONG_OPTS
+ help
+ Run a program with different Linux privilege settings.
+ Requires kernel >= 3.5
+config BUSYBOX_SETSID
+ bool "setsid"
+ default y
+ help
+ setsid runs a program in a new session
config BUSYBOX_SWAPON
bool "swapon"
default y
@@ -738,6 +838,21 @@ config BUSYBOX_SWITCH_ROOT
* Because the Linux kernel uses rootfs internally as the starting
and ending point for searching through the kernel's doubly linked
list of active mount points. That's why.
+config BUSYBOX_TASKSET
+ bool "taskset"
+ default y
+ help
+ Retrieve or set a processes's CPU affinity.
+ This requires sched_{g,s}etaffinity support in your libc.
+
+config BUSYBOX_FEATURE_TASKSET_FANCY
+ bool "Fancy output"
+ default y
+ depends on BUSYBOX_TASKSET
+ help
+ Needed for machines with more than 32-64 CPUs:
+ affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
+ in this case. Otherwise, it is limited to sizeof(long).
config BUSYBOX_UEVENT
bool "uevent"
default y
@@ -764,10 +879,17 @@ config BUSYBOX_FEATURE_UMOUNT_ALL
config BUSYBOX_UNSHARE
bool "unshare"
default y
- depends on BUSYBOX_LONG_OPTS && !BUSYBOX_NOMMU
+ depends on !BUSYBOX_NOMMU
select BUSYBOX_PLATFORM_LINUX
+ select BUSYBOX_LONG_OPTS
help
Run program with some namespaces unshared from parent.
+config BUSYBOX_WALL
+ bool "wall"
+ default y
+ depends on BUSYBOX_FEATURE_UTMP
+ help
+ Write a message to all users that are logged in.
comment "Common options for mount/umount"
depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT
@@ -802,7 +924,7 @@ config BUSYBOX_FEATURE_MOUNT_LOOP_CREATE
if it does not find a free one.
config BUSYBOX_FEATURE_MTAB_SUPPORT
- bool "Support for the old /etc/mtab file"
+ bool "Support old /etc/mtab file"
default n
depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT
select BUSYBOX_FEATURE_MOUNT_FAKE
diff --git a/config/busybox/util-linux/volume_id/Config.in b/config/busybox/util-linux/volume_id/Config.in
index 3db6b6099..c40f584da 100644
--- a/config/busybox/util-linux/volume_id/Config.in
+++ b/config/busybox/util-linux/volume_id/Config.in
@@ -11,31 +11,18 @@ config BUSYBOX_VOLUMEID
menu "Filesystem/Volume identification"
depends on BUSYBOX_VOLUMEID
-
config BUSYBOX_FEATURE_VOLUMEID_BCACHE
bool "bcache filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_BTRFS
bool "btrfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_CRAMFS
bool "cramfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_EXFAT
bool "exFAT filesystem"
default y
@@ -44,16 +31,10 @@ config BUSYBOX_FEATURE_VOLUMEID_EXFAT
exFAT (extended FAT) is a proprietary file system designed especially
for flash drives. It has many features from NTFS, but with less
overhead. exFAT is used on most SDXC cards for consumer electronics.
-
-
config BUSYBOX_FEATURE_VOLUMEID_EXT
bool "Ext filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_F2FS
bool "f2fs filesystem"
default y
@@ -63,64 +44,34 @@ config BUSYBOX_FEATURE_VOLUMEID_F2FS
which is adapted to newer forms of storage. F2FS also remedies some
known issues of the older log structured file systems, such as high
cleaning overhead.
-
-
config BUSYBOX_FEATURE_VOLUMEID_FAT
bool "fat filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_HFS
bool "hfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_ISO9660
bool "iso9660 filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_JFS
bool "jfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID
bool "linuxraid"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_LINUXSWAP
bool "linux swap filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_LUKS
bool "luks filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_NILFS
bool "nilfs filesystem"
default y
@@ -136,40 +87,22 @@ config BUSYBOX_FEATURE_VOLUMEID_NILFS
SOX compliance logging, and so forth. It can serve as an alternative
filesystem for Linux desktop environment, or as a basis of advanced
storage appliances.
-
-
config BUSYBOX_FEATURE_VOLUMEID_NTFS
bool "ntfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_OCFS2
bool "ocfs2 filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_REISERFS
bool "Reiser filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_ROMFS
bool "romfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS
bool "SquashFS filesystem"
default y
@@ -179,16 +112,10 @@ config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS
intended for general read-only filesystem use and in constrained block
device/memory systems (e.g. embedded systems) where low overhead is
needed.
-
-
config BUSYBOX_FEATURE_VOLUMEID_SYSV
bool "sysv filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_UBIFS
bool "UBIFS filesystem"
default y
@@ -196,126 +123,65 @@ config BUSYBOX_FEATURE_VOLUMEID_UBIFS
help
UBIFS (Unsorted Block Image File System) is a file
system for use with raw flash memory media.
-
-
config BUSYBOX_FEATURE_VOLUMEID_UDF
bool "udf filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
-
### config FEATURE_VOLUMEID_HIGHPOINTRAID
### bool "highpoint raid"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_HPFS
### bool "hpfs filesystem"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_ISWRAID
### bool "intel raid"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_LSIRAID
### bool "lsi raid"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_LVM
### bool "lvm"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_MAC
### bool "mac filesystem"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_MINIX
### bool "minix filesystem"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_MSDOS
### bool "msdos filesystem"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_NVIDIARAID
### bool "nvidia raid"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_PROMISERAID
### bool "promise raid"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_SILICONRAID
### bool "silicon raid"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_UFS
### bool "ufs filesystem"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
### config FEATURE_VOLUMEID_VIARAID
### bool "via raid"
### default y
### depends on VOLUMEID
-### help
-### TODO
-
-
config BUSYBOX_FEATURE_VOLUMEID_XFS
bool "xfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
- help
- TODO
-
endmenu
diff --git a/patches/busybox-1.26.2/0200-reactivate-check-for-tty.patch b/patches/busybox-1.27.2/0200-reactivate-check-for-tty.patch
similarity index 100%
rename from patches/busybox-1.26.2/0200-reactivate-check-for-tty.patch
rename to patches/busybox-1.27.2/0200-reactivate-check-for-tty.patch
diff --git a/patches/busybox-1.26.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.27.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
similarity index 100%
rename from patches/busybox-1.26.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
rename to patches/busybox-1.27.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
diff --git a/patches/busybox-1.26.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.27.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
similarity index 100%
rename from patches/busybox-1.26.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
rename to patches/busybox-1.27.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
diff --git a/patches/busybox-1.26.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.27.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
similarity index 100%
rename from patches/busybox-1.26.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
rename to patches/busybox-1.27.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
diff --git a/patches/busybox-1.26.2/series b/patches/busybox-1.27.2/series
similarity index 86%
rename from patches/busybox-1.26.2/series
rename to patches/busybox-1.27.2/series
index bc29762d6..84c80aa6e 100644
--- a/patches/busybox-1.26.2/series
+++ b/patches/busybox-1.27.2/series
@@ -7,4 +7,4 @@
0201-Fix-the-format-warning-when-building-applets-usage_p.patch
0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# 85c3e49d1a3d51e934d942443f99beba - git-ptx-patches magic
+# 0036b420b1a49106a872780e90251289 - git-ptx-patches magic
diff --git a/rules/busybox.make b/rules/busybox.make
index 5c661fafd..13db84d11 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox
#
# Paths and names
#
-BUSYBOX_VERSION := 1.26.2
-BUSYBOX_MD5 := bb59d25ee2643db20f212eec539429f1
+BUSYBOX_VERSION := 1.27.2
+BUSYBOX_MD5 := 476186f4bab81781dab2369bfd42734e
BUSYBOX := busybox-$(BUSYBOX_VERSION)
BUSYBOX_SUFFIX := tar.bz2
BUSYBOX_URL := https://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX)
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 02/19] dbus: version bump 1.10.18 -> 1.10.22
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 03/19] dbus: add upstream patch to avoid blocking at boot time Clemens Gruber
` (17 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/dbus.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/dbus.make b/rules/dbus.make
index a90bdd49a..8139009ff 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
#
# Paths and names
#
-DBUS_VERSION := 1.10.18
-DBUS_MD5 := 1209c455598165a0c5263d4201894179
+DBUS_VERSION := 1.10.22
+DBUS_MD5 := baaa10b7cb49086ad91179a8decfadc5
DBUS := dbus-$(DBUS_VERSION)
DBUS_SUFFIX := tar.gz
DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 03/19] dbus: add upstream patch to avoid blocking at boot time
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 02/19] dbus: version bump 1.10.18 -> 1.10.22 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 04/19] e2fsprogs: version bump 1.43.4 -> 1.43.6 Clemens Gruber
` (16 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
...er-expat-Tell-Expat-not-to-defend-against.patch | 74 ++++++++++++++++++++++
patches/dbus-1.10.22/autogen.sh | 1 +
patches/dbus-1.10.22/series | 5 ++
3 files changed, 80 insertions(+)
create mode 100644 patches/dbus-1.10.22/0010-config-loader-expat-Tell-Expat-not-to-defend-against.patch
create mode 120000 patches/dbus-1.10.22/autogen.sh
create mode 100644 patches/dbus-1.10.22/series
diff --git a/patches/dbus-1.10.22/0010-config-loader-expat-Tell-Expat-not-to-defend-against.patch b/patches/dbus-1.10.22/0010-config-loader-expat-Tell-Expat-not-to-defend-against.patch
new file mode 100644
index 000000000..5289f720f
--- /dev/null
+++ b/patches/dbus-1.10.22/0010-config-loader-expat-Tell-Expat-not-to-defend-against.patch
@@ -0,0 +1,74 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 21 Jul 2017 10:46:39 +0100
+Subject: [PATCH] config-loader-expat: Tell Expat not to defend against hash
+ collisions
+
+By default, Expat uses cryptographic-quality random numbers as a salt for
+its hash algorithm, and since 2.2.1 it gets them from the getrandom
+syscall on Linux. That syscall refuses to return any entropy until the
+kernel's CSPRNG (random pool) has been initialized. Unfortunately, this
+can take as long as 40 seconds on embedded devices with few entropy
+sources, which is too long: if the system dbus-daemon blocks for that
+length of time, important D-Bus clients like systemd and systemd-logind
+time out and fail to connect to it.
+
+We're parsing small configuration files here, and we trust them
+completely, so we don't need to defend against hash collisions: nobody
+is going to be crafting them to cause pathological performance.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101858
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Tested-by: Christopher Hewitt <hewitt@ieee.org>
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+
+Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf
+Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>
+---
+ bus/config-loader-expat.c | 14 ++++++++++++++
+ configure.ac | 8 ++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
+index b571fda3181f..27cbe2d090a0 100644
+--- a/bus/config-loader-expat.c
++++ b/bus/config-loader-expat.c
+@@ -203,6 +203,20 @@ bus_config_load (const DBusString *file,
+ goto failed;
+ }
+
++ /* We do not need protection against hash collisions (CVE-2012-0876)
++ * because we are only parsing trusted XML; and if we let Expat block
++ * waiting for the CSPRNG to be initialized, as it does by default to
++ * defeat CVE-2012-0876, it can cause timeouts during early boot on
++ * entropy-starved embedded devices.
++ *
++ * TODO: When Expat gets a more explicit API for this than
++ * XML_SetHashSalt, check for that too, and use it preferentially.
++ * https://github.com/libexpat/libexpat/issues/91 */
++#if defined(HAVE_XML_SETHASHSALT)
++ /* Any nonzero number will do. https://xkcd.com/221/ */
++ XML_SetHashSalt (expat, 4);
++#endif
++
+ if (!_dbus_string_get_dirname (file, &dirname))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+diff --git a/configure.ac b/configure.ac
+index 1fabddd190a4..4e9c1de7bafc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -938,6 +938,14 @@ XML_CFLAGS=
+ AC_SUBST([XML_CFLAGS])
+ AC_SUBST([XML_LIBS])
+
++save_cflags="$CFLAGS"
++save_libs="$LIBS"
++CFLAGS="$CFLAGS $XML_CFLAGS"
++LIBS="$LIBS $XML_LIBS"
++AC_CHECK_FUNCS([XML_SetHashSalt])
++CFLAGS="$save_cflags"
++LIBS="$save_libs"
++
+ # Thread lib detection
+ AC_ARG_VAR([THREAD_LIBS])
+ save_libs="$LIBS"
diff --git a/patches/dbus-1.10.22/autogen.sh b/patches/dbus-1.10.22/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/dbus-1.10.22/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/dbus-1.10.22/series b/patches/dbus-1.10.22/series
new file mode 100644
index 000000000..5883e2956
--- /dev/null
+++ b/patches/dbus-1.10.22/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 10
+0010-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+# 0ea4df42f11d73dba6bd33a9d510501c - git-ptx-patches magic
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 04/19] e2fsprogs: version bump 1.43.4 -> 1.43.6
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 02/19] dbus: version bump 1.10.18 -> 1.10.22 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 03/19] dbus: add upstream patch to avoid blocking at boot time Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2 Clemens Gruber
` (15 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Update configure flags and remove legacy ext4dev link and config.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
projectroot/etc/mke2fs.conf | 5 -----
rules/e2fsprogs.in | 7 -------
rules/e2fsprogs.make | 11 +++++------
rules/host-e2fsprogs.make | 4 +++-
4 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/projectroot/etc/mke2fs.conf b/projectroot/etc/mke2fs.conf
index 3795b1ed6..a55289440 100644
--- a/projectroot/etc/mke2fs.conf
+++ b/projectroot/etc/mke2fs.conf
@@ -12,11 +12,6 @@
features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
inode_size = 256
}
- ext4dev = {
- features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
- inode_size = 256
- options = test_fs=1
- }
small = {
blocksize = 1024
inode_size = 128
diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in
index 67936a97c..f4dae9dfd 100644
--- a/rules/e2fsprogs.in
+++ b/rules/e2fsprogs.in
@@ -142,13 +142,6 @@ config E2FSPROGS_INSTALL_FSCK_EXT4
help
Create link to fsck.ext4 program.
-config E2FSPROGS_INSTALL_FSCK_EXT4DEV
- bool
- prompt "fsck.ext4dev"
- select E2FSPROGS_INSTALL_E2FSCK
- help
- Create link to fsck.ext4dev program.
-
config E2FSPROGS_INSTALL_DEBUGFS
bool
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 5a83b3a13..c4f2e3bb8 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
#
# Paths and names
#
-E2FSPROGS_VERSION := 1.43.4
-E2FSPROGS_MD5 := 0bd1c74f357f6e9ae2ab6fa6229b9aea
+E2FSPROGS_VERSION := 1.43.6
+E2FSPROGS_MD5 := 94fb7105284474a71cf5dd0e03b92661
E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_SUFFIX := tar.gz
E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
@@ -40,6 +40,7 @@ E2FSPROGS_CONF_TOOL := autoconf
E2FSPROGS_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--disable-symlink-install \
+ --disable-relative-symlinks \
--disable-symlink-build \
--disable-verbose-makecmds \
--enable-elf-shlibs \
@@ -68,7 +69,8 @@ E2FSPROGS_CONF_OPT := \
--disable-nls \
--enable-threads=posix \
--disable-rpath \
- --disable-fuse2fs
+ --disable-fuse2fs \
+ --without-included-gettext
E2FSPROGS_MAKE_OPT := $(if $(filter 1,$(strip $(PTXDIST_VERBOSE))),V=1)
E2FSPROGS_INSTALL_OPT := install
@@ -139,9 +141,6 @@ endif
ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4
@$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4)
endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4DEV
- @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4dev)
-endif
ifdef PTXCONF_E2FSPROGS_INSTALL_DEBUGFS
diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make
index cbc5a385d..c19b7b954 100644
--- a/rules/host-e2fsprogs.make
+++ b/rules/host-e2fsprogs.make
@@ -25,6 +25,7 @@ HOST_E2FSPROGS_CONF_TOOL := autoconf
HOST_E2FSPROGS_CONF_OPT := \
$(HOST_AUTOCONF) \
--disable-symlink-install \
+ --disable-relative-symlinks \
--disable-symlink-build \
--disable-verbose-makecmds \
--disable-elf-shlibs \
@@ -53,7 +54,8 @@ HOST_E2FSPROGS_CONF_OPT := \
--disable-nls \
--enable-threads=posix \
--disable-rpath \
- --disable-fuse2fs
+ --disable-fuse2fs \
+ --without-included-gettext
# vim: syntax=make
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (2 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 04/19] e2fsprogs: version bump 1.43.4 -> 1.43.6 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-04 6:00 ` Denis OSTERLAND
2017-09-01 16:39 ` [ptxdist] [PATCH 06/19] keyutils: version bump 1.5.9 -> 1.5.10 Clemens Gruber
` (14 subsequent siblings)
18 siblings, 1 reply; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/host-imx-cst.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/host-imx-cst.make b/rules/host-imx-cst.make
index b5aad5aee..dc2a17f4a 100644
--- a/rules/host-imx-cst.make
+++ b/rules/host-imx-cst.make
@@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_IMX_CST) += host-imx-cst
#
# Paths and names
#
-HOST_IMX_CST_VERSION := 2.3.1
-HOST_IMX_CST_MD5 := 01684a853e9245dbd6db42acad5861dd
+HOST_IMX_CST_VERSION := 2.3.2
+HOST_IMX_CST_MD5 := a81766cab2e184ab12e459c0476f6639
HOST_IMX_CST := cst-$(HOST_IMX_CST_VERSION)
HOST_IMX_CST_SUFFIX := tar.gz
HOST_IMX_CST_URL := https://www.nxp.com/webapp/sps/download/license.jsp?colCode=IMX_CST_TOOL
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2
2017-09-01 16:39 ` [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2 Clemens Gruber
@ 2017-09-04 6:00 ` Denis OSTERLAND
2017-09-05 6:20 ` Michael Olbrich
0 siblings, 1 reply; 28+ messages in thread
From: Denis OSTERLAND @ 2017-09-04 6:00 UTC (permalink / raw)
To: ptxdist
Hi Clemens,
as far as I know, this will require a change in Barebox scripts/imx/imx-image.c,
because in this version it expects input file as command line option
and does not understand piped input anymore.
This is how I deal with this issue, but it wont work with both versions.
From: Denis Osterland <Denis.Osterland@diehl.com>
Date: Thu, 18 May 2017 07:40:48 +0200
Subject: [PATCH] imx-image: Adapt command line of cst call to match changed
cli.
Current version 2.3.2 of freescales code-sign-tool expects '-i file' instead of stdin.
---
scripts/imx/imx-image.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index dd5799cccc4b..ed3f4ffa50c3 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -517,7 +517,7 @@ static int nop(const struct config_data *data)
static int hab_sign(struct config_data *data)
{
int fd, outfd, ret, lockfd;
- char *csffile, *command;
+ char *csffile, *command, *csfinput;
struct stat s;
char *cst;
void *buf;
@@ -530,6 +530,10 @@ static int hab_sign(struct config_data *data)
if (ret < 0)
exit(1);
+ ret = asprintf(&csfinput, "%s.csf", data->outfile);
+ if (ret < 0)
+ exit(1);
+
ret = stat(csffile, &s);
if (!ret) {
if (S_ISREG(s.st_mode)) {
@@ -546,7 +550,7 @@ static int hab_sign(struct config_data *data)
}
}
- ret = asprintf(&command, "%s -o %s", cst, csffile);
+ ret = asprintf(&command, "%s -o %s -i %s", cst, csffile, csfinput);
if (ret < 0)
return -ENOMEM;
@@ -568,15 +572,20 @@ static int hab_sign(struct config_data *data)
return -errno;
}
- FILE *f = popen(command, "w");
+ FILE *f = fopen(csfinput, "w");
if (!f) {
- perror("popen");
+ perror("fopen");
return -errno;
}
fwrite(data->csf, 1, strlen(data->csf) + 1, f);
- pclose(f);
+ fclose(f);
+
+ ret = system(command);
+ if (ret) {
+ exit(ret);
+ }
flock(lockfd, LOCK_UN);
close(lockfd);
Am Freitag, den 01.09.2017, 18:39 +0200 schrieb Clemens Gruber:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
> rules/host-imx-cst.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/host-imx-cst.make b/rules/host-imx-cst.make
> index b5aad5aee..dc2a17f4a 100644
> --- a/rules/host-imx-cst.make
> +++ b/rules/host-imx-cst.make
> @@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_IMX_CST) += host-imx-cst
> #
> # Paths and names
> #
> -HOST_IMX_CST_VERSION := 2.3.1
> -HOST_IMX_CST_MD5 := 01684a853e9245dbd6db42acad5861dd
> +HOST_IMX_CST_VERSION := 2.3.2
> +HOST_IMX_CST_MD5 := a81766cab2e184ab12e459c0476f6639
> HOST_IMX_CST := cst-$(HOST_IMX_CST_VERSION)
> HOST_IMX_CST_SUFFIX := tar.gz
> HOST_IMX_CST_URL := https://www.nxp.com/webapp/sps/download/license.jsp?colCode=IMX_CST_TOOL
Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___________________________________________________________________________________________________
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2
2017-09-04 6:00 ` Denis OSTERLAND
@ 2017-09-05 6:20 ` Michael Olbrich
2017-09-05 7:13 ` Marc Kleine-Budde
0 siblings, 1 reply; 28+ messages in thread
From: Michael Olbrich @ 2017-09-05 6:20 UTC (permalink / raw)
To: ptxdist; +Cc: Marc Kleine-Budde
Hi,
On Mon, Sep 04, 2017 at 06:00:18AM +0000, Denis OSTERLAND wrote:
> as far as I know, this will require a change in Barebox scripts/imx/imx-image.c,
> because in this version it expects input file as command line option
> and does not understand piped input anymore.
>
> This is how I deal with this issue, but it wont work with both versions.
Marc, you added the initial support. Can you comment on this?
Michael
> From: Denis Osterland <Denis.Osterland@diehl.com>
> Date: Thu, 18 May 2017 07:40:48 +0200
> Subject: [PATCH] imx-image: Adapt command line of cst call to match changed
> cli.
>
> Current version 2.3.2 of freescales code-sign-tool expects '-i file' instead of stdin.
> ---
> scripts/imx/imx-image.c | 19 ++++++++++++++-----
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
> index dd5799cccc4b..ed3f4ffa50c3 100644
> --- a/scripts/imx/imx-image.c
> +++ b/scripts/imx/imx-image.c
> @@ -517,7 +517,7 @@ static int nop(const struct config_data *data)
> static int hab_sign(struct config_data *data)
> {
> int fd, outfd, ret, lockfd;
> - char *csffile, *command;
> + char *csffile, *command, *csfinput;
> struct stat s;
> char *cst;
> void *buf;
> @@ -530,6 +530,10 @@ static int hab_sign(struct config_data *data)
> if (ret < 0)
> exit(1);
>
> + ret = asprintf(&csfinput, "%s.csf", data->outfile);
> + if (ret < 0)
> + exit(1);
> +
> ret = stat(csffile, &s);
> if (!ret) {
> if (S_ISREG(s.st_mode)) {
> @@ -546,7 +550,7 @@ static int hab_sign(struct config_data *data)
> }
> }
>
> - ret = asprintf(&command, "%s -o %s", cst, csffile);
> + ret = asprintf(&command, "%s -o %s -i %s", cst, csffile, csfinput);
> if (ret < 0)
> return -ENOMEM;
>
> @@ -568,15 +572,20 @@ static int hab_sign(struct config_data *data)
> return -errno;
> }
>
> - FILE *f = popen(command, "w");
> + FILE *f = fopen(csfinput, "w");
> if (!f) {
> - perror("popen");
> + perror("fopen");
> return -errno;
> }
>
> fwrite(data->csf, 1, strlen(data->csf) + 1, f);
>
> - pclose(f);
> + fclose(f);
> +
> + ret = system(command);
> + if (ret) {
> + exit(ret);
> + }
>
> flock(lockfd, LOCK_UN);
> close(lockfd);
>
> Am Freitag, den 01.09.2017, 18:39 +0200 schrieb Clemens Gruber:
> > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> > ---
> > rules/host-imx-cst.make | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/rules/host-imx-cst.make b/rules/host-imx-cst.make
> > index b5aad5aee..dc2a17f4a 100644
> > --- a/rules/host-imx-cst.make
> > +++ b/rules/host-imx-cst.make
> > @@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_IMX_CST) += host-imx-cst
> > #
> > # Paths and names
> > #
> > -HOST_IMX_CST_VERSION := 2.3.1
> > -HOST_IMX_CST_MD5 := 01684a853e9245dbd6db42acad5861dd
> > +HOST_IMX_CST_VERSION := 2.3.2
> > +HOST_IMX_CST_MD5 := a81766cab2e184ab12e459c0476f6639
> > HOST_IMX_CST := cst-$(HOST_IMX_CST_VERSION)
> > HOST_IMX_CST_SUFFIX := tar.gz
> > HOST_IMX_CST_URL := https://www.nxp.com/webapp/sps/download/license.jsp?colCode=IMX_CST_TOOL
> Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
> Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied)
> Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
> Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
> ___________________________________________________________________________________________________
> Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
> Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
> The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2
2017-09-05 6:20 ` Michael Olbrich
@ 2017-09-05 7:13 ` Marc Kleine-Budde
2017-09-05 14:59 ` Clemens Gruber
2017-09-06 12:42 ` Michael Olbrich
0 siblings, 2 replies; 28+ messages in thread
From: Marc Kleine-Budde @ 2017-09-05 7:13 UTC (permalink / raw)
To: ptxdist
[-- Attachment #1.1.1: Type: text/plain, Size: 1097 bytes --]
On 09/05/2017 08:20 AM, Michael Olbrich wrote:
> Hi,
>
> On Mon, Sep 04, 2017 at 06:00:18AM +0000, Denis OSTERLAND wrote:
>> as far as I know, this will require a change in Barebox scripts/imx/imx-image.c,
>> because in this version it expects input file as command line option
>> and does not understand piped input anymore.
>>
>> This is how I deal with this issue, but it wont work with both versions.
>
> Marc, you added the initial support. Can you comment on this?
Maybe you can parse the output of "cst --version"? No, it's the same for
both versions :( But you can parse the output of "cst", the new version
does have the "-i" parameter.
Another option would be to let imx-image first try the "-i" approach, if
this doesn't work then try the stdin. I think this would be the best.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 91 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2
2017-09-05 7:13 ` Marc Kleine-Budde
@ 2017-09-05 14:59 ` Clemens Gruber
2017-09-06 12:42 ` Michael Olbrich
1 sibling, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-05 14:59 UTC (permalink / raw)
To: ptxdist
Hi,
On Tue, Sep 05, 2017 at 09:13:23AM +0200, Marc Kleine-Budde wrote:
> On 09/05/2017 08:20 AM, Michael Olbrich wrote:
> > Hi,
> >
> > On Mon, Sep 04, 2017 at 06:00:18AM +0000, Denis OSTERLAND wrote:
> >> as far as I know, this will require a change in Barebox scripts/imx/imx-image.c,
> >> because in this version it expects input file as command line option
> >> and does not understand piped input anymore.
> >>
> >> This is how I deal with this issue, but it wont work with both versions.
> >
> > Marc, you added the initial support. Can you comment on this?
>
> Maybe you can parse the output of "cst --version"? No, it's the same for
> both versions :( But you can parse the output of "cst", the new version
> does have the "-i" parameter.
>
> Another option would be to let imx-image first try the "-i" approach, if
> this doesn't work then try the stdin. I think this would be the best.
Michael, should the cst version bump and the Barebox change go in
together?
As I use U-Boot, it's probably better if someone else implements this, who uses
Barebox.
Regards,
Clemens
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2
2017-09-05 7:13 ` Marc Kleine-Budde
2017-09-05 14:59 ` Clemens Gruber
@ 2017-09-06 12:42 ` Michael Olbrich
1 sibling, 0 replies; 28+ messages in thread
From: Michael Olbrich @ 2017-09-06 12:42 UTC (permalink / raw)
To: ptxdist
Hi,
On Tue, Sep 05, 2017 at 09:13:23AM +0200, Marc Kleine-Budde wrote:
> On 09/05/2017 08:20 AM, Michael Olbrich wrote:
> > On Mon, Sep 04, 2017 at 06:00:18AM +0000, Denis OSTERLAND wrote:
> >> as far as I know, this will require a change in Barebox scripts/imx/imx-image.c,
> >> because in this version it expects input file as command line option
> >> and does not understand piped input anymore.
> >>
> >> This is how I deal with this issue, but it wont work with both versions.
> >
> > Marc, you added the initial support. Can you comment on this?
>
> Maybe you can parse the output of "cst --version"? No, it's the same for
> both versions :( But you can parse the output of "cst", the new version
> does have the "-i" parameter.
>
> Another option would be to let imx-image first try the "-i" approach, if
> this doesn't work then try the stdin. I think this would be the best.
This would break all old barebox versions without this fix. Maybe we could
add a wrapper script to ptxdist that adds '-i /dev/stdin' if no '-i'
argument is given?
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread
* [ptxdist] [PATCH 06/19] keyutils: version bump 1.5.9 -> 1.5.10
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (3 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 07/19] libcap-ng: version bump 0.7.7 -> 0.7.8 Clemens Gruber
` (13 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
.../0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch | 6 +++---
patches/{keyutils-1.5.9 => keyutils-1.5.10}/series | 0
rules/keyutils.make | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
rename patches/{keyutils-1.5.9 => keyutils-1.5.10}/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch (82%)
rename patches/{keyutils-1.5.9 => keyutils-1.5.10}/series (100%)
diff --git a/patches/keyutils-1.5.9/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch b/patches/keyutils-1.5.10/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
similarity index 82%
rename from patches/keyutils-1.5.9/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
rename to patches/keyutils-1.5.10/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
index e51df0929..fe9d7a374 100644
--- a/patches/keyutils-1.5.9/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
+++ b/patches/keyutils-1.5.10/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
@@ -8,15 +8,15 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index c904eaf6cb55..1f3c6d7f0676 100644
+index 824bbbf470c2..351e749760f7 100644
--- a/Makefile
+++ b/Makefile
-@@ -161,7 +161,7 @@ endif
+@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0)
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
mkdir -p $(DESTDIR)$(USRLIBDIR)
- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB)
+ endif
$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
- $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
diff --git a/patches/keyutils-1.5.9/series b/patches/keyutils-1.5.10/series
similarity index 100%
rename from patches/keyutils-1.5.9/series
rename to patches/keyutils-1.5.10/series
diff --git a/rules/keyutils.make b/rules/keyutils.make
index 3ab79c56f..781ce80dc 100644
--- a/rules/keyutils.make
+++ b/rules/keyutils.make
@@ -8,8 +8,8 @@ PACKAGES-$(PTXCONF_KEYUTILS) += keyutils
#
# Paths and names
#
-KEYUTILS_VERSION := 1.5.9
-KEYUTILS_MD5 := 7f8ac985c45086b5fbcd12cecd23cf07
+KEYUTILS_VERSION := 1.5.10
+KEYUTILS_MD5 := 3771676319bc7b84b1549b5c63ff5243
KEYUTILS := keyutils-$(KEYUTILS_VERSION)
KEYUTILS_SUFFIX := tar.bz2
KEYUTILS_URL := http://people.redhat.com/~dhowells/keyutils/$(KEYUTILS).$(KEYUTILS_SUFFIX)
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 07/19] libcap-ng: version bump 0.7.7 -> 0.7.8
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (4 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 06/19] keyutils: version bump 1.5.9 -> 1.5.10 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 08/19] libgcrypt: version bump 1.7.8 -> 1.8.1 Clemens Gruber
` (12 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Also add missing configure flags and avoid detecting host swig.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/libcap-ng.make | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
index d2abfaa26..1d7620115 100644
--- a/rules/libcap-ng.make
+++ b/rules/libcap-ng.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBCAP_NG) += libcap-ng
#
# Paths and names
#
-LIBCAP_NG_VERSION := 0.7.7
-LIBCAP_NG_MD5 := 3d7d126b29e2869a0257c17c8b0d9b2e
+LIBCAP_NG_VERSION := 0.7.8
+LIBCAP_NG_MD5 := 0dece96644bd798020e170fbf7663802
LIBCAP_NG := libcap-ng-$(LIBCAP_NG_VERSION)
LIBCAP_NG_SUFFIX := tar.gz
LIBCAP_NG_URL := http://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
@@ -33,9 +33,16 @@ LIBCAP_NG_LICENSE := LGPL-2.1+,GPL-2.0+
# autoconf
#
LIBCAP_NG_CONF_TOOL := autoconf
+
+LIBCAP_NG_CONF_ENV := \
+ ac_cv_prog_swig_found=no
+
LIBCAP_NG_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --without-python
+ --without-debug \
+ --without-warn \
+ --without-python \
+ --without-python3
# ----------------------------------------------------------------------------
# Target-Install
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 08/19] libgcrypt: version bump 1.7.8 -> 1.8.1
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (5 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 07/19] libcap-ng: version bump 0.7.7 -> 0.7.8 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 09/19] mosh: version bump 1.3.0 -> 1.3.2 Clemens Gruber
` (11 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/libgcrypt.make | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 3fff3f379..8052ccbbb 100644
--- a/rules/libgcrypt.make
+++ b/rules/libgcrypt.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt
#
# Paths and names
#
-LIBGCRYPT_VERSION := 1.7.8
-LIBGCRYPT_MD5 := 34fd2e6d230cbe56799cdf7df05f56c5
+LIBGCRYPT_VERSION := 1.8.1
+LIBGCRYPT_MD5 := b21817f9d850064d2177285f1073ec55
LIBGCRYPT := libgcrypt-$(LIBGCRYPT_VERSION)
LIBGCRYPT_SUFFIX := tar.bz2
LIBGCRYPT_URL := http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
@@ -52,6 +52,7 @@ LIBGCRYPT_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--disable-static \
--enable-shared \
+ --enable-endian-check \
--enable-random=linux \
--enable-dev-random \
--disable-random-daemon \
@@ -59,6 +60,7 @@ LIBGCRYPT_AUTOCONF := \
--disable-m-guard \
--disable-large-data-tests \
--disable-hmac-binary-check \
+ --enable-jent-support \
--enable-padlock-support \
--enable-aesni-support \
--enable-pclmul-support \
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 09/19] mosh: version bump 1.3.0 -> 1.3.2
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (6 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 08/19] libgcrypt: version bump 1.7.8 -> 1.8.1 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 10/19] mosh: make the crypto library configurable Clemens Gruber
` (10 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/mosh.make | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/rules/mosh.make b/rules/mosh.make
index 6c29222f7..4fec37973 100644
--- a/rules/mosh.make
+++ b/rules/mosh.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MOSH) += mosh
#
# Paths and names
#
-MOSH_VERSION := 1.3.0
-MOSH_MD5 := d961276995936953bf2d5a794068b076
+MOSH_VERSION := 1.3.2
+MOSH_MD5 := 5122f4d2b973ab7c38dcdac8c35cb61e
MOSH := mosh-$(MOSH_VERSION)
MOSH_SUFFIX := tar.gz
MOSH_URL := https://mosh.mit.edu/$(MOSH).$(MOSH_SUFFIX)
@@ -31,13 +31,18 @@ MOSH_LICENSE := GPL-3.0
MOSH_CONF_TOOL := autoconf
MOSH_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --disable-compile-warnings \
--enable-hardening \
--enable-client \
--enable-server \
--disable-examples \
--disable-ufw \
--disable-completion \
- --without-utempter
+ --without-utempter \
+ --with-ncurses \
+ --without-ncursesw \
+ --with-crypto-library=openssl
+
# ----------------------------------------------------------------------------
# Target-Install
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 10/19] mosh: make the crypto library configurable
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (7 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 09/19] mosh: version bump 1.3.0 -> 1.3.2 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 11/19] mpg123: version bump 1.25.2 -> 1.25.6 Clemens Gruber
` (9 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Mosh supports OpenSSL and Nettle. Let the user decide, but default to
OpenSSL, which was hardcoded before.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/mosh.in | 25 +++++++++++++++++++++++--
rules/mosh.make | 2 +-
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/rules/mosh.in b/rules/mosh.in
index 49ace4a35..398917fc7 100644
--- a/rules/mosh.in
+++ b/rules/mosh.in
@@ -1,12 +1,13 @@
## SECTION=networking
-config MOSH
+menuconfig MOSH
tristate
prompt "mosh"
select PROTOBUF
select NCURSES
select ZLIB
- select OPENSSL
+ select NETTLE if MOSH_NETTLE
+ select OPENSSL if MOSH_OPENSSL
select OPENSSH if RUNTIME
select OPENSSH_SSH if RUNTIME
select OPENSSH_SSHD if RUNTIME
@@ -15,3 +16,23 @@ config MOSH
connectivity, and provides intelligent local echo and line editing of
user keystrokes. Mosh is a replacement for SSH. It's more robust and
responsive, especially over Wi-Fi, cellular, and long-distance links.
+
+if MOSH
+
+choice
+ prompt "crypto library"
+ default MOSH_OPENSSL
+ help
+ Select the crypto library to be used
+
+ config MOSH_NETTLE
+ bool
+ prompt "nettle"
+
+ config MOSH_OPENSSL
+ bool
+ prompt "openssl"
+
+endchoice
+
+endif
diff --git a/rules/mosh.make b/rules/mosh.make
index 4fec37973..fe4b027f9 100644
--- a/rules/mosh.make
+++ b/rules/mosh.make
@@ -41,7 +41,7 @@ MOSH_CONF_OPT := \
--without-utempter \
--with-ncurses \
--without-ncursesw \
- --with-crypto-library=openssl
+ --with-crypto-library=$(call ptx/ifdef, PTXCONF_MOSH_NETTLE, nettle, openssl)
# ----------------------------------------------------------------------------
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 11/19] mpg123: version bump 1.25.2 -> 1.25.6
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (8 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 10/19] mosh: make the crypto library configurable Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 12/19] procps: fix configure flags Clemens Gruber
` (8 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/mpg123.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/mpg123.make b/rules/mpg123.make
index 32203668b..f772f147d 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MPG123) += mpg123
#
# Paths and names
#
-MPG123_VERSION := 1.25.2
-MPG123_MD5 := fa662cb875f7ae920359ce9619db8d4f
+MPG123_VERSION := 1.25.6
+MPG123_MD5 := 43336bef78f67c2e66c4f6c288ca1eb3
MPG123 := mpg123-$(MPG123_VERSION)
MPG123_SUFFIX := tar.bz2
MPG123_URL := http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX)
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 12/19] procps: fix configure flags
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (9 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 11/19] mpg123: version bump 1.25.2 -> 1.25.6 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 13/19] postgresql: specify the used license Clemens Gruber
` (7 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/procps.make | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/rules/procps.make b/rules/procps.make
index 9346636ce..23ae341a0 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -45,12 +45,24 @@ PROCPS_CONF_ENV := \
PROCPS_CONF_TOOL := autoconf
PROCPS_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ $(GLOBAL_LARGE_FILE_OPTION) \
--enable-shared \
--disable-static \
--disable-nls \
--disable-rpath \
+ --disable-watch8bit \
+ --disable-libselinux \
+ --$(call ptx/endis, PTXCONF_PROCPS_PIDOF)-pidof \
--disable-kill \
- --$(call ptx/endis, PROCPS_TOP_MODERN)-modern-top \
+ --disable-skill \
+ --disable-examples \
+ --disable-sigwinch \
+ --disable-wide-percent \
+ --enable-wide-memory \
+ --$(call ptx/endis, PTXCONF_PROCPS_TOP_MODERN)-modern-top \
+ --disable-numa \
+ --disable-w-from \
+ --enable-whining \
--without-libiconv-prefix \
--without-libintl-prefix \
--$(call ptx/wwo, PTXCONF_PROCPS_USES_NCURSES)-ncurses \
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 13/19] postgresql: specify the used license
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (10 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 12/19] procps: fix configure flags Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 14/19] strace: version bump 4.16 -> 4.18 Clemens Gruber
` (6 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/postgresql.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/postgresql.make b/rules/postgresql.make
index d14f55521..f792fa641 100644
--- a/rules/postgresql.make
+++ b/rules/postgresql.make
@@ -23,7 +23,7 @@ POSTGRESQL_SUFFIX := tar.bz2
POSTGRESQL_URL := https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)/$(POSTGRESQL).$(POSTGRESQL_SUFFIX)
POSTGRESQL_SOURCE := $(SRCDIR)/$(POSTGRESQL).$(POSTGRESQL_SUFFIX)
POSTGRESQL_DIR := $(BUILDDIR)/$(POSTGRESQL)
-POSTGRESQL_LICENSE := unknown
+POSTGRESQL_LICENSE := PostgreSQL
# ----------------------------------------------------------------------------
# Prepare
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 14/19] strace: version bump 4.16 -> 4.18
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (11 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 13/19] postgresql: specify the used license Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 15/19] tcpdump: version bump 4.9.0 -> 4.9.1 Clemens Gruber
` (5 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/strace.make | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/rules/strace.make b/rules/strace.make
index 9833014a4..d0d98e355 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace
#
# Paths and names
#
-STRACE_VERSION := 4.16
-STRACE_MD5 := 2873366cac98770efcbed6e748d5ef23
+STRACE_VERSION := 4.18
+STRACE_MD5 := 3579b3266bb096cebaefbe2cdb1a3a78
STRACE := strace-$(STRACE_VERSION)
STRACE_SUFFIX := tar.xz
STRACE_URL := $(call ptx/mirror, SF, strace/$(STRACE).$(STRACE_SUFFIX))
@@ -38,6 +38,11 @@ STRACE_CONF_OPT := \
--disable-code-coverage \
--disable-arm-oabi \
--disable-valgrind \
+ --disable-valgrind-memcheck \
+ --disable-valgrind-helgrind \
+ --disable-valgrind-drd \
+ --disable-valgrind-sgcheck \
+ --without-gcov \
--without-libunwind
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 15/19] tcpdump: version bump 4.9.0 -> 4.9.1
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (12 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 14/19] strace: version bump 4.16 -> 4.18 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 16/19] trace-cmd: version bump 2.5.2 -> 2.6.1 Clemens Gruber
` (4 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/tcpdump.make | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/rules/tcpdump.make b/rules/tcpdump.make
index ed5c6d08e..4c501dcae 100644
--- a/rules/tcpdump.make
+++ b/rules/tcpdump.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_TCPDUMP) += tcpdump
#
# Paths and names
#
-TCPDUMP_VERSION := 4.9.0
-TCPDUMP_MD5 := 2b83364eef53b63ca3181b4eb56dab0c
+TCPDUMP_VERSION := 4.9.1
+TCPDUMP_MD5 := 1e0293210b0dea5ef18e88e4150394b7
TCPDUMP := tcpdump-$(TCPDUMP_VERSION)
TCPDUMP_SUFFIX := tar.gz
TCPDUMP_URL := http://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX)
@@ -41,8 +41,11 @@ TCPDUMP_CONF_ENV = \
TCPDUMP_CONF_TOOL := autoconf
TCPDUMP_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --disable-universal \
--$(call ptx/endis,PTXCONF_TCPDUMP_SMB)-smb \
+ --with-gcc \
--without-smi \
+ --without-sandbox-capsicum \
--with-system-libpcap \
--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_CRYPTO)-crypto \
--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_LIBCAP_NG)-cap-ng
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 16/19] trace-cmd: version bump 2.5.2 -> 2.6.1
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (13 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 15/19] tcpdump: version bump 4.9.0 -> 4.9.1 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 17/19] u-boot-tools: version bump 2017.05.0 -> 2017.07.0 Clemens Gruber
` (3 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
It is now possible to disable the build of the python bindings, so
disable them and remove the host-swig dependency.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/trace-cmd.in | 1 -
rules/trace-cmd.make | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/trace-cmd.in b/rules/trace-cmd.in
index 7ca6656bb..5c1d37a8f 100644
--- a/rules/trace-cmd.in
+++ b/rules/trace-cmd.in
@@ -5,7 +5,6 @@ config TRACE_CMD
prompt "trace-cmd"
select LIBC_DL
select GCCLIBS_GCC_S
- select HOST_SWIG
help
The trace-cmd command interacts with the Ftrace tracer that
is built inside the Linux kernel. It interfaces with the
diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make
index ab3279073..cd37734e1 100644
--- a/rules/trace-cmd.make
+++ b/rules/trace-cmd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_TRACE_CMD) += trace-cmd
#
# Paths and names
#
-TRACE_CMD_VERSION := 2.5.2
-TRACE_CMD_MD5 := 304f28febc7a261c5a586b589c12571c
+TRACE_CMD_VERSION := 2.6.1
+TRACE_CMD_MD5 := d677c8895af84d6cdb9f6a65006cc507
TRACE_CMD := trace-cmd-$(TRACE_CMD_VERSION)
TRACE_CMD_SUFFIX := tar.bz2
TRACE_CMD_URL := http://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;tag=trace-cmd-v$(TRACE_CMD_VERSION)
@@ -34,6 +34,7 @@ TRACE_CMD_CONF_TOOL := NO
TRACE_CMD_MAKE_ENV := \
$(CROSS_ENV) \
CROSS_COMPILE=$(COMPILER_PREFIX) \
+ NO_PYTHON=1 \
prefix=/usr
# ----------------------------------------------------------------------------
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 17/19] u-boot-tools: version bump 2017.05.0 -> 2017.07.0
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (14 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 16/19] trace-cmd: version bump 2.5.2 -> 2.6.1 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 18/19] util-linux-ng: version bump 2.30 -> 2.30.1 Clemens Gruber
` (2 subsequent siblings)
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/u-boot-tools.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index 0ec65e887..e341c6d04 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
#
# Paths and names
#
-U_BOOT_TOOLS_VERSION := 2017.05
-U_BOOT_TOOLS_MD5 := 1b9ab3707ded74bbde9405987f816969
+U_BOOT_TOOLS_VERSION := 2017.07
+U_BOOT_TOOLS_MD5 := b74741e7a9ad1cf9a5bfa87302b80f2b
U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
U_BOOT_TOOLS_SUFFIX := tar.bz2
U_BOOT_TOOLS_URL := ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 18/19] util-linux-ng: version bump 2.30 -> 2.30.1
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (15 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 17/19] u-boot-tools: version bump 2017.05.0 -> 2017.07.0 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 19/19] util-linux-ng: add fsfreeze Clemens Gruber
2017-09-02 5:14 ` [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Alexander Dahl
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
.../0001-__progname-redefinition-fix.patch | 2 +-
patches/{util-linux-2.30 => util-linux-2.30.1}/series | 0
rules/util-linux-ng.make | 8 ++++----
3 files changed, 5 insertions(+), 5 deletions(-)
rename patches/{util-linux-2.30 => util-linux-2.30.1}/0001-__progname-redefinition-fix.patch (96%)
rename patches/{util-linux-2.30 => util-linux-2.30.1}/series (100%)
diff --git a/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch
similarity index 96%
rename from patches/util-linux-2.30/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch
index f5f538fea..4b7594fcb 100644
--- a/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch
+++ b/patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jon Ringle <jon@ringle.org>
2 files changed, 2 insertions(+)
diff --git a/libmount/src/cache.c b/libmount/src/cache.c
-index b83706a37468..5ee4588263f8 100644
+index 6ff997140e06..40425b222825 100644
--- a/libmount/src/cache.c
+++ b/libmount/src/cache.c
@@ -23,6 +23,7 @@
diff --git a/patches/util-linux-2.30/series b/patches/util-linux-2.30.1/series
similarity index 100%
rename from patches/util-linux-2.30/series
rename to patches/util-linux-2.30.1/series
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index a0915bc02..99c4da88c 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
#
# Paths and names
#
-UTIL_LINUX_NG_VERSION := 2.30
-UTIL_LINUX_NG_MD5 := eaa3429150268027908a1b8ae6ee9a62
+UTIL_LINUX_NG_VERSION := 2.30.1
+UTIL_LINUX_NG_MD5 := 5e5ec141e775efe36f640e62f3f8cd0d
UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
UTIL_LINUX_NG_SUFFIX := tar.xz
UTIL_LINUX_NG_BASENAME := v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
@@ -63,8 +63,6 @@ UTIL_LINUX_NG_CONF_OPT := \
--enable-all-programs=undefined \
--enable-tls \
--disable-widechar \
- --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \
- --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
@@ -96,6 +94,8 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-logger \
--disable-switch_root \
--disable-pivot_root \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCRM)-ipcrm \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCS)-ipcs \
--disable-tunelp \
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* [ptxdist] [PATCH 19/19] util-linux-ng: add fsfreeze
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (16 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 18/19] util-linux-ng: version bump 2.30 -> 2.30.1 Clemens Gruber
@ 2017-09-01 16:39 ` Clemens Gruber
2017-09-02 5:14 ` [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Alexander Dahl
18 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-01 16:39 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/util-linux-ng.in | 10 ++++++++++
rules/util-linux-ng.make | 3 +++
2 files changed, 13 insertions(+)
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index ae8c1ef71..ad2ad5a2d 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -216,6 +216,16 @@ config UTIL_LINUX_NG_FSCK
comment "BusyBox' fsck is selected!"
depends on BUSYBOX_FSCK
+config UTIL_LINUX_NG_FSFREEZE
+ bool
+ prompt "fsfreeze"
+ depends on !BUSYBOX_FSFREEZE || ALLYES
+ help
+ fsfreeze suspends or resumes access to a filesystem.
+
+comment "BusyBox' fsfreeze is selected!"
+ depends on BUSYBOX_FSFREEZE
+
config UTIL_LINUX_NG_FSTRIM
bool
prompt "fstrim"
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 99c4da88c..1d528fa4c 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -237,6 +237,9 @@ endif
ifdef PTXCONF_UTIL_LINUX_NG_FSCK
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fsck)
endif
+ifdef PTXCONF_UTIL_LINUX_NG_FSFREEZE
+ @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fsfreeze)
+endif
ifdef PTXCONF_UTIL_LINUX_NG_FSTRIM
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fstrim)
endif
--
2.14.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
` (17 preceding siblings ...)
2017-09-01 16:39 ` [ptxdist] [PATCH 19/19] util-linux-ng: add fsfreeze Clemens Gruber
@ 2017-09-02 5:14 ` Alexander Dahl
2017-09-02 10:51 ` Clemens Gruber
18 siblings, 1 reply; 28+ messages in thread
From: Alexander Dahl @ 2017-09-02 5:14 UTC (permalink / raw)
To: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 585 bytes --]
Hei hei,
On Fri, Sep 01, 2017 at 06:39:11PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
I miss at least some words on noteworthy changes, or potential issues
when migrating. Otherwise it's just 3500 lines of kconfig diff. :-/
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: C28E E6B9 0263 95CF 8FAF 08FA 34AD CD00 7221 5CC6 ***
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 91 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2
2017-09-02 5:14 ` [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Alexander Dahl
@ 2017-09-02 10:51 ` Clemens Gruber
2017-09-02 19:06 ` Alexander Dahl
0 siblings, 1 reply; 28+ messages in thread
From: Clemens Gruber @ 2017-09-02 10:51 UTC (permalink / raw)
To: ptxdist
Hi Alexander,
On Sat, Sep 02, 2017 at 07:14:29AM +0200, Alexander Dahl wrote:
> Hei hei,
>
> On Fri, Sep 01, 2017 at 06:39:11PM +0200, Clemens Gruber wrote:
> > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> > ---
>
> I miss at least some words on noteworthy changes, or potential issues
> when migrating. Otherwise it's just 3500 lines of kconfig diff. :-/
The Kconfig changes result from ptxdist make busybox_import and we did
not describe these changes in commit messages before. See git log
config/busybox
There's nothing really special this time: There a few new tools, stuff
is moved around and descriptions are improved.
The details are listed on busybox.net
There is one patch left to add counterparts for the new busybox tools
with depends on !BUSYBOX_FOO, which I will send separately. (After the
weekend ;)
Cheers,
Clemens
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2
2017-09-02 10:51 ` Clemens Gruber
@ 2017-09-02 19:06 ` Alexander Dahl
2017-09-05 15:11 ` Clemens Gruber
0 siblings, 1 reply; 28+ messages in thread
From: Alexander Dahl @ 2017-09-02 19:06 UTC (permalink / raw)
To: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 1147 bytes --]
Hei Clemens,
On Sat, Sep 02, 2017 at 12:51:07PM +0200, Clemens Gruber wrote:
> The Kconfig changes result from ptxdist make busybox_import and we did
> not describe these changes in commit messages before. See git log
> config/busybox
Well okay, doesn't hurt to write this.
> There's nothing really special this time: There a few new tools, stuff
> is moved around and descriptions are improved.
> The details are listed on busybox.net
This as commit message, maybe with a link to the upstream
announcement, all questions answered. Short, but better than nothing.
However, this is just my opinion.
> There is one patch left to add counterparts for the new busybox tools
> with depends on !BUSYBOX_FOO, which I will send separately. (After the
> weekend ;)
Have a nice one. I will be back from vacation on September 12th.
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: C28E E6B9 0263 95CF 8FAF 08FA 34AD CD00 7221 5CC6 ***
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 91 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2
2017-09-02 19:06 ` Alexander Dahl
@ 2017-09-05 15:11 ` Clemens Gruber
0 siblings, 0 replies; 28+ messages in thread
From: Clemens Gruber @ 2017-09-05 15:11 UTC (permalink / raw)
To: ptxdist
On Sat, Sep 02, 2017 at 09:06:30PM +0200, Alexander Dahl wrote:
> Hei Clemens,
>
> On Sat, Sep 02, 2017 at 12:51:07PM +0200, Clemens Gruber wrote:
> > The Kconfig changes result from ptxdist make busybox_import and we did
> > not describe these changes in commit messages before. See git log
> > config/busybox
>
> Well okay, doesn't hurt to write this.
>
> > There's nothing really special this time: There a few new tools, stuff
> > is moved around and descriptions are improved.
> > The details are listed on busybox.net
>
> This as commit message, maybe with a link to the upstream
> announcement, all questions answered. Short, but better than nothing.
>
> However, this is just my opinion.
Yes, I agree, it's nice to have a mini summary in the commit message.
I'll do this more often from now on. (In the past I only mentioned
security related details, e.g. fixes CVE-xxx)
Michael: Do you prefer the changes to other rules (for depends on
!BUSYBOX_x) to go in together with the busybox version bump? If so, I'll
send a v2 instead of separate patches for coreutils and procps.
Cheers,
Clemens
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2017-09-06 12:42 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-01 16:39 [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 02/19] dbus: version bump 1.10.18 -> 1.10.22 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 03/19] dbus: add upstream patch to avoid blocking at boot time Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 04/19] e2fsprogs: version bump 1.43.4 -> 1.43.6 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2 Clemens Gruber
2017-09-04 6:00 ` Denis OSTERLAND
2017-09-05 6:20 ` Michael Olbrich
2017-09-05 7:13 ` Marc Kleine-Budde
2017-09-05 14:59 ` Clemens Gruber
2017-09-06 12:42 ` Michael Olbrich
2017-09-01 16:39 ` [ptxdist] [PATCH 06/19] keyutils: version bump 1.5.9 -> 1.5.10 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 07/19] libcap-ng: version bump 0.7.7 -> 0.7.8 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 08/19] libgcrypt: version bump 1.7.8 -> 1.8.1 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 09/19] mosh: version bump 1.3.0 -> 1.3.2 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 10/19] mosh: make the crypto library configurable Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 11/19] mpg123: version bump 1.25.2 -> 1.25.6 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 12/19] procps: fix configure flags Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 13/19] postgresql: specify the used license Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 14/19] strace: version bump 4.16 -> 4.18 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 15/19] tcpdump: version bump 4.9.0 -> 4.9.1 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 16/19] trace-cmd: version bump 2.5.2 -> 2.6.1 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 17/19] u-boot-tools: version bump 2017.05.0 -> 2017.07.0 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 18/19] util-linux-ng: version bump 2.30 -> 2.30.1 Clemens Gruber
2017-09-01 16:39 ` [ptxdist] [PATCH 19/19] util-linux-ng: add fsfreeze Clemens Gruber
2017-09-02 5:14 ` [ptxdist] [PATCH 01/19] busybox: version bump 1.26.2 -> 1.27.2 Alexander Dahl
2017-09-02 10:51 ` Clemens Gruber
2017-09-02 19:06 ` Alexander Dahl
2017-09-05 15:11 ` Clemens Gruber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox