Using toybox instead of sbase for posix

42 files changed, 485 insertions, 185 deletions

diff --git a/repo/base-build/base-build.xibuild b/repo/base-build/base-build.xibuild
index dfe8ac1..0fdf10b 100644
--- a/repo/base-build/base-build.xibuild
+++ b/repo/base-build/base-build.xibuild
@@ -1,4 +1,4 @@
 #!/bin/sh
-DEPS="musl binutils gcc linux-headers tcl expect dejagnu m4 ncurses dash bison bzip2 sbase diffutils file findutils gawk grep sed gzip make patch perl tar texinfo xz flex"
+DEPS="musl binutils gcc linux-headers tcl expect dejagnu m4 ncurses dash bison bzip2 toybox diffutils file findutils gawk grep sed gzip make patch perl tar texinfo xz flex"
 
 DESC="Base toolchain used to build other packages"
diff --git a/repo/base/base.xibuild b/repo/base/base.xibuild
index d05c1ee..598292b 100644
--- a/repo/base/base.xibuild
+++ b/repo/base/base.xibuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-DEPS="mksh bzip2 sbase findutils iana-etc file gawk gettext musl grep gzip iproute2 iputils xipkg pciutils procps-ng psmisc sed date shadow tar util-linux xz linux-headers sysconfigs inetutils mkinitramfs genfstab eudev openrc kbd sysklogd tzdata"
+DEPS="mksh bzip2 toybox findutils iana-etc file gawk gettext musl grep gzip iproute2 iputils xipkg pciutils procps-ng psmisc sed shadow tar util-linux xz linux-headers sysconfigs inetutils mkinitramfs genfstab eudev openrc kbd sysklogd tzdata"
 MAKEDEPS="grep python"
 
 DESC="The base system to be installed"
diff --git a/repo/cacerts/cacerts.xibuild b/repo/cacerts/cacerts.xibuild
index 9fef8e1..2ff5dda 100644
--- a/repo/cacerts/cacerts.xibuild
+++ b/repo/cacerts/cacerts.xibuild
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-MAKEDEPS="sbase bash sed"
+MAKEDEPS="toybox bash sed"
 DEPS="libnghttp libp11-kit"
 
 PKG_VER=1.7
 SOURCE=https://github.com/djlucas/make-ca/releases/download/v$PKG_VER/make-ca-$PKG_VER.tar.xz
 ADDITIONAL="
-    fix-sbase-coreutils.patch
+    fix-toybox-coreutils.patch
 "
 
 DESC="Root certificates needed by ssl built using make-ca"
diff --git a/repo/cups/cups.xibuild b/repo/cups/cups.xibuild
index 61002c0..74319c4 100644
--- a/repo/cups/cups.xibuild
+++ b/repo/cups/cups.xibuild
@@ -4,7 +4,7 @@ NAME="cups"
 DESC="The CUPS Printing System"
 
 MAKEDEPS="make "
-DEPS="sbase dbus libusb musl openssl poppler "
+DEPS="toybox dbus libusb musl openssl poppler "
 
 PKG_VER=2.4.2
 SOURCE="https://github.com/OpenPrinting/cups/archive/v$PKG_VER.tar.gz"
diff --git a/repo/date/date.xibuild b/repo/date/date.xibuild
deleted file mode 100644
index ad1e108..0000000
--- a/repo/date/date.xibuild
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="musl sh"
-
-PKG_VER=0.8.8
-SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
-DESC="Date from toybox"
-
-build () {
-    ./configure 
-    make date
-}
-
-package () {
-    install -Dm755 date $PKG_DEST/usr/bin/
-}
diff --git a/repo/diffutils/diffutils.xibuild b/repo/diffutils/diffutils.xibuild
deleted file mode 100644
index f99eae6..0000000
--- a/repo/diffutils/diffutils.xibuild
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make sort"
-DEPS="musl sh"
-
-PKG_VER=0.8.8
-SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
-DESC="Utility programs for creating patch files"
-
-build () {
-    make defconfig
-    make diff
-    make cmp
-}
-
-package () {
-    install -Dm755 diff $PKG_DEST/usr/bin/
-    install -Dm755 cmp $PKG_DEST/usr/bin/
-}
diff --git a/repo/dracut/dracut.xibuild b/repo/dracut/dracut.xibuild
index a489fba..ca22f5f 100644
--- a/repo/dracut/dracut.xibuild
+++ b/repo/dracut/dracut.xibuild
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 MAKEDEPS="make asciidoc musl-fts"
-DEPS="bash sbase cpio findutils grep gzip kmod pkg-config procps-ng sed util-linux xz"
+DEPS="bash toybox cpio findutils grep gzip kmod pkg-config procps-ng sed util-linux xz"
 
 DESC="An initramfs infastructure aimin gto have as little possible hardcoded into the initramfs"
 
 PKG_VER=055
 SOURCE=https://mirrors.edge.kernel.org/pub/linux/utils/boot/dracut/dracut-$PKG_VER.tar.xz
 ADDITIONAL="
-    fix-sbase-coreutils.patch
+    fix-toybox-coreutils.patch
 "
 
 prepare () {
diff --git a/repo/findutils/findutils.xibuild b/repo/findutils/findutils.xibuild
deleted file mode 100644
index 48324a6..0000000
--- a/repo/findutils/findutils.xibuild
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make sort"
-DEPS="musl sh"
-
-PKG_VER=0.8.8
-SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
-DESC="toybox utilities to locate files"
-
-build () {
-    make defconfig
-    make xargs
-    make find
-    make fmt
-}
-
-package () {
-    install -Dm755 find $PKG_DEST/usr/bin/find
-    install -Dm755 fmt $PKG_DEST/usr/bin/fmt
-    install -Dm755 xargs $PKG_DEST/usr/bin/xargs
-}
diff --git a/repo/fish/fish.xibuild b/repo/fish/fish.xibuild
index 7d8acd9..dc12540 100644
--- a/repo/fish/fish.xibuild
+++ b/repo/fish/fish.xibuild
@@ -4,7 +4,7 @@ NAME="fish"
 DESC="Modern interactive commandline shell"
 
 MAKEDEPS="cmake "
-DEPS="bc sbase pcre2-32 musl ncurses "
+DEPS="bc toybox pcre2-32 musl ncurses "
 
 PKG_VER=3.5.1
 SOURCE="https://github.com/fish-shell/fish-shell/releases/download/$PKG_VER/fish-$PKG_VER.tar.xz"
diff --git a/repo/font-opensans/font-opensans.xibuild b/repo/font-opensans/font-opensans.xibuild
index 26369eb..1e098c4 100644
--- a/repo/font-opensans/font-opensans.xibuild
+++ b/repo/font-opensans/font-opensans.xibuild
@@ -3,7 +3,7 @@
 NAME="font-opensans"
 DESC="Humanist Sans Serif Typeface"
 
-MAKEDEPS="sbase"
+MAKEDEPS="toybox"
 DEPS="fontconfig mkfontscale "
 
 SOURCE="https://github.com/googlefonts/opensans.git"
diff --git a/repo/gdk-pixbuf/gdk-pixbuf.xibuild b/repo/gdk-pixbuf/gdk-pixbuf.xibuild
index 53db676..ff85df9 100644
--- a/repo/gdk-pixbuf/gdk-pixbuf.xibuild
+++ b/repo/gdk-pixbuf/gdk-pixbuf.xibuild
@@ -3,7 +3,7 @@
 NAME="gdk-pixbuf"
 DESC="GTK+ image loading library"
 
-MAKEDEPS="meson ninja gobject-introspection sbase glib shared-mime-info intltool libpng libjpeg-turbo tiff musl python-docutils"
+MAKEDEPS="meson ninja gobject-introspection toybox glib shared-mime-info intltool libpng libjpeg-turbo tiff musl python-docutils"
 
 PKG_VER=2.42.9
 SOURCE="https://download.gnome.org/sources/gdk-pixbuf/${PKG_VER%.*}/gdk-pixbuf-$PKG_VER.tar.xz"
diff --git a/repo/genfstab/genfstab.xibuild b/repo/genfstab/genfstab.xibuild
index 267906c..23643ec 100644
--- a/repo/genfstab/genfstab.xibuild
+++ b/repo/genfstab/genfstab.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make asciidoc"
-DEPS="bash sbase gawk"
+DEPS="bash toybox gawk"
 
 PKG_VER=24
 SOURCE=https://github.com/archlinux/arch-install-scripts.git
diff --git a/repo/gtk2/gtk2.xibuild b/repo/gtk2/gtk2.xibuild
index 258c2c5..6f5c5fb 100644
--- a/repo/gtk2/gtk2.xibuild
+++ b/repo/gtk2/gtk2.xibuild
@@ -4,7 +4,7 @@ NAME="gtk2"
 DESC="The GTK+ Toolkit (v2)"
 
 #MAKEDEPS="meson ninja libpng shared-mime-info atk glib cairo pango gdk-pixbuf"
-MAKEDEPS=" meson ninja atk at-spi2-atk sbase cairo gobject-introspection fontconfig fribidi gdk-pixbuf glib harfbuzz libepoxy intltool libx11 libxcomposite libxcursor libxdamage libxext libxfixes libxi libxinerama libxkbcommon libxrandr musl pango shared-mime-info wayland libtool"
+MAKEDEPS=" meson ninja atk at-spi2-atk toybox cairo gobject-introspection fontconfig fribidi gdk-pixbuf glib harfbuzz libepoxy intltool libx11 libxcomposite libxcursor libxdamage libxext libxfixes libxi libxinerama libxkbcommon libxrandr musl pango shared-mime-info wayland libtool"
 
 PKG_VER=2.24.33
 SOURCE="https://download.gnome.org/sources/gtk+/${PKG_VER%.*}/gtk+-$PKG_VER.tar.xz"
diff --git a/repo/gtk3/gtk3.xibuild b/repo/gtk3/gtk3.xibuild
index 6a88d01..80d1db0 100644
--- a/repo/gtk3/gtk3.xibuild
+++ b/repo/gtk3/gtk3.xibuild
@@ -4,7 +4,7 @@ NAME="gtk3"
 DESC="The GTK+ Toolkit (v3)"
 
 MAKEDEPS="meson ninja gtk2 docbook-dtd gtk-doc"
-DEPS="atk at-spi2-atk sbase cairo gobject-introspection fontconfig fribidi gdk-pixbuf glib harfbuzz libepoxy intltool libx11 libxcomposite libxcursor libxdamage libxext libxfixes libxi libxinerama libxkbcommon libxrandr musl pango shared-mime-info wayland adwaita-icon-theme gsettings-desktop-schemas"
+DEPS="atk at-spi2-atk toybox cairo gobject-introspection fontconfig fribidi gdk-pixbuf glib harfbuzz libepoxy intltool libx11 libxcomposite libxcursor libxdamage libxext libxfixes libxi libxinerama libxkbcommon libxrandr musl pango shared-mime-info wayland adwaita-icon-theme gsettings-desktop-schemas"
 
 PKG_VER=3.24.34
 SOURCE="https://download.gnome.org/sources/gtk+/${PKG_VER%.*}/gtk+-$PKG_VER.tar.xz"
diff --git a/repo/i2pd/i2pd.xibuild b/repo/i2pd/i2pd.xibuild
index 0acc897..a0da36e 100644
--- a/repo/i2pd/i2pd.xibuild
+++ b/repo/i2pd/i2pd.xibuild
@@ -4,7 +4,7 @@ NAME="i2pd"
 DESC="I2P Router written in C++"
 
 MAKEDEPS="make "
-DEPS="boost sbase openssl musl "
+DEPS="boost toybox openssl musl "
 
 PKG_VER=2.43.0
 SOURCE="https://github.com/PurpleI2P/i2pd/archive/$PKG_VER/i2pd-$PKG_VER.tar.gz"
diff --git a/repo/linux-libre/linux-libre.xibuild b/repo/linux-libre/linux-libre.xibuild
index 7d5ef11..9ca33ef 100644
--- a/repo/linux-libre/linux-libre.xibuild
+++ b/repo/linux-libre/linux-libre.xibuild
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 MAKEDEPS="make bc linux-headers cpio"
-DEPS="sbase kmod"
+DEPS="toybox kmod"
 
 PKG_VER=5.19.8
 #SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz
 SOURCE=https://linux-libre.fsfla.org/pub/linux-libre/releases/${PKG_VER}-gnu/linux-libre-${PKG_VER}-gnu.tar.xz
 ADDITIONAL="
-    fix-sbase-coreutils.patch
+    fix-toybox-coreutils.patch
     config
 "
     #https://linux-libre.fsfla.org/pub/linux-libre/releases/$PKG_VER-gnu/deblob-${PKG_VER}
diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild
index 9cbeb5d..ac7ccfb 100644
--- a/repo/linux/linux.xibuild
+++ b/repo/linux/linux.xibuild
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 MAKEDEPS="make bc cpio linux-headers"
-DEPS="sbase kmod"
+DEPS="toybox kmod"
 
 PKG_VER=5.19.9
 SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz
 ADDITIONAL="
-    fix-sbase-coreutils.patch
+    fix-toybox-coreutils.patch
     config
 "
 
diff --git a/repo/mandoc/mandoc.xibuild b/repo/mandoc/mandoc.xibuild
index d74e6c8..b3d5b8b 100644
--- a/repo/mandoc/mandoc.xibuild
+++ b/repo/mandoc/mandoc.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl zlib sbase"
+DEPS="musl zlib toybox"
 
 PKG_VER=1.14.6
 SOURCE=https://mandoc.bsd.lv/snapshots/mandoc-$PKG_VER.tar.gz
diff --git a/repo/mksh/mksh.xibuild b/repo/mksh/mksh.xibuild
index 386fcec..f2e99e3 100644
--- a/repo/mksh/mksh.xibuild
+++ b/repo/mksh/mksh.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="sbase musl"
+DEPS="toybox musl"
 
 PKG_VER=59c
 SOURCE=http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R$PKG_VER.tgz
diff --git a/repo/mpd/mpd.xibuild b/repo/mpd/mpd.xibuild
index e55c559..cddeb38 100644
--- a/repo/mpd/mpd.xibuild
+++ b/repo/mpd/mpd.xibuild
@@ -4,7 +4,7 @@ NAME="mpd"
 DESC="Music daemon that plays MP3, FLAC, Ogg Vorbis files and Audio CDs"
 
 MAKEDEPS="meson ninja boost"
-DEPS="alsa-lib sbase expat faad2 flac fmt icu lame bzip2 libid3tag libmad libogg pulseaudio libsamplerate libmpdclient libvorbis musl opus pipewire soxr wavpack zlib sqlite3 ffmpeg4 openal-soft"
+DEPS="alsa-lib toybox expat faad2 flac fmt icu lame bzip2 libid3tag libmad libogg pulseaudio libsamplerate libmpdclient libvorbis musl opus pipewire soxr wavpack zlib sqlite3 ffmpeg4 openal-soft"
 
 PKG_VER=0.23.9
 SOURCE="https://www.musicpd.org/download/mpd/${PKG_VER%.*}/mpd-$PKG_VER.tar.xz"
diff --git a/repo/nodejs/nodejs.xibuild b/repo/nodejs/nodejs.xibuild
index 7ae444e..f656740 100644
--- a/repo/nodejs/nodejs.xibuild
+++ b/repo/nodejs/nodejs.xibuild
@@ -4,7 +4,7 @@ NAME="nodejs"
 DESC="JavaScript runtime built on V8 engine - LTS version"
 
 MAKEDEPS="make "
-DEPS="brotli sbase sort c-ares cacerts openssl musl libnghttp zlib "
+DEPS="brotli toybox sort c-ares cacerts openssl musl libnghttp zlib "
 
 PKG_VER=18.9.0
 SOURCE="https://nodejs.org/dist/v$PKG_VER/node-v$PKG_VER.tar.gz"
diff --git a/repo/openrc/openrc.xibuild b/repo/openrc/openrc.xibuild
index fb99da4..cb148da 100644
--- a/repo/openrc/openrc.xibuild
+++ b/repo/openrc/openrc.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="ifupdown-ng sbase musl"
+DEPS="ifupdown-ng toybox musl"
 
 PKG_VER=0.44.10
 SOURCE=https://github.com/OpenRC/openrc/archive/refs/tags/$PKG_VER.zip
diff --git a/repo/pcsc-lite/pcsc-lite.xibuild b/repo/pcsc-lite/pcsc-lite.xibuild
index 68ed25a..48887f2 100644
--- a/repo/pcsc-lite/pcsc-lite.xibuild
+++ b/repo/pcsc-lite/pcsc-lite.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make perl libcap-ng"
-DEPS="musl sbase eudev"
+DEPS="musl toybox eudev"
 
 PKG_VER=1.9.9
 SOURCE=https://pcsclite.apdu.fr/files/pcsc-lite-$PKG_VER.tar.bz2
diff --git a/repo/polybar/polybar.xibuild b/repo/polybar/polybar.xibuild
index ba8e472..20a46dc 100644
--- a/repo/polybar/polybar.xibuild
+++ b/repo/polybar/polybar.xibuild
@@ -4,7 +4,7 @@ NAME="polybar"
 DESC="fast and easy-to-use tool for creating status bars"
 
 MAKEDEPS="cmake "
-DEPS="alsa-lib sbase cairo fontconfig freetype2 jsoncpp curl libmpdclient pulseaudio libuv musl libxcb xcb-util-cursor xcb-util-wm "
+DEPS="alsa-lib toybox cairo fontconfig freetype2 jsoncpp curl libmpdclient pulseaudio libuv musl libxcb xcb-util-cursor xcb-util-wm "
 
 PKG_VER=3.6.3
 SOURCE="https://github.com/polybar/polybar/archive/$PKG_VER.tar.gz"
diff --git a/repo/ruby/ruby.xibuild b/repo/ruby/ruby.xibuild
index 3cc7f7b..6184e18 100644
--- a/repo/ruby/ruby.xibuild
+++ b/repo/ruby/ruby.xibuild
@@ -4,7 +4,7 @@ NAME="ruby"
 DESC="An object-oriented language for quick and easy programming"
 
 MAKEDEPS="make "
-DEPS="sbase cacerts gmp libucontext musl zlib "
+DEPS="toybox cacerts gmp libucontext musl zlib "
 
 PKG_VER=3.1.2
 SOURCE="https://cache.ruby-lang.org/pub/ruby/${PKG_VER%.*}/ruby-$PKG_VER.tar.gz"
diff --git a/repo/sbase/sbase-box.xibuild b/repo/sbase/sbase-box.xibuild
index f1e3c56..a3e36a7 100644
--- a/repo/sbase/sbase-box.xibuild
+++ b/repo/sbase/sbase-box.xibuild
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-DESC="sbase coreutils statically linked into one executable"
+DESC="toybox coreutils statically linked into one executable"
 
 build () {
-    make CFLAGS="$CFLAGS -static" sbase-box
+    make CFLAGS="$CFLAGS -static" toybox-box
 }
 
 package () {
-    make DESTDIR="$PKG_DEST" sbase-box-install
+    make DESTDIR="$PKG_DEST" toybox-box-install
 }
diff --git a/repo/sed/sed.xibuild b/repo/sed/sed.xibuild
deleted file mode 100644
index 86afebf..0000000
--- a/repo/sed/sed.xibuild
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make sort"
-DEPS="musl acl attr"
-
-PKG_VER=0.8.8
-SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
-DESC="stream editor from toybox"
-
-build () {
-    ./configure 
-    make sed
-}
-
-package () {
-    install -Dm755 sed $PKG_DEST/usr/bin/
-}
-
diff --git a/repo/shared-mime-info/shared-mime-info.xibuild b/repo/shared-mime-info/shared-mime-info.xibuild
index fc3f28e..a91f826 100644
--- a/repo/shared-mime-info/shared-mime-info.xibuild
+++ b/repo/shared-mime-info/shared-mime-info.xibuild
@@ -4,7 +4,7 @@ NAME="shared-mime-info"
 DESC="Freedesktop.org Shared MIME Info"
 
 MAKEDEPS="meson ninja itstool xmlto libxml2 glib"
-DEPS="sbase glib libxml2 musl pkg-config "
+DEPS="toybox glib libxml2 musl pkg-config "
 
 PKG_VER=2.2
 SOURCE="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/$PKG_VER/shared-mime-info-$PKG_VER.tar.gz"
diff --git a/repo/sort/sort.xibuild b/repo/sort/sort.xibuild
deleted file mode 100644
index 7a1ac57..0000000
--- a/repo/sort/sort.xibuild
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="musl sh"
-
-PKG_VER=0.8.8
-SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
-DESC="Sort from toybox"
-
-prepare () {
-    # remove the -s sort flag missing from sbase
-    sed -i "s/sort -s/sort/g" scripts/*.sh
-}
-
-build () {
-    ./configure 
-    make sort
-}
-
-package () {
-    install -Dm755 sort $PKG_DEST/usr/bin/
-}
diff --git a/repo/syslinux/syslinux.xibuild b/repo/syslinux/syslinux.xibuild
index 19edc66..d514a83 100644
--- a/repo/syslinux/syslinux.xibuild
+++ b/repo/syslinux/syslinux.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="util-linux sbase musl"
+DEPS="util-linux toybox musl"
 
 PKG_VER=6.03
 SOURCE=https://mirrors.edge.kernel.org/pub/linux/utils/boot/syslinux/${PKG_VER%.*}.xx/syslinux-$PKG_VER.tar.xz
diff --git a/repo/toybox/config b/repo/toybox/config
new file mode 100644
index 0000000..14560b4
--- /dev/null
+++ b/repo/toybox/config
@@ -0,0 +1,391 @@
+#
+# Automatically generated make config: don't edit
+# ToyBox version: KCONFIG_VERSION
+# Fri Nov  4 02:00:51 2022
+#
+CONFIG_TOYBOX_CONTAINER=y
+CONFIG_TOYBOX_FIFREEZE=y
+CONFIG_TOYBOX_ICONV=y
+CONFIG_TOYBOX_UTMPX=y
+CONFIG_TOYBOX_SHADOW=y
+# CONFIG_TOYBOX_ON_ANDROID is not set
+# CONFIG_TOYBOX_ANDROID_SCHEDPOLICY is not set
+CONFIG_TOYBOX_FORK=y
+CONFIG_TOYBOX_PRLIMIT=y
+CONFIG_TOYBOX_GETRANDOM=y
+CONFIG_TOYBOX_COPYFILERANGE=y
+CONFIG_TOYBOX_HASTIMERS=y
+
+#
+# Posix commands
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CHGRP=y
+CONFIG_CHOWN=y
+CONFIG_CHMOD=y
+CONFIG_CKSUM=y
+CONFIG_CRC32=y
+CONFIG_CMP=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_MV=y
+CONFIG_INSTALL=y
+CONFIG_CPIO=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_DF=y
+CONFIG_DIRNAME=y
+CONFIG_DU=y
+CONFIG_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPAND=y
+CONFIG_FALSE=y
+CONFIG_FILE=y
+CONFIG_FIND=y
+CONFIG_GETCONF=y
+CONFIG_GREP=y
+CONFIG_EGREP=y
+CONFIG_FGREP=y
+CONFIG_HEAD=y
+CONFIG_ICONV=y
+CONFIG_ID=y
+# CONFIG_ID_Z is not set
+CONFIG_GROUPS=y
+CONFIG_LOGNAME=y
+CONFIG_WHOAMI=y
+CONFIG_KILL=y
+CONFIG_KILLALL5=y
+CONFIG_LINK=y
+CONFIG_LN=y
+CONFIG_LOGGER=y
+CONFIG_LS=y
+CONFIG_MKDIR=y
+# CONFIG_MKDIR_Z is not set
+CONFIG_MKFIFO=y
+# CONFIG_MKFIFO_Z is not set
+CONFIG_NICE=y
+CONFIG_NL=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PASTE=y
+CONFIG_PATCH=y
+CONFIG_PRINTF=y
+CONFIG_PS=y
+CONFIG_TOP=y
+CONFIG_IOTOP=y
+CONFIG_PGREP=y
+CONFIG_PKILL=y
+CONFIG_PWD=y
+CONFIG_RENICE=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SED=y
+CONFIG_SLEEP=y
+CONFIG_SORT=y
+CONFIG_SORT_FLOAT=y
+CONFIG_SPLIT=y
+CONFIG_STRINGS=y
+CONFIG_TAIL=y
+CONFIG_TAR=y
+CONFIG_TEE=y
+CONFIG_TEST=y
+CONFIG_TEST_GLUE=y
+CONFIG_TIME=y
+CONFIG_TOUCH=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_ULIMIT=y
+CONFIG_ARCH=y
+CONFIG_LINUX32=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_UNLINK=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_XARGS=y
+
+#
+# Pending (unfinished) commands
+#
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_BC is not set
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_BRCTL is not set
+# CONFIG_CHSH is not set
+# CONFIG_CROND is not set
+# CONFIG_CRONTAB is not set
+# CONFIG_DD is not set
+# CONFIG_DHCP is not set
+# CONFIG_DHCP6 is not set
+# CONFIG_DHCPD is not set
+# CONFIG_DEBUG_DHCP is not set
+# CONFIG_DIFF is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_EXPR is not set
+# CONFIG_FDISK is not set
+# CONFIG_FOLD is not set
+# CONFIG_FSCK is not set
+# CONFIG_GETFATTR is not set
+# CONFIG_GETOPT is not set
+# CONFIG_GETTY is not set
+# CONFIG_GROUPADD is not set
+# CONFIG_GROUPDEL is not set
+# CONFIG_HEXDUMP is not set
+# CONFIG_HD 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_LSOF is not set
+# CONFIG_MAN is not set
+# CONFIG_MDEV is not set
+# CONFIG_MDEV_CONF 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_ROUTE is not set
+# CONFIG_SH is not set
+# CONFIG_CD is not set
+# CONFIG_DECLARE is not set
+# CONFIG_EXIT is not set
+# CONFIG_SET is not set
+# CONFIG_UNSET is not set
+# CONFIG_EVAL is not set
+# CONFIG_EXEC is not set
+# CONFIG_EXPORT is not set
+# CONFIG_JOBS is not set
+# CONFIG_LOCAL is not set
+# CONFIG_SHIFT is not set
+# CONFIG_SOURCE is not set
+# CONFIG_WAIT is not set
+# CONFIG_STRACE is not set
+# CONFIG_STTY is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_SYSLOGD is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_TELNET is not set
+# CONFIG_TELNETD is not set
+# CONFIG_TFTP is not set
+# CONFIG_TFTPD is not set
+# CONFIG_TR is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_USERADD is not set
+# CONFIG_USERDEL is not set
+# CONFIG_VI is not set
+# CONFIG_XZCAT is not set
+
+#
+# Other commands
+#
+# CONFIG_ACPI is not set
+CONFIG_ASCII=y
+CONFIG_UNICODE=y
+# CONFIG_BASE64 is not set
+CONFIG_BASE32=y
+# CONFIG_BLKDISCARD is not set
+# CONFIG_BLKID is not set
+CONFIG_FSTYPE=y
+CONFIG_BLOCKDEV=y
+# CONFIG_BUNZIP2 is not set
+# CONFIG_BZCAT is not set
+# CONFIG_CHCON is not set
+CONFIG_CHROOT=y
+# CONFIG_CHRT is not set
+# CONFIG_CLEAR is not set
+CONFIG_COUNT=y
+# CONFIG_DEVMEM is not set
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+# CONFIG_EJECT is not set
+CONFIG_FACTOR=y
+# CONFIG_FALLOCATE is not set
+# CONFIG_FLOCK is not set
+CONFIG_FMT=y
+# CONFIG_FREE is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSFREEZE is not set
+# CONFIG_FSYNC is not set
+# CONFIG_GPIODETECT is not set
+# CONFIG_GPIOFIND is not set
+# CONFIG_GPIOINFO is not set
+# CONFIG_GPIOGET is not set
+# CONFIG_GPIOSET is not set
+# CONFIG_HELP is not set
+CONFIG_HEXEDIT=y
+# CONFIG_HWCLOCK is not set
+# CONFIG_I2CDETECT is not set
+# CONFIG_I2CDUMP is not set
+# CONFIG_I2CGET is not set
+# CONFIG_I2CSET is not set
+# CONFIG_INOTIFYD is not set
+# CONFIG_INSMOD is not set
+# CONFIG_IONICE is not set
+# CONFIG_IORENICE 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_LSUSB is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_MCOOKIE is not set
+# CONFIG_MIX 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_UNSHARE is not set
+# CONFIG_NSENTER is not set
+# CONFIG_ONEIT is not set
+# CONFIG_OPENVT is not set
+# CONFIG_CHVT is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_PARTPROBE is not set
+# CONFIG_PIVOT_ROOT is not set
+# CONFIG_PMAP is not set
+CONFIG_PRINTENV=y
+# CONFIG_PWDX is not set
+# CONFIG_PWGEN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_READELF is not set
+CONFIG_READLINK=y
+CONFIG_REALPATH=y
+# CONFIG_REBOOT is not set
+# CONFIG_RESET is not set
+CONFIG_REV=y
+# CONFIG_RMMOD is not set
+# CONFIG_RTCWAKE is not set
+# CONFIG_SETFATTR is not set
+# CONFIG_SETSID is not set
+CONFIG_SHA3SUM=y
+CONFIG_SHRED=y
+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_NPROC=y
+CONFIG_TASKSET=y
+CONFIG_TIMEOUT=y
+CONFIG_TRUNCATE=y
+# CONFIG_UCLAMPSET is not set
+# CONFIG_UPTIME is not set
+CONFIG_USLEEP=y
+CONFIG_UUIDGEN=y
+# CONFIG_VCONFIG is not set
+# CONFIG_VMSTAT is not set
+CONFIG_W=y
+# CONFIG_WATCH is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_WHICH=y
+# CONFIG_XXD is not set
+# CONFIG_YES is not set
+
+#
+# Networking commands
+#
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_HOST is not set
+# CONFIG_HTTPD is not set
+# CONFIG_IFCONFIG is not set
+# CONFIG_MICROCOM is not set
+# CONFIG_NETCAT is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_PING is not set
+# CONFIG_RFKILL is not set
+# CONFIG_SNTP is not set
+# CONFIG_TUNCTL is not set
+CONFIG_WGET=y
+# CONFIG_WGET_LIBTLS is not set
+
+#
+# Linux Standard Base commands
+#
+# CONFIG_DMESG is not set
+# CONFIG_GZIP is not set
+# CONFIG_GUNZIP is not set
+# CONFIG_ZCAT is not set
+# CONFIG_HOSTNAME is not set
+# CONFIG_DNSDOMAINNAME is not set
+# CONFIG_KILLALL is not set
+CONFIG_MD5SUM=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA224SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA384SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_MKNOD=y
+# CONFIG_MKNOD_Z is not set
+CONFIG_MKTEMP=y
+# CONFIG_MOUNT is not set
+# CONFIG_PASSWD is not set
+# CONFIG_PASSWD_SAD 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_DEMO_MANY_OPTIONS is not set
+# CONFIG_DEMO_NUMBER is not set
+# CONFIG_DEMO_SCANKEY is not set
+# CONFIG_DEMO_UTF8TOWC is not set
+# CONFIG_HELLO is not set
+# CONFIG_HOSTID is not set
+# CONFIG_LOGPATH is not set
+# CONFIG_SKELETON is not set
+# CONFIG_SKELETON_ALIAS is not set
+
+#
+# Android commands
+#
+# CONFIG_GETENFORCE is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_LOG is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_SENDEVENT is not set
+# CONFIG_SETENFORCE is not set
+
+#
+# 
+#
+
+#
+# Toybox global settings
+#
+CONFIG_TOYBOX=y
+CONFIG_TOYBOX_SUID=y
+CONFIG_TOYBOX_LSM_NONE=y
+# CONFIG_TOYBOX_SELINUX is not set
+# CONFIG_TOYBOX_SMACK is not set
+# CONFIG_TOYBOX_LIBCRYPTO is not set
+# CONFIG_TOYBOX_LIBZ is not set
+CONFIG_TOYBOX_FLOAT=y
+# CONFIG_TOYBOX_HELP is not set
+# CONFIG_TOYBOX_HELP_DASHDASH is not set
+# CONFIG_TOYBOX_FREE is not set
+# CONFIG_TOYBOX_NORECURSE is not set
+# CONFIG_TOYBOX_DEBUG is not set
+CONFIG_TOYBOX_UID_SYS=100
+CONFIG_TOYBOX_UID_USR=500
+# CONFIG_TOYBOX_FORCE_NOMMU is not set
diff --git a/repo/toybox/diffutils.xibuild b/repo/toybox/diffutils.xibuild
new file mode 100644
index 0000000..1c225ee
--- /dev/null
+++ b/repo/toybox/diffutils.xibuild
@@ -0,0 +1,7 @@
+#!/bin/sh
+DESC="Utility programs for creating patch files"
+
+package () {
+    add_from_main /usr/bin/diff
+    add_from_main /usr/bin/cmp
+}
diff --git a/repo/toybox/findutils.xibuild b/repo/toybox/findutils.xibuild
new file mode 100644
index 0000000..6ccc37e
--- /dev/null
+++ b/repo/toybox/findutils.xibuild
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+package () {
+    add_from_main usr/bin/xargs
+    add_from_main usr/bin/find
+    add_from_main usr/bin/fmt
+}
diff --git a/repo/toybox/toybox.xibuild b/repo/toybox/toybox.xibuild
new file mode 100644
index 0000000..da2f03a
--- /dev/null
+++ b/repo/toybox/toybox.xibuild
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+NAME="toybox"
+DESC="A BSD-licensed alternative to busybox"
+
+MAKEDEPS="linux-headers"
+
+PKG_VER=0.8.8
+SOURCE="https://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz"
+ADDITIONAL="
+config
+"
+
+tools=" basename cat chgrp chown chmod cksum crc32 cmp comm cp mv install cpio cut date df dirname du echo env expand false file find getconf grep egrep fgrep head iconv id groups logname whoami kill killall5 link ln logger ls mkdir mkfifo nice nl nohup od paste patch printf ps top iotop pgrep pkill pwd renice rm rmdir sed sleep sort sort_float split strings tail tar tee test test_glue time touch true tty ulimit arch linux32 uname uniq unlink uudecode uuencode wc who xargs ascii unicode base32 fstype blockdev chroot count dos2unix unix2dos factor fmt hexedit printenv readlink realpath rev sha3sum shred stat tac nproc taskset timeout truncate usleep uuidgen w which wget md5sum sha1sum sha224sum sha256sum sha384sum sha512sum mknod mktemp seq sync "
+
+prepare () {
+    mv config .config
+}
+
+build() {
+    for tool in $tools; do
+        make $tool
+    done
+}
+
+check() {
+    for tool in $tools; do
+        make test_$tool
+    done
+}
+
+package() {
+    for tool in $tools; do
+        install -Dm755 $tool $PKG_DEST/usr/bin/$tool
+    done
+}
+
diff --git a/repo/toybox/wget.xibuild b/repo/toybox/wget.xibuild
new file mode 100644
index 0000000..6590ee2
--- /dev/null
+++ b/repo/toybox/wget.xibuild
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+DESC="A utility for transfering files with URL syntax"
+
+package () {
+    add_from_main usr/bin/wget
+}
diff --git a/repo/ubase/ubase.xibuild b/repo/ubase/ubase.xibuild
deleted file mode 100644
index c93c56e..0000000
--- a/repo/ubase/ubase.xibuild
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make findutils sed"
-DEPS="musl utmps"
-
-SOURCE=git://git.suckless.org/ubase
-
-DESC="ubase from suckless.org"
-
-prepare () {
-    /usr/bin/find -type 'f' -name '*.c' -exec sed -i "s@#include <sys/types.h>@#include <sys/sysmacros.h>@g" {} \;
-}
-
-build () {
-    make
-}
-
-package () {
-    for p in stat id df dd truncate who; do
-        install -d $PKG_DEST/usr/bin
-        install -m755 $p $PKG_DEST/usr/bin
-
-        if [ -f $p.1 ]; then
-            install -d $PKG_DEST/usr/share/man
-            install -m644 $p.1 $PKG_DEST/usr/share/man/$p.1
-        fi
-        if [ -f $p.8 ]; then
-            install -d $PKG_DEST/usr/share/man
-            install -m644 $p.8 $PKG_DEST/usr/share/man/$p.8
-        fi
-    done;
-}
diff --git a/repo/usbutils/usbutils.xibuild b/repo/usbutils/usbutils.xibuild
index 1e744f5..a069fa8 100644
--- a/repo/usbutils/usbutils.xibuild
+++ b/repo/usbutils/usbutils.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="libusb wget"
-DEPS="libusb musl hwids sbase python"
+DEPS="libusb musl hwids toybox python"
 
 PKG_VER=014
 SOURCE=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-$PKG_VER.tar.xz
diff --git a/repo/util-linux/util-linux.xibuild b/repo/util-linux/util-linux.xibuild
index de81cb1..e3de023 100644
--- a/repo/util-linux/util-linux.xibuild
+++ b/repo/util-linux/util-linux.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="sbase libcap libxcrypt readline"
+DEPS="toybox libcap libxcrypt readline"
 
 PKG_VER=2.37.4
 SOURCE=https://cdn.kernel.org/pub/linux/utils/util-linux/v$(echo $PKG_VER | cut -d. -f-2)/util-linux-$PKG_VER.tar.xz
diff --git a/repo/which/which.xibuild b/repo/which/which.xibuild
deleted file mode 100644
index 2914eb3..0000000
--- a/repo/which/which.xibuild
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make "
-
-PKG_VER=2.21
-
-SOURCE=http://ftp.gnu.org/gnu/which/which-$PKG_VER.tar.gz
-DESC="A utility to show the full path of commands"
-
-build () {
-    CC=gcc ./configure --prefix=/usr 
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-}
-
-
diff --git a/repo/x264/x264.xibuild b/repo/x264/x264.xibuild
index 5c1d375..afe33e1 100644
--- a/repo/x264/x264.xibuild
+++ b/repo/x264/x264.xibuild
@@ -3,7 +3,7 @@
 NAME="x264"
 DESC="Free library for encoding H264/AVC video streams"
 
-MAKEDEPS="make libx11 perl nasm sbase bash"
+MAKEDEPS="make libx11 perl nasm toybox bash"
 DEPS="musl "
 
 PKG_VER=0.164.r3081.19856cc
diff --git a/repo/xipkg/xipkg.xibuild b/repo/xipkg/xipkg.xibuild
index ccee38a..50080b3 100644
--- a/repo/xipkg/xipkg.xibuild
+++ b/repo/xipkg/xipkg.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make shmk"
-DEPS="openssl curl dash findutils diffutils sed xichroot grep base64 sort hbar parseconf xiutils"
+DEPS="toybox openssl curl dash findutils diffutils sed xichroot grep base64 hbar parseconf xiutils"
 
 PKG_VER=1.7.4
 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git
diff --git a/repo/zynaddsubfx/zynaddsubfx.xibuild b/repo/zynaddsubfx/zynaddsubfx.xibuild
index dea9ca1..61b3324 100644
--- a/repo/zynaddsubfx/zynaddsubfx.xibuild
+++ b/repo/zynaddsubfx/zynaddsubfx.xibuild
@@ -3,8 +3,7 @@
 NAME="zynaddsubfx"
 DESC="fully featured open source software synthesizer"
 
-MAKEDEPS="cmake "
-DEPS="pkg-config zlib mxml ntk libx11 liblo fftw libxpm pulseaudio jack alsa-lib doxygen fltk "
+MAKEDEPS="cmake pkg-config zlib mxml ntk libx11 liblo fftw libxpm pulseaudio jack alsa-lib doxygen fltk "
 
 PKG_VER=3.0.6
 SOURCE="git://git.code.sf.net/p/zynaddsubfx/code/"