Skip to content

Commit 1ea8cb6

Browse files
committed
feat(pi): support USB microphone; Opus
1 parent 0657f26 commit 1ea8cb6

4 files changed

Lines changed: 18 additions & 2 deletions

File tree

meta-secluso-os/pi-debug-image.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ signers:
2121
gpg_keyserver: keyserver.ubuntu.com
2222

2323
# The machine as it is written into the `local.conf` of bitbake.
24-
machine: raspberrypi4-64
24+
machine: raspberrypi0-2w-64
2525
# The distro name as it is written into the `local.conf` of bitbake.
2626
# Selects conf/distro/secluso.conf from meta-secluso-os.
2727
distro: secluso
@@ -166,6 +166,9 @@ local_conf_header:
166166
# Not all kernel-modules need to be included for proper operation.
167167
# TODO: Remove unnecesary kernel modules
168168
IMAGE_INSTALL:append = " kmod i2c-tools kernel-modules"
169+
170+
# Microphone-related.
171+
IMAGE_INSTALL:append = " alsa-utils alsa-state opus-tools"
169172
170173
# Referenced from https://hub.mender.io/t/how-to-configure-networking-using-systemd-in-yocto-project/1097
171174
# This installs the necessary firmware to connect to WiFi. See LICENSE_FLAGS_ACCEPTED for a relevant discussion.

meta-secluso-os/pi-official-image.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ local_conf_header:
158158
# Not all kernel-modules need to be included for proper operation.
159159
# TODO: Remove unnecesary kernel modules
160160
IMAGE_INSTALL:append = " kmod i2c-tools kernel-modules"
161+
162+
# Microphone-related.
163+
IMAGE_INSTALL:append = " alsa-utils alsa-state opus-tools"
161164
162165
# Referenced from https://hub.mender.io/t/how-to-configure-networking-using-systemd-in-yocto-project/1097
163166
# This installs the necessary firmware to connect to WiFi. See LICENSE_FLAGS_ACCEPTED for a relevant discussion.

meta-secluso-os/recipes-secluso-camera-hub/secluso-camera-hub/secluso-camera-hub-crates.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ SRC_URI += " \
167167
crate://crates.io/ocb3/0.1.0 \
168168
crate://crates.io/once_cell/1.21.4 \
169169
crate://crates.io/opaque-debug/0.3.1 \
170+
crate://crates.io/opusic-c/1.6.1 \
171+
crate://crates.io/opusic-sys/0.7.3 \
170172
crate://crates.io/openssl-probe/0.2.1 \
171173
crate://crates.io/p256/0.13.2 \
172174
crate://crates.io/p384/0.13.1 \
@@ -534,6 +536,8 @@ SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0
534536
SRC_URI[ocb3-0.1.0.sha256sum] = "c196e0276c471c843dd5777e7543a36a298a4be942a2a688d8111cd43390dedb"
535537
SRC_URI[once_cell-1.21.4.sha256sum] = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
536538
SRC_URI[opaque-debug-0.3.1.sha256sum] = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
539+
SRC_URI[opusic-c-1.6.1.sha256sum] = "89f8e9c909466f15e60277212cc4fec082c68a5e1c9f6e373eee716fec2fed47"
540+
SRC_URI[opusic-sys-0.7.3.sha256sum] = "2804e694ef0de3b4cbb254de565053b7cb48d3398df7fd60c6c62bed40c5372a"
537541
SRC_URI[openssl-probe-0.2.1.sha256sum] = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
538542
SRC_URI[p256-0.13.2.sha256sum] = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
539543
SRC_URI[p384-0.13.1.sha256sum] = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"

meta-secluso-os/recipes-secluso-camera-hub/secluso-camera-hub/secluso-camera-hub_1.0.2.bb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b769fddc23425484f6d001e49426c2ee"
1515

1616
# This is our own repository (set to an immutable commit)
1717
SRC_URI = "git://github.com/secluso/core.git;nobranch=1;protocol=https"
18-
SRCREV = "7bcbb4e4785fddab7f309b9535b29b98d54136fc"
18+
SRCREV = "be2d83bb2a1731178e0a43d67a960515f20297c5"
1919

2020
# Cargo fingerprints local path crates using their absolute source path
2121
# Thus, we copy the workspace to a canonical location before compiling.
@@ -38,6 +38,12 @@ RUSTFLAGS += " --remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${PV}"
3838
RUSTFLAGS += " --remap-path-prefix=${S}=/usr/src/debug/${PN}/${PV}/sources"
3939
RUSTFLAGS += " --remap-path-prefix=${CARGO_HOME}=cargo_home"
4040

41+
# opusic-sys compiles bundled C sources via a cargo build script.
42+
# Rust path remaps alone are thus not enough to rewrite __FILE__ strings that would embed TMPDIR into the binary.
43+
CFLAGS += " -ffile-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}"
44+
CFLAGS += " -ffile-prefix-map=${S}=/usr/src/debug/${PN}/${PV}/sources"
45+
CFLAGS += " -ffile-prefix-map=${CARGO_HOME}=cargo_home"
46+
4147
# https://wiki.koansoftware.com/index.php/Add_a_systemd_service_file_into_a_Yocto_image
4248
SYSTEMD_AUTO_ENABLE = "enable"
4349
SYSTEMD_SERVICE:${PN} = "secluso_camera_hub.service"

0 commit comments

Comments
 (0)