diff --git a/buildroot-external/package/respeaker/S16respeaker_modules b/buildroot-external/package/respeaker/S16respeaker_modules deleted file mode 100755 index d659cfcd..00000000 --- a/buildroot-external/package/respeaker/S16respeaker_modules +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# Load seeed-voicecard modules.... -# - -modprobe snd-soc-seeed-voicecard -modprobe snd-soc-ac108 -modprobe snd-soc-wm8960 diff --git a/buildroot-external/package/respeaker/S60seeed_voicecard b/buildroot-external/package/respeaker/S60seeed_voicecard deleted file mode 100755 index 960228e4..00000000 --- a/buildroot-external/package/respeaker/S60seeed_voicecard +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# Configure seeed-voicecard.... -# - -echo "Starting seeed-voicecard..." -mount -t configfs none /sys/kernel/config -mkdir -p /boot -mount -t vfat /dev/mmcblk0p1 /boot -/usr/bin/seeed-voicecard -touch /var/lock/seeed-voicecard diff --git a/buildroot-external/package/respeaker/respeaker.conf b/buildroot-external/package/respeaker/respeaker.conf new file mode 100644 index 00000000..3096f833 --- /dev/null +++ b/buildroot-external/package/respeaker/respeaker.conf @@ -0,0 +1,3 @@ +snd-soc-seeed-voicecard +snd-soc-ac108 +snd-soc-wm8960 diff --git a/buildroot-external/package/respeaker/respeaker.hash b/buildroot-external/package/respeaker/respeaker.hash index c5e6ee43..73a544a1 100644 --- a/buildroot-external/package/respeaker/respeaker.hash +++ b/buildroot-external/package/respeaker/respeaker.hash @@ -1,2 +1,3 @@ # Locally computed sha256 9f38d832acbfc7f07a58f15222d2fdcc0a9215ede488ccafb5c89a3e8223883d respeaker-be0812c70be29b0666a89f22a9d403cfb4c48fca.tar.gz +sha256 b68fb60cc173dc18e15bfc8eff97b57c3ef3085f2738c463ca9fa52d13d13896 respeaker-6c6b9ab7deb607aa985048ea170428729afc07a9.tar.gz diff --git a/buildroot-external/package/respeaker/respeaker.mk b/buildroot-external/package/respeaker/respeaker.mk index 2bc936e7..d44cd0ef 100644 --- a/buildroot-external/package/respeaker/respeaker.mk +++ b/buildroot-external/package/respeaker/respeaker.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESPEAKER_VERSION = be0812c70be29b0666a89f22a9d403cfb4c48fca +RESPEAKER_VERSION = 6c6b9ab7deb607aa985048ea170428729afc07a9 RESPEAKER_SITE = $(call github,respeaker,seeed-voicecard,$(RESPEAKER_VERSION)) RESPEAKER_LICENSE = GNU General Public License v3.0 RESPEAKER_DEPENDENCIES = rpi-firmware rpi-userland dtc @@ -12,10 +12,14 @@ RESPEAKER_DEPENDENCIES = rpi-firmware rpi-userland dtc $(eval $(kernel-module)) define RESPEAKER_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/S16respeaker_modules \ - $(TARGET_DIR)/etc/init.d/S16respeaker_modules - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/S60seeed_voicecard \ - $(TARGET_DIR)/etc/init.d/S60seeed_voicecard + $(INSTALL) -D -m 644 $(@D)/seeed-voicecard.service \ + $(TARGET_DIR)/usr/lib/systemd/system/seeed-voicecard.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants + ln -fs ../../../../usr/lib/systemd/system/seeed-voicecard.service \ + $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/seeed-voicecard.service + + $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/respeaker.conf \ + $(TARGET_DIR)/etc/modules-load.d/respeaker.conf mkdir -p $(TARGET_DIR)/etc/voicecard rm $(@D)/dkms.conf @@ -26,6 +30,23 @@ define RESPEAKER_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/seeed-2mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/ $(INSTALL) -D -m 0644 $(@D)/seeed-4mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/ $(INSTALL) -D -m 0644 $(@D)/seeed-8mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/ + + mkdir -p $(TARGET_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/ + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_4mic/seeed-voicecard.conf \ + $(TARGET_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/seeed-voicecard-4mic.conf + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_6mic/seeed-voicecard.conf \ + $(TARGET_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/seeed-voicecard-8mic.conf + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/91-seeedvoicecard.rules \ + $(TARGET_DIR)/etc/udev/rules.d/91-seeedvoicecard.rules + + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_4mic/default.pa \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-4mic-default.pa + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_4mic/daemon.conf \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-4mic-daemon.conf + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_6mic/default.pa \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-8mic-default.pa + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_6mic/daemon.conf \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-8mic-daemon.conf endef $(eval $(generic-package))