Fix up the serialgetty recipe to use proper file structure, and add a dhcpcd recipe

5 files changed, 22 insertions, 10 deletions

diff --git a/meta-yerba/recipes-core/images/yerba-image.bb b/meta-yerba/recipes-core/images/yerba-image.bb
index ab0fea1..5515039 100644
--- a/meta-yerba/recipes-core/images/yerba-image.bb
+++ b/meta-yerba/recipes-core/images/yerba-image.bb
@@ -34,9 +34,5 @@ do_image_post:append() {
     install -d ${IMAGE_ROOTFS}/home/yerba
     chown 1000:1000 ${IMAGE_ROOTFS}/home/yerba
     
-    # Do this later because i cant be bothered to make a doas recipe atm
-    # echo "permit :wheel" > ${IMAGE_ROOTFS}/etc/doas.conf
-    # chmod 0640 ${IMAGE_ROOTFS}/etc/doas.conf
-
     echo "Welcome to Yerba Linux" > ${IMAGE_ROOTFS}/etc/motd
 }
diff --git a/meta-yerba/recipes-core/runit/runit-dhcpcd.bb b/meta-yerba/recipes-core/runit/runit-dhcpcd.bb
new file mode 100644
index 0000000..d28e747
--- /dev/null
+++ b/meta-yerba/recipes-core/runit/runit-dhcpcd.bb
@@ -0,0 +1,13 @@
+SUMMARY = "dhcpcd service for runit"
+DESCRIPTION = "Provides a dhcpcd service for runit"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+SRC_URI = "file://run"
+
+RDEPENDS:${PN} = "runit"
+do_install() {
+    install -d ${D}/etc/runit/sv/dhcpcd ${D}/etc/service
+    install -m 0755 ${WORKDIR}/run ${D}/etc/runit/sv/dhcpcd/run
+    ln -sf /etc/runit/sv/dhcpcd ${D}/etc/service/dhcpcd
+}
diff --git a/meta-yerba/recipes-core/runit/runit-dhcpcd/run b/meta-yerba/recipes-core/runit/runit-dhcpcd/run
new file mode 100644
index 0000000..1692369
--- /dev/null
+++ b/meta-yerba/recipes-core/runit/runit-dhcpcd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /sbin/dhcpcd
diff --git a/meta-yerba/recipes-core/runit/runit-serialgetty.bb b/meta-yerba/recipes-core/runit/runit-serialgetty.bb
index 5328f68..47c0aa3 100644
--- a/meta-yerba/recipes-core/runit/runit-serialgetty.bb
+++ b/meta-yerba/recipes-core/runit/runit-serialgetty.bb
@@ -3,15 +3,14 @@ DESCRIPTION = "Provides a getty service on the serial console for runit"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
+SRC_URI = "file://run"
+
 RDEPENDS:${PN} = "runit"
 
 do_install() {
-    install -d ${D}/etc/service/serial-getty
-    cat > ${D}/etc/service/serial-getty/run << EOF
-#!/bin/sh
-exec /sbin/getty -L 115200 ttyS0 vt100
-EOF
-    chmod 0755 ${D}/etc/service/serial-getty/run
+    install -d ${D}/etc/runit/sv/serial-getty ${D}/etc/service/
+    install -m 0755 ${WORKDIR}/run ${D}/etc/runit/sv/serial-getty/run
+    ln -sf /etc/runit/sv/serial-getty ${D}/etc/service/serial-getty
 }
 
 FILES:${PN} = "/etc/service/serial-getty"
diff --git a/meta-yerba/recipes-core/runit/runit-serialgetty/run b/meta-yerba/recipes-core/runit/runit-serialgetty/run
new file mode 100644
index 0000000..c935462
--- /dev/null
+++ b/meta-yerba/recipes-core/runit/runit-serialgetty/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /sbin/getty -L 115200 ttyS0 vt100