[gentoo-commits] proj/genkernel:master commit in: defaults/, netboot/

2016-07-05 Thread Robin H. Johnson 
commit: be862b7c3d497034dc5217fd2294d6a84d2d7fd1
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jul  4 17:43:10 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jul  4 17:43:10 2016 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=be862b7c

busybox: merge netboot config features.

Merge the netboot busybox configuration with the normal busybox
configuration, adds 5KiB on amd64.

One option was dropped as it no longer compiles on modern systems, and
is irrelevant:
CONFIG_FEATURE_2_4_MODULES

Signed-off-by: Robin H. Johnson  gentoo.org>

 defaults/busy-config | 211 +++---
 netboot/busy-config  | 759 ---
 2 files changed, 111 insertions(+), 859 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index a38d7fc..6e5e1e4 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.19.3
-# Sat Jan 14 00:01:17 2012
+# Busybox version: 1.20.2
+# Mon Jul  4 10:39:35 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -42,14 +42,14 @@ CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
-# CONFIG_FEATURE_SUID is not set
+CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
 CONFIG_FEATURE_PREFER_APPLETS=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
+CONFIG_FEATURE_HAVE_RPC=y
 
 #
 # Build Options
@@ -62,7 +62,10 @@ CONFIG_STATIC=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
 CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
@@ -92,7 +95,7 @@ CONFIG_PREFIX="./_install"
 CONFIG_FEATURE_SYSTEMD=y
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_MD5_SMALL=1
 # CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_USE_TERMIOS=y
@@ -101,10 +104,11 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
 # CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
-# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
 CONFIG_FEATURE_NON_POSIX_CP=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
@@ -126,37 +130,38 @@ CONFIG_FEATURE_SEAMLESS_LZMA=y
 CONFIG_FEATURE_SEAMLESS_BZ2=y
 CONFIG_FEATURE_SEAMLESS_GZ=y
 # CONFIG_FEATURE_SEAMLESS_Z is not set
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
 # CONFIG_FEATURE_AR_CREATE is not set
 CONFIG_BUNZIP2=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
 CONFIG_FEATURE_CPIO_P=y
-# CONFIG_DPKG is not set
+CONFIG_DPKG=y
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_GZIP_FAST=0
 CONFIG_LZOP=y
 # CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
+CONFIG_RPM2CPIO=y
+CONFIG_RPM=y
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_AUTODETECT=y
-# CONFIG_FEATURE_TAR_FROM is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
 # CONFIG_FEATURE_TAR_TO_COMMAND is not set
 CONFIG_FEATURE_TAR_UNAME_GNAME=y
 CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 # CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
+CONFIG_UNCOMPRESS=y
 CONFIG_UNLZMA=y
 CONFIG_FEATURE_LZMA_FAST=y
 CONFIG_LZMA=y
@@ -173,11 +178,13 @@ CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_GROUPS=y
 CONFIG_TEST=y
 # CONFIG_FEATURE_TEST_64 is not set
 CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
@@ -203,8 +210,8 @@ CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
 CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
 CONFIG_DU=y
 CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
 CONFIG_ECHO=y
@@ -219,8 +226,7 @@ CONFIG_FALSE=y
 CONFIG_FOLD=y
 CONFIG_FSYNC=y
 CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
-CONFIG_HOSTID=y
+CONFIG_FEATURE_FANCY_HEAD=y

[gentoo-commits] proj/genkernel:master commit in: defaults/, /, netboot/, netboot/misc/bin/

2016-06-22 Thread Mike Frysinger 
commit: cc02d07dedbc737855ec0711dd52d4654c9a7404
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Jun 23 03:48:43 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jun 23 03:48:43 2016 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cc02d07d

clean up extended echo usage

Switch to printf where appropriate, and simplify other locations where
the -e option was pointless.

 defaults/initrd.defaults   |  2 +-
 defaults/initrd.scripts| 22 +++
 gen_bootloader.sh  |  4 +--
 gen_compile.sh |  4 +--
 gen_funcs.sh   | 25 -
 gen_initramfs.sh   |  4 +--
 genkernel  |  4 +--
 netboot/linuxrc.x  | 67 +-
 netboot/misc/bin/net-setup | 19 +++--
 9 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index b63ebd0..940d2df 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -44,7 +44,7 @@ WHITE=""
 # echo "$CLEAR$RESET"
 # echo "$CLEAR"
 # Just go to the top of the screen
-# echo -n ""
+# printf ""
 
 KV=`uname -r`
 KMAJOR=`echo $KV | cut -f1 -d.`

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 703c0fe..4b0bbad 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -33,7 +33,7 @@ modules_scan() {
 
MODS=$(cat /etc/modules/${1} 2>/dev/null)
[ -n "${MODS}" ] && [ -z "${QUIET}" ] && \
-   echo -ne "${BOLD}   ::${NORMAL} Loading from ${1}: "
+   printf "%b" "${BOLD}   ::${NORMAL} Loading from ${1}: "
 
for x in ${MODS}
do
@@ -41,12 +41,12 @@ modules_scan() {
if [ "${MLOAD}" = "${x}" ] # Only module to no-load
then
[ -z "${QUIET}" ] && \
-   echo -e "${BOLD}   ::${NORMAL} Skipping ${x}..."
+   printf "%b\n" "${BOLD}   ::${NORMAL} Skipping 
${x}..."
elif [ "${MLOAD}" = "${MLIST}" ]
then
if [ -n "${DEBUG}" ]; then
-   echo -ne "${BOLD}   ::${NORMAL} "
-   echo -ne "Scanning for ${x}..."
+   printf "%b" "${BOLD}   ::${NORMAL} "
+   printf "%b" "Scanning for ${x}..."
fi
modprobe ${x} > /dev/null 2>&1
loaded=${?}
@@ -58,10 +58,10 @@ modules_scan() {
 
[ -z "${DEBUG}" -a "${loaded}" = "0" ] && \
[ -z "${QUIET}" ] && \
-   echo -en "${x} "
+   printf "%b" "${x} "
else
[ -z "${QUIET}" ] && \
-   echo -e "${BOLD}   ::${NORMAL} Skipping ${x}..."
+   printf "%b\n" "${BOLD}   ::${NORMAL} Skipping 
${x}..."
fi
done
[ -n "${MODS}" ] && [ -z "${QUIET}" ] && echo
@@ -629,7 +629,7 @@ find_real_device() {
fi
;;
esac
-   echo -n "${DEVICE}"
+   printf "%s" "${DEVICE}"
 }
 
 check_loop() {
@@ -696,7 +696,7 @@ good_msg() {
 
msg_string=$1
msg_string="${msg_string:-...}"
-   [ "$2" != 1 ] && echo -e "${GOOD}>>${NORMAL}${BOLD} ${msg_string} 
${NORMAL}"
+   [ "$2" != 1 ] && printf "%b\n" "${GOOD}>>${NORMAL}${BOLD} ${msg_string} 
${NORMAL}"
 }
 
 bad_msg() {
@@ -705,14 +705,14 @@ bad_msg() {
if [ "$2" != 1 ]
then
splash 'verbose' > /dev/null &
-   echo -e "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
+   printf "%b\n" "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
fi
 }
 
 warn_msg() {
msg_string=$1
msg_string="${msg_string:-...}"
-   [ "$2" != 1 ] && echo -e "${WARN}**${NORMAL}${BOLD} ${msg_string} 
${NORMAL}"
+   [ "$2" != 1 ] && printf "%b\n" "${WARN}**${NORMAL}${BOLD} ${msg_string} 
${NORMAL}"
 }
 
 crypt_filter() {
@@ -751,7 +751,7 @@ prompt_user(){
bad_msg "- press Enter for the same"
bad_msg '- type "shell" for a shell'
bad_msg '- type "q" to skip...'
-   echo -n "${2}(${oldvalue}) :: "
+   printf "%s" "${2}(${oldvalue}) :: "
read ${1}
case `eval echo '$'${1}` in
'q')

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 90c3f9b..4bbd303 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -89,12 +89,12 @@ set_bootloader_grub() {
# Add grub configuration to grub.conf
echo "# Genkernel generated entry, see GRUB 
documentation for details" >> ${GRUB_CONF}
echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
-   echo -e "\tkernel