Merge pull request #225 from KillingJacky/master

remove the default kernel downgrade
This commit is contained in:
Jack Shao 2020-04-27 15:26:35 +08:00 committed by GitHub
commit 6c6dfaa7d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions

View file

@ -12,6 +12,7 @@ cd seeed-voicecard
sudo ./install.sh
sudo reboot
```
It may probably happen that the driver won't compile with the latest kernel when raspbian rolls out new patches to the kernel. If so, please try `sudo ./install.sh --compat-kernel` which uses an older kernel but ensures that the driver can work.
## ReSpeaker Mic Hat

View file

@ -1,6 +1,7 @@
#!/bin/bash
FORCE_KERNEL="1.20190925+1-1"
#FORCE_KERNEL="1.20190925+1-1"
FORCE_KERNEL="1.20200212-1"
if [[ $EUID -ne 0 ]]; then
echo "This script must be run as root (use sudo)" 1>&2
@ -105,10 +106,18 @@ function download_install_debpkg() {
return $r
}
option_pattern="compat-kernel"
if [[ $1 =~ ${option_pattern} ]]; then
echo "will compile with a compatible kernel..."
else
FORCE_KERNEL=""
echo "will compile with the latest kernel..."
fi
function install_kernel() {
local _url _prefix
# Instead of retriving the lastest kernel & headers
# Instead of retriving the lastest kernel & headers
[ "X$FORCE_KERNEL" == "X" ] && {
apt-get -y --force-yes install raspberrypi-kernel-headers raspberrypi-kernel
} || {
@ -167,6 +176,10 @@ function install_module {
for _i in $kernels; do
dkms build -k $_i -m $mod -v $ver && {
dkms install --force -k $_i -m $mod -v $ver
} || {
echo "can not compile with this kernel, abort"
echo "please try compile with the option --compat-kernel"
exit 1
}
done

View file

@ -73,9 +73,9 @@ echo "remove dkms"
rm -rf /var/lib/dkms/seeed-voicecard || true
echo "remove kernel modules"
rm /lib/modules/${uname_r}/kernel/sound/soc/codecs/snd-soc-wm8960.ko || true
rm /lib/modules/${uname_r}/kernel/sound/soc/codecs/snd-soc-ac108.ko || true
rm /lib/modules/${uname_r}/kernel/sound/soc/bcm/snd-soc-seeed-voicecard.ko || true
rm /lib/modules/*/kernel/sound/soc/codecs/snd-soc-wm8960.ko || true
rm /lib/modules/*/kernel/sound/soc/codecs/snd-soc-ac108.ko || true
rm /lib/modules/*/kernel/sound/soc/bcm/snd-soc-seeed-voicecard.ko || true
echo "remove $CONFIG configuration"
for i in $RPI_HATS; do