From 55e65d05e236b13432ee31d9da4328c82627233c Mon Sep 17 00:00:00 2001
From: Kohei Watanabe <nebel@fogtype.com>
Date: Tue, 20 Aug 2024 15:15:26 +0900
Subject: [PATCH] disable legacy camera by default and add raspistill shim

---
 stage2/99-enable-camera/00-run.sh                      | 7 +++++++
 stage2/99-enable-camera/files/usr/local/bin/raspistill | 2 ++
 stage2/99-enable-legacy-camera/00-run.sh               | 6 ------
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100755 stage2/99-enable-camera/00-run.sh
 create mode 100755 stage2/99-enable-camera/files/usr/local/bin/raspistill
 delete mode 100755 stage2/99-enable-legacy-camera/00-run.sh

diff --git a/stage2/99-enable-camera/00-run.sh b/stage2/99-enable-camera/00-run.sh
new file mode 100755
index 0000000000..76f345220f
--- /dev/null
+++ b/stage2/99-enable-camera/00-run.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+install {files,"${ROOTFS_DIR}"}/usr/local/bin/raspistill
+
+on_chroot <<EOF
+raspi-config nonint do_camera 0
+EOF
diff --git a/stage2/99-enable-camera/files/usr/local/bin/raspistill b/stage2/99-enable-camera/files/usr/local/bin/raspistill
new file mode 100755
index 0000000000..1aaef4f5dc
--- /dev/null
+++ b/stage2/99-enable-camera/files/usr/local/bin/raspistill
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec libcamera-still --verbose=0 "$@"
diff --git a/stage2/99-enable-legacy-camera/00-run.sh b/stage2/99-enable-legacy-camera/00-run.sh
deleted file mode 100755
index 441300f62b..0000000000
--- a/stage2/99-enable-legacy-camera/00-run.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-raspi-config nonint do_camera 0
-raspi-config nonint do_legacy 0
-EOF