From e1ab227486dac430c809d762ffb0a458e7185247 Mon Sep 17 00:00:00 2001
From: Ruslan Akbashev <ra@turingpi.com>
Date: Mon, 11 Dec 2023 16:05:05 +0400
Subject: [PATCH 1/2] package/bmcd: bump to latest & enable rockusb driver

This sets version of bmcd to latest, and also enables the driver that it
relies on.

Related to #137
---
 tp2bmc/package/bmcd/S94bmcd | 2 ++
 tp2bmc/package/bmcd/bmcd.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tp2bmc/package/bmcd/S94bmcd b/tp2bmc/package/bmcd/S94bmcd
index 392c3e6b..a79d60c8 100644
--- a/tp2bmc/package/bmcd/S94bmcd
+++ b/tp2bmc/package/bmcd/S94bmcd
@@ -9,6 +9,8 @@ KEYFILE="/etc/ssl/certs/bmcd_key.pem"
 start() {
     printf 'Starting %s...\n' "$DAEMON"
 
+    modprobe rockusb
+
     [ ! -f "$CERTFILE" ] || [ ! -f "$KEYFILE" ] && /etc/bmcd/generate_self_signedx509.sh 
 
     start-stop-daemon --start --quiet --background --make-pidfile --pidfile "$PIDFILE" --no-close \
diff --git a/tp2bmc/package/bmcd/bmcd.mk b/tp2bmc/package/bmcd/bmcd.mk
index defcbbb4..83cd3b69 100644
--- a/tp2bmc/package/bmcd/bmcd.mk
+++ b/tp2bmc/package/bmcd/bmcd.mk
@@ -3,7 +3,7 @@
 # bmcd
 ###########################################################
 
-BMCD_VERSION = e1d147329355e8618ffcb41a0edd538950e367a9
+BMCD_VERSION = 0bf5591719ed5cd64e636221f05264adbfb5beab
 BMCD_SITE = $(call github,turing-machines,bmcd,$(BMCD_VERSION))
 BMCD_LICENSE = Apache-2.0
 BMCD_LICENSE_FILES = LICENSE

From a253dfb67d2120f9c069848bfbffe6c30d355b28 Mon Sep 17 00:00:00 2001
From: Ruslan Akbashev <ra@turingpi.com>
Date: Thu, 14 Dec 2023 11:51:47 +0400
Subject: [PATCH 2/2] init: move modprobing modules from S94bmcd to a separate
 file

---
 .../tp2bmc/overlay/etc/init.d/S92modules      | 56 +++++++++++++++++++
 tp2bmc/board/tp2bmc/overlay/etc/modules       |  1 +
 tp2bmc/package/bmcd/S94bmcd                   |  2 -
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100755 tp2bmc/board/tp2bmc/overlay/etc/init.d/S92modules
 create mode 100644 tp2bmc/board/tp2bmc/overlay/etc/modules

diff --git a/tp2bmc/board/tp2bmc/overlay/etc/init.d/S92modules b/tp2bmc/board/tp2bmc/overlay/etc/init.d/S92modules
new file mode 100755
index 00000000..f25712e1
--- /dev/null
+++ b/tp2bmc/board/tp2bmc/overlay/etc/init.d/S92modules
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+MODULES="modules"
+
+load_unload() {
+	[ ! -f /etc/${MODULES} ] && echo ' OK' && exit 0
+
+	while read module args; do
+
+		case "$module" in
+			""|"#"*) continue ;;
+		esac
+
+		if [ "$1" = "load" ]; then
+			modprobe -q ${module} ${args} >/dev/null && \
+				printf ' %s success,' "$module" ||
+				printf ' %s failed,' "$module"
+		else
+			rmmod ${module} >/dev/null
+		fi
+
+	done < /etc/${MODULES}
+}
+
+start() {
+	printf 'Starting %s:' "$MODULES"
+
+	load_unload load
+
+	echo ' OK'
+}
+
+stop() {
+	printf 'Stopping %s: ' "$MODULES"
+
+	load_unload unload
+
+	echo 'OK'
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/tp2bmc/board/tp2bmc/overlay/etc/modules b/tp2bmc/board/tp2bmc/overlay/etc/modules
new file mode 100644
index 00000000..a9a6b5ff
--- /dev/null
+++ b/tp2bmc/board/tp2bmc/overlay/etc/modules
@@ -0,0 +1 @@
+rockusb
diff --git a/tp2bmc/package/bmcd/S94bmcd b/tp2bmc/package/bmcd/S94bmcd
index a79d60c8..392c3e6b 100644
--- a/tp2bmc/package/bmcd/S94bmcd
+++ b/tp2bmc/package/bmcd/S94bmcd
@@ -9,8 +9,6 @@ KEYFILE="/etc/ssl/certs/bmcd_key.pem"
 start() {
     printf 'Starting %s...\n' "$DAEMON"
 
-    modprobe rockusb
-
     [ ! -f "$CERTFILE" ] || [ ! -f "$KEYFILE" ] && /etc/bmcd/generate_self_signedx509.sh 
 
     start-stop-daemon --start --quiet --background --make-pidfile --pidfile "$PIDFILE" --no-close \