Updating toybox build for 0.5.1

Signed-off-by: xroche <xavier.roche@open.eurogiciel.org>

2 files changed, 292 insertions, 6 deletions

diff --git a/packaging/config b/packaging/config
new file mode 100644
index 0000000..cf3bbc8
--- /dev/null
+++ b/packaging/config
@@ -0,0 +1,282 @@
+#
+# Automatically generated make config: don't edit
+# ToyBox version: KCONFIG_VERSION
+# Mon Dec  8 11:16:59 2014
+#
+CONFIG_TOYBOX_CONTAINER=y
+CONFIG_TOYBOX_FIFREEZE=y
+CONFIG_TOYBOX_ICONV=y
+CONFIG_TOYBOX_FALLOCATE=y
+CONFIG_TOYBOX_UTMPX=y
+CONFIG_TOYBOX_PTY=y
+CONFIG_TOYBOX_SHADOW=y
+
+#
+# Posix commands
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CKSUM=y
+CONFIG_CMP=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_CP_MORE=y
+CONFIG_CP_MV=y
+CONFIG_CP_MV_MORE=y
+CONFIG_INSTALL=y
+CONFIG_CPIO=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_DF=y
+CONFIG_DF_PEDANTIC=y
+CONFIG_DIRNAME=y
+CONFIG_DU=y
+CONFIG_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPAND=y
+CONFIG_FALSE=y
+CONFIG_FIND=y
+CONFIG_GREP=y
+CONFIG_HEAD=y
+CONFIG_ID=y
+CONFIG_GROUPS=y
+CONFIG_LOGNAME=y
+CONFIG_WHOAMI=y
+CONFIG_KILL=y
+# CONFIG_KILLALL5 is not set
+CONFIG_LINK=y
+CONFIG_LN=y
+CONFIG_LS=y
+CONFIG_LS_COLOR=y
+CONFIG_MKDIR=y
+CONFIG_MKFIFO=y
+CONFIG_NICE=y
+CONFIG_NL=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PASTE=y
+CONFIG_PATCH=y
+CONFIG_PWD=y
+# CONFIG_RENICE is not set
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SLEEP=y
+CONFIG_SLEEP_FLOAT=y
+CONFIG_SORT=y
+CONFIG_SORT_BIG=y
+CONFIG_SORT_FLOAT=y
+CONFIG_SPLIT=y
+CONFIG_STRINGS=y
+CONFIG_TAIL=y
+CONFIG_TAIL_SEEK=y
+CONFIG_TEE=y
+# CONFIG_TIME is not set
+CONFIG_TOUCH=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_UNLINK=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_XARGS=y
+CONFIG_XARGS_PEDANTIC=y
+
+#
+# pending
+#
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_BRCTL is not set
+CONFIG_COMPRESS=y
+CONFIG_ZCAT=y
+# CONFIG_CROND is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DD=y
+# CONFIG_DHCP is not set
+# CONFIG_DHCPD is not set
+# CONFIG_DEBUG_DHCP is not set
+CONFIG_DIFF=y
+# CONFIG_DUMPLEASES is not set
+CONFIG_EXPR=y
+# CONFIG_FDISK is not set
+CONFIG_FOLD=y
+CONFIG_FSCK=y
+# CONFIG_FTPGET is not set
+# CONFIG_GETTY is not set
+# CONFIG_GROUPADD is not set
+# CONFIG_GROUPDEL is not set
+# CONFIG_HOST is not set
+# CONFIG_HWCLOCK is not set
+# CONFIG_ICONV is not set
+# CONFIG_INIT is not set
+# CONFIG_IP is not set
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+# CONFIG_KLOGD is not set
+# CONFIG_KLOGD_SOURCE_RING_BUFFER is not set
+# CONFIG_LAST is not set
+# CONFIG_LOGGER is not set
+# CONFIG_MDEV is not set
+# CONFIG_MDEV_CONF is not set
+# CONFIG_MIX is not set
+# CONFIG_MKE2FS is not set
+# CONFIG_MKE2FS_JOURNAL is not set
+# CONFIG_MKE2FS_GEN is not set
+# CONFIG_MKE2FS_LABEL is not set
+# CONFIG_MKE2FS_EXTENDED is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_MORE is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_NSENTER is not set
+# CONFIG_OPENVT is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_PGREP is not set
+# CONFIG_PING is not set
+CONFIG_PRINTF=y
+# CONFIG_PS is not set
+# CONFIG_RESET is not set
+# CONFIG_ROUTE is not set
+CONFIG_SED=y
+CONFIG_SH=y
+CONFIG_SH_INTERACTIVE=y
+# CONFIG_EXIT is not set
+# CONFIG_CD is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_SYSLOGD is not set
+CONFIG_TAR=y
+# CONFIG_TCPSVD is not set
+# CONFIG_TELNET is not set
+# CONFIG_TELNETD is not set
+CONFIG_TEST=y
+# CONFIG_TFTPD is not set
+# CONFIG_TOP is not set
+# CONFIG_TRACEROUTE is not set
+CONFIG_TR=y
+# CONFIG_USERADD is not set
+# CONFIG_USERDEL is not set
+# CONFIG_WATCH is not set
+CONFIG_XZCAT=y
+
+#
+# Other commands
+#
+# CONFIG_ACPI is not set
+# CONFIG_BLKID is not set
+# CONFIG_BLOCKDEV is not set
+CONFIG_BZCAT=y
+# CONFIG_CATV is not set
+CONFIG_CHROOT=y
+# CONFIG_CHVT is not set
+# CONFIG_CLEAR is not set
+# CONFIG_COUNT is not set
+CONFIG_DOS2UNIX=y
+# CONFIG_EJECT is not set
+CONFIG_FACTOR=y
+# CONFIG_FALLOCATE is not set
+# CONFIG_FREE is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSFREEZE is not set
+CONFIG_HELP=y
+CONFIG_HELP_EXTRAS=y
+# CONFIG_IFCONFIG is not set
+# CONFIG_INOTIFYD is not set
+# CONFIG_INSMOD is not set
+# CONFIG_LOGIN is not set
+# CONFIG_LOSETUP is not set
+# CONFIG_LSATTR is not set
+# CONFIG_CHATTR is not set
+# CONFIG_LSMOD is not set
+# CONFIG_LSPCI is not set
+# CONFIG_LSPCI_TEXT is not set
+# CONFIG_LSUSB is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_MKPASSWD is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_MODINFO is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_NBD_CLIENT is not set
+# CONFIG_NETCAT is not set
+# CONFIG_NETCAT_LISTEN is not set
+# CONFIG_ONEIT is not set
+CONFIG_PARTPROBE=y
+# CONFIG_PIVOT_ROOT is not set
+# CONFIG_PMAP is not set
+CONFIG_PRINTENV=y
+# CONFIG_PWDX is not set
+# CONFIG_READAHEAD is not set
+CONFIG_READLINK=y
+CONFIG_REALPATH=y
+# CONFIG_REBOOT is not set
+# CONFIG_REV is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RMMOD is not set
+# CONFIG_SETSID is not set
+CONFIG_STAT=y
+# CONFIG_SWAPOFF is not set
+# CONFIG_SWAPON is not set
+# CONFIG_SWITCH_ROOT is not set
+# CONFIG_SYSCTL is not set
+CONFIG_TAC=y
+# CONFIG_TASKSET is not set
+CONFIG_TIMEOUT=y
+CONFIG_TRUNCATE=y
+# CONFIG_UNSHARE is not set
+# CONFIG_UPTIME is not set
+# CONFIG_USLEEP is not set
+# CONFIG_VCONFIG is not set
+# CONFIG_VMSTAT is not set
+# CONFIG_W is not set
+# CONFIG_WHICH is not set
+CONFIG_YES=y
+
+#
+# Linux Standard Base commands
+#
+# CONFIG_DMESG is not set
+# CONFIG_HOSTNAME is not set
+# CONFIG_KILLALL is not set
+CONFIG_MD5SUM=y
+CONFIG_SHA1SUM=y
+CONFIG_MKNOD=y
+CONFIG_MKTEMP=y
+# CONFIG_MOUNT is not set
+# CONFIG_NFSMOUNT is not set
+# CONFIG_PASSWD is not set
+# CONFIG_PIDOF is not set
+CONFIG_SEQ=y
+# CONFIG_SU is not set
+CONFIG_SYNC=y
+# CONFIG_UMOUNT is not set
+
+#
+# Example commands
+#
+# CONFIG_HELLO is not set
+# CONFIG_SKELETON is not set
+# CONFIG_SKELETON_ALIAS is not set
+
+#
+# 
+#
+
+#
+# Toybox global settings
+#
+CONFIG_TOYBOX=y
+CONFIG_TOYBOX_SUID=y
+CONFIG_TOYBOX_FLOAT=y
+CONFIG_TOYBOX_HELP=y
+CONFIG_TOYBOX_HELP_DASHDASH=y
+CONFIG_TOYBOX_I18N=y
+# CONFIG_TOYBOX_FREE is not set
+# CONFIG_TOYBOX_NORECURSE is not set
+CONFIG_TOYBOX_DEBUG=y
+CONFIG_TOYBOX_UID_SYS=100
+CONFIG_TOYBOX_UID_USR=500
diff --git a/packaging/toybox.spec b/packaging/toybox.spec
index b3e3f3f..c613f9d 100644
--- a/packaging/toybox.spec
+++ b/packaging/toybox.spec
@@ -1,5 +1,5 @@
 Name: toybox
-Version: 0.5.0
+Version: 0.5.1
 Release: 1%{?dist}
 Summary: ToyBox Core utilities
 Group: Base/Utilities
@@ -23,12 +23,16 @@ cp %{SOURCE1} ./.config
 USE_SMACK=1  make %{?_smp_mflags} toybox
 
 %install
-make PREFIX=./ install
+output="build"
+mkdir -p ./${output}
+make PREFIX=./${output} install
 mkdir -p %{buildroot}%{_bindir}
-##mkdir -p %{buildroot}%{_sbindir}
-cp --preserve=links ./bin/* %{buildroot}%{_bindir}
-##cp --preserve=links ./sbin/* %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_sbindir}
+cp --preserve=links ./${output}/bin/* %{buildroot}%{_bindir}
+cp --preserve=links ./${output}/sbin/* %{buildroot}%{_sbindir}
+cp --preserve=links ./${output}/usr/bin/* %{buildroot}%{_bindir}
+cp --preserve=links ./${output}/usr/sbin/* %{buildroot}%{_sbindir}
 
 %files
 %{_bindir}/*
-##%{_sbindir}/*
+%{_sbindir}/*