Runit working as an init system!

1 files changed, 8 insertions, 5 deletions

diff --git a/meta-yerba/recipes-core/runit/runit_2.3.1.bb b/meta-yerba/recipes-core/runit/runit_2.3.1.bb
index 4b8122b..277cc96 100644
--- a/meta-yerba/recipes-core/runit/runit_2.3.1.bb
+++ b/meta-yerba/recipes-core/runit/runit_2.3.1.bb
@@ -11,10 +11,10 @@ S = "${WORKDIR}/git"
 do_compile() {
     cd ${S}
     export CC="${CC}"
-    export AR="${AR}"
-    export RANLIB="${RANLIB}"
     export CFLAGS="${CFLAGS} -D_GNU_SOURCE -static"
-    export LDFLAGS="${LDFLAGS} -static"
+    export LDFLAGS="${LDFLAGS} -static -Wl,z -Wl,noexecstack"
+    echo "${CC} ${CFLAGS}" > src/conf-cc
+    echo "${CC} ${LDFLAGS}" > src/conf-ld
     ./package/compile
 }
 
@@ -23,9 +23,12 @@ do_install() {
     
     if [ -d ${S}/command ]; then
         install -m 0755 ${S}/command/runit-init ${D}/sbin/
+        install -m 0755 ${S}/command/runit ${D}/sbin/
         install -m 0755 ${S}/command/runsvdir ${D}/usr/sbin/
+        install -m 0755 ${S}/command/runsv ${D}/usr/sbin/
         install -m 0755 ${S}/command/sv ${D}/usr/bin/
         install -m 0755 ${S}/command/svlogd ${D}/usr/sbin/
+        ln -sf sbin/runit-init ${D}/sbin/init
     fi
     
     cat > ${D}/etc/runit/1 << 'EOF'
@@ -44,10 +47,10 @@ EOF
     chmod 0755 ${D}/etc/runit/* 2>/dev/null || true
 }
 
-FILES:${PN} = "/sbin/runit-init /usr/sbin/runsvdir /usr/bin/sv /usr/sbin/svlogd /etc/runit /etc/service"
+FILES:${PN} = "/sbin/runit-init /usr/sbin/runsvdir /usr/bin/sv /usr/sbin/svlogd /etc/runit /etc/service /sbin/runit /sbin/init /usr/sbin/runsv"
 RDEPENDS:${PN} += "busybox"
 
 PROVIDES += "runit-init"
 
-# Prevents yocto from shitting itself and telling me "oh its a fatal QA issue the binaries are stripped" LET ME L
+# Prevents yocto from shitting itself and telling me "oh its a fatal QA issue the binaries are stripped" LET ME LIVE
 INSANE_SKIP:${PN} += "already-stripped debug-files"