added sysvinit and openrc

15 files changed, 201 insertions, 138 deletions

diff --git a/repo/devel/scdoc.xibuild b/repo/devel/scdoc.xibuild
new file mode 100644
index 0000000..d6fc4de
--- /dev/null
+++ b/repo/devel/scdoc.xibuild
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MAKEDEPS="python "
+DEPS="pkgconf"
+
+PKG_VER=1.11.2
+SOURCE=https://git.sr.ht/~sircmpwn/scdoc/archive/$PKG_VER.tar.gz
+DESC="Simple man page generator written for POSIX systems written in C99"
+
+build () {
+    make PREFIX="/usr"
+}
+
+package () {
+    make DESTDIR=$PKG_DEST PREFIX="/usr" install
+}
diff --git a/repo/meta/all.xibuild b/repo/meta/all.xibuild
index 16d80bf..53452e7 100644
--- a/repo/meta/all.xibuild
+++ b/repo/meta/all.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="AlL tHe pacKageS!!"
-DEPS=" feh lynx rxvt-unicode vim xterm asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc sgml-common swig texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux alsa-firmware alsa-lib alsa-plugins alsa-tools alsa-utils audiofile faac faad2 fdk-aac flac libogg libsamplerate libsndfile libtheora libvorbis libvpx opus pipewire pulseaudio python-alabaster python-appdirs python-babel python-certifi python-chardet python-docutils python-html5lib python-idna python-imagesize python-Jinja2 python-jinja python-lxml python-mach python-mako python-markupsafe python-packaging python-pip python-pygments python-pyparsing python-pytz python-requests python-six python-snowballstemmer python-sphinx-alabaster-theme python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-jsmath python-sphinxcontrib-qthelp python-sphinxcontrib-serializinghtml python-sphinx python-urllib3 python-webencodings python alsa-oss audit cacert-utils fakechroot fakeroot icecream-sundae polybar xf86-video-qxl xf86-video-vga acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump s6-linux-init s6-linux-utils s6-portable-utils s6-rc s6 sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd acpi base64 bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors man-db neofetch net-tools nmap openssh pciutils pm-utils procps-ng rhash rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud mkinitramfs sysconfigs xib xichroot xipkg xiutils"
+DEPS=" feh lynx rxvt-unicode vim xterm asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc scdoc sgml-common swig texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux alsa-firmware alsa-lib alsa-plugins alsa-tools alsa-utils audiofile faac faad2 fdk-aac flac libogg libsamplerate libsndfile libtheora libvorbis libvpx opus pipewire pulseaudio python-alabaster python-appdirs python-babel python-certifi python-chardet python-docutils python-html5lib python-idna python-imagesize python-Jinja2 python-jinja python-lxml python-mach python-mako python-markupsafe python-packaging python-pip python-pygments python-pyparsing python-pytz python-requests python-six python-snowballstemmer python-sphinx-alabaster-theme python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-jsmath python-sphinxcontrib-qthelp python-sphinxcontrib-serializinghtml python-sphinx python-urllib3 python-webencodings python alsa-oss audit cacert-utils fakechroot fakeroot icecream-sundae polybar xf86-video-qxl xf86-video-vga acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openrc openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd acpi base64 bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop ifupdown-ng inetutils iproute2 iw keyutils less lm-sensors man-db neofetch net-tools nmap openssh pciutils pm-utils procps-ng rhash rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud mkinitramfs sysconfigs xib xichroot xipkg xiutils"
diff --git a/repo/meta/base.xibuild b/repo/meta/base.xibuild
index 1d6415d..989c87a 100644
--- a/repo/meta/base.xibuild
+++ b/repo/meta/base.xibuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-DEPS="bash bzip2 sbase s6 bootscripts 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 hwids"
+DEPS="bash bzip2 sbase 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 sysvinit"
 MAKEDEPS="grep python"
 
 DESC="The base system to be installed"
diff --git a/repo/meta/repo-devel.xibuild b/repo/meta/repo-devel.xibuild
index 5226f32..01a0c6c 100644
--- a/repo/meta/repo-devel.xibuild
+++ b/repo/meta/repo-devel.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="All the the packages available in devel"
-DEPS=" asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc sgml-common swig texinfo xmlto"
+DEPS=" asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc scdoc sgml-common swig texinfo xmlto"
diff --git a/repo/meta/repo-system.xibuild b/repo/meta/repo-system.xibuild
index 9989a8d..752f623 100644
--- a/repo/meta/repo-system.xibuild
+++ b/repo/meta/repo-system.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="All the the packages available in system"
-DEPS=" acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump s6-linux-init s6-linux-utils s6-portable-utils s6-rc s6 sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd"
+DEPS=" acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openrc openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd"
diff --git a/repo/meta/repo-util.xibuild b/repo/meta/repo-util.xibuild
index 63c56f4..6cc0a60 100644
--- a/repo/meta/repo-util.xibuild
+++ b/repo/meta/repo-util.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="All the the packages available in util"
-DEPS=" acpi base64 bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors man-db neofetch net-tools nmap openssh pciutils pm-utils procps-ng rhash rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant"
+DEPS=" acpi base64 bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop ifupdown-ng inetutils iproute2 iw keyutils less lm-sensors man-db neofetch net-tools nmap openssh pciutils pm-utils procps-ng rhash rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant"
diff --git a/repo/system/bootscripts.xibuild b/repo/system/bootscripts.xibuild
index f133786..6fe5e6f 100644
--- a/repo/system/bootscripts.xibuild
+++ b/repo/system/bootscripts.xibuild
@@ -1,23 +1,11 @@
 #!/bin/sh
 
-MAKEDEPS="make s6-linux-init s6-rc utmps"
-DEPS="sh eudev s6 s6-rc s6-linux-utils s6-portable-utils s6-linux-init"
+MAKEDEPS="make "
+DEPS="sh eudev"
 
 SOURCE=https://xi.davidovski.xyz/git/bootscripts.git
 DESC="Bootscripts to initiate the system on boot"
 
 package () {
-    make DESTDIR=$PKG_DEST bootscripts
-
-    # Compile a basic database for boot
-    s6-rc-compile $PKG_DEST/etc/s6/db/basic $PKG_DEST/etc/s6/sv 
-    ln -s /etc/s6/db/basic $PKG_DEST/etc/s6/db/current
-
-    # initialize s6 init base. 
-    s6-linux-init-maker -1  -t 2 -L \
-                        -f $PKG_DEST/etc/s6/skel \
-                        -p "/usr/bin:/usr/sbin:/bin:/sbin"    \
-                        -D default \
-                        -G "/sbin/agetty -L -8 tty1 115200" \
-                        -c $PKG_DEST/etc/s6/base -u root -U utmp $PKG_DEST/etc/s6/base
+    make DESTDIR=$PKG_DEST install
 }
diff --git a/repo/system/openrc.xibuild b/repo/system/openrc.xibuild
new file mode 100644
index 0000000..d7c061b
--- /dev/null
+++ b/repo/system/openrc.xibuild
@@ -0,0 +1,129 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="ifupdown-ng sbase musl"
+
+PKG_VER=0.44.10
+SOURCE=https://github.com/OpenRC/openrc/archive/refs/tags/$PKG_VER.zip
+ADDITIONAL="
+	0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
+	0002-fsck-don-t-add-C0-to-busybox-fsck.patch
+	0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+	0004-make-consolefont-service-compatible-with-busyboxs-se.patch
+	0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch
+	0006-Add-support-for-starting-services-in-a-specified-VRF.patch
+	0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch
+	0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch
+	0009-fix-bootmisc-mv-error.patch
+	0010-noexec-devfs.patch
+	seedrng.patch
+	openrc.logrotate
+	hostname.initd
+	hwdrivers.initd
+	modules.initd
+	modloop.initd
+	networking.initd
+	modloop.confd
+	sysfsconf.initd
+	firstboot.initd
+	sysctl.initd
+	machine-id.initd
+	test-networking.sh
+    "
+
+DESC="Dependency based init system that works with sysvinit"
+
+# build borrowed from alpine linux
+prepare () {
+    apply_patches
+    sed -i -e '/^sed/d' pkgconfig/Makefile
+    find ./ -name "Makefile" | xargs sed -i 's/ln -snf/ln -sf/g'
+}
+
+build () {
+    export MKZSHCOMP=yes
+	export MKBASHCOMP=yes
+	make LIBDIR=/lib LIBEXECDIR=/lib/rc
+}
+
+check () {
+	make check
+}
+
+package () {
+	make LIBEXECDIR=/lib/rc DESTDIR="$PKG_DEST/" install
+
+	rm -f "$PKG_DEST"/sbin/openrc-init "$PKG_DEST"/sbin/openrc-shutdown
+
+	# we cannot have anything turned on by default
+	rm -f "$PKG_DEST"/etc/runlevels/*/*
+
+	# we still use our ifup/ifdown based net config
+	rm -f "$PKG_DEST"/etc/conf.d/network "$PKG_DEST"/etc/init.d/network
+
+	# our hostname init script reads hostname from /etc/hostname
+	rm -f "$PKG_DEST"/etc/conf.d/hostname
+
+	# we override some of the scripts
+	for i in *.initd; do
+		j=${i##*/}
+		install -Dm755 $i "$PKG_DEST"/etc/init.d/${j%.initd}
+	done
+
+	# we override some of the conf.d files
+	for i in *.confd; do
+		j=${i##*/}
+		install -Dm644 $i "$PKG_DEST"/etc/conf.d/${j%.confd}
+	done
+
+	# additional documentation considered useful
+	mkdir -p "$PKG_DEST"/usr/share/doc/openrc/
+	install -m644 ChangeLog ./*.md "$PKG_DEST"/usr/share/doc/openrc/
+
+	# we use a virtual keymaps services to allow users to set their
+	# keymaps either with the OpenRC loadkeys service provided by
+	# the kbd aport or with the loadkmap service provided by the
+	# busybox-initscripts aport.
+	rm -f "$PKG_DEST/etc/init.d/keymaps" \
+		"$PKG_DEST/etc/conf.d/keymaps"
+
+	install -Dm644 openrc.logrotate $PKG_DEST/etc/logrotate.d/openrc
+	install -d "$PKG_DEST"/etc/local.d "$PKG_DEST"/run
+
+	# openrc upstream removed service(8) for whatever reason, put it back
+	ln -s /sbin/rc-service $PKG_DEST/sbin/service
+
+	# remove deprecated /sbin/runscript to avoid conflict with minicom
+	rm $PKG_DEST/sbin/runscript
+}
+
+postinstall () {
+    mkdir -p /run/openrc
+    for dir in /libexec /lib; do
+        [ -d $dir/rc/init.d ] || continue
+
+        for i in $dir/rc/init.d/* ; do
+            [ -e "$i" ] || continue
+            if [ -e /run/openrc/${i##*/} ]; then
+                rm -r $i
+            else
+                mv $i /run/openrc/
+            fi
+        done
+
+        rmdir $dir/rc/init.d $dir/rc /libexec 2>/dev/null
+    done
+
+    # create rc.local compat
+    if [ -f /etc/rc.local ]; then
+        cat >/etc/local.d/rc.local-compat.start<< EOF
+#!/bin/sh
+
+# this is only here for compatibility reasons
+if [ -f /etc/rc.local ]; then
+    . /etc/rc.local
+fi
+EOF
+        chmod +x /etc/local.d/rc.local-compat.start
+    fi
+}
diff --git a/repo/system/s6-linux-init.xibuild b/repo/system/s6-linux-init.xibuild
deleted file mode 100644
index fa68b90..0000000
--- a/repo/system/s6-linux-init.xibuild
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="s6 skalibs nsss"
-
-PKG_VER=1.0.7.0
-SOURCE=https://skarnet.org/software/s6-linux-init/s6-linux-init-$PKG_VER.tar.gz 
-DESC="Small suite of programs for UNIX, designed to allow process supervision"
-
-build () {
-    ./configure --enable-shared      \
-            --enable-static      \
-            --enable-nsss        \
-            --enable-allstatic   \
-            --enable-static-libc \
-            --libdir=/usr/lib \
-            --libexecdir=/usr/lib/s6-linux-init \
-            --with-dynlib=/usr/lib   \
-            --enable-utmps 
-
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install 
-}
diff --git a/repo/system/s6-linux-utils.xibuild b/repo/system/s6-linux-utils.xibuild
deleted file mode 100644
index 8d2d358..0000000
--- a/repo/system/s6-linux-utils.xibuild
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="skalibs s6"
-
-PKG_VER=2.11.0.1
-SOURCE=https://skarnet.org/software/s6-linux-utils/s6-linux-utils-2.5.1.7.tar.gz
-DESC="Minimalistic Linux-specific system utilities"
-
-build () {
-    ./configure --disable-allstatic \
-            --prefix=/usr       \
-            --with=dynlib=/usr/lib
-
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install 
-}
diff --git a/repo/system/s6-portable-utils.xibuild b/repo/system/s6-portable-utils.xibuild
deleted file mode 100644
index a0e0956..0000000
--- a/repo/system/s6-portable-utils.xibuild
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="skalibs s6"
-
-PKG_VER=2.2.3.4
-SOURCE=https://skarnet.org/software/s6-portable-utils/s6-portable-utils-$PKG_VER.tar.gz
-DESC="Tiny portable generic utilities"
-
-build () {
-    ./configure --enable-shared         \
-                --enable-static         \
-                --enable-allstatic      \
-                --enable-static-libc    \
-                --libdir=/usr/lib       \
-                --libexecdir=/usr/lib/s6-portable-utils \
-                --with-dynlib=/usr/lib
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install 
-}
diff --git a/repo/system/s6-rc.xibuild b/repo/system/s6-rc.xibuild
deleted file mode 100644
index bbda0e8..0000000
--- a/repo/system/s6-rc.xibuild
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="skalibs s6"
-
-PKG_VER=0.5.3.0
-SOURCE=https://skarnet.org/software/s6-rc/s6-rc-$PKG_VER.tar.gz
-
-DESC="Service manager of the s6 init system"
-
-build () {
-    ./configure --enable-shared         \
-            --enable-static         \
-            --enable-allstatic      \
-            --enable-static-libc    \
-            --libdir=/usr/lib       \
-            --libexecdir=/usr/lib/s6-rc \
-            --with-dynlib=/usr/lib
-
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install 
-}
diff --git a/repo/system/s6.xibuild b/repo/system/s6.xibuild
deleted file mode 100644
index 7f429a5..0000000
--- a/repo/system/s6.xibuild
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="skalibs execline"
-
-PKG_VER=2.11.0.1
-SOURCE=https://skarnet.org/software/s6/s6-$PKG_VER.tar.gz 
-DESC="Small suite of programs for UNIX, designed to allow process supervision"
-
-build () {
-    ./configure --enable-shared      \
-            --enable-static      \
-            --enable-allstatic   \
-            --enable-static-libc \
-            --libdir=/usr/lib    \
-            --libexecdir=/usr/lib/s6 \
-            --with-dynlib=/usr/lib
-
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install 
-}
diff --git a/repo/system/sysvinit.xibuild b/repo/system/sysvinit.xibuild
new file mode 100644
index 0000000..f585b61
--- /dev/null
+++ b/repo/system/sysvinit.xibuild
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+MAKEDEPS="make patch"
+DEPS="sh musl"
+
+PKG_VER=3.01
+SOURCE=http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-$PKG_VER.tar.xz
+ADDITIONAL="
+    https://www.linuxfromscratch.org/patches/lfs/development/sysvinit-$PKG_VER-consolidated-1.patch
+    "
+
+DESC="The sysvinit system for controlling startup, running and shutdown of the system"
+
+
+prepare () {
+    patch -Np1 -i sysvinit-$PKG_VER-consolidated-1.patch
+}
+
+build () {
+    make
+}
+
+package () {
+    make ROOT=$PKG_DEST install 
+}
diff --git a/repo/util/ifupdown-ng.xibuild b/repo/util/ifupdown-ng.xibuild
new file mode 100644
index 0000000..c65430b
--- /dev/null
+++ b/repo/util/ifupdown-ng.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+MAKEDEPS="make scdoc"
+DEPS="musl"
+
+DESC="Tools for managing network configuration"
+
+PKG_VER=0.12.0
+SOURCE=https://distfiles.dereferenced.org/ifupdown-ng/ifupdown-ng-$PKG_VER.tar.xz
+
+build () {
+    make
+	make docs
+}
+
+#check () {
+    #make check
+#}
+
+package () {
+    make DESTDIR="$PKG_DEST" install install_docs
+}
+