mirror of
https://github.com/shenmintao/aic8800d80.git
synced 2026-09-26 17:44:16 +00:00
fix: improve dependency installation diagnostics
Install mode-switch dependencies, support a69c:572f, avoid redundant generic headers when a usable kernel build tree exists, and discover DKMS logs dynamically. Addresses installer portions of #28, #55, #65, #66, and #68.
This commit is contained in:
Shen Mintao
@@ -6,3 +6,4 @@ KERNEL=="sd*", ATTRS{idVendor}=="a69c", ATTRS{idProduct}=="5726", SYMLINK+="ten
|
||||
KERNEL=="sd*", ATTRS{idVendor}=="a69c", ATTRS{idProduct}=="5727", SYMLINK+="tendaudiskv4", RUN+="/usr/bin/eject /dev/%k"
|
||||
KERNEL=="sd*", ATTRS{idVendor}=="a69c", ATTRS{idProduct}=="572a", SYMLINK+="tendaudiskv5", RUN+="/usr/bin/eject /dev/%k"
|
||||
KERNEL=="sd*", ATTRS{idVendor}=="a69c", ATTRS{idProduct}=="572c", SYMLINK+="cudydiskv2", RUN+="/usr/bin/eject /dev/%k"
|
||||
KERNEL=="sd*", ATTRS{idVendor}=="a69c", ATTRS{idProduct}=="572f", SYMLINK+="aicudisk572f", RUN+="/usr/bin/eject /dev/%k"
|
||||
|
||||
+79
-19
@@ -17,6 +17,29 @@ YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
NC='\033[0m'
|
||||
|
||||
DRV_NAME="aic8800"
|
||||
DRV_VERSION="1.0.0"
|
||||
INSTALL_LOG="/tmp/aic8800d80_install.log"
|
||||
|
||||
read_dkms_conf_value() {
|
||||
local key="$1"
|
||||
local file="$2"
|
||||
|
||||
grep -E "^[[:space:]]*${key}[[:space:]]*=" "$file" 2>/dev/null \
|
||||
| head -1 \
|
||||
| cut -d= -f2- \
|
||||
| tr -d "\"'[:space:]"
|
||||
}
|
||||
|
||||
if [ -f "./dkms.conf" ]; then
|
||||
detected_name="$(read_dkms_conf_value PACKAGE_NAME ./dkms.conf)"
|
||||
detected_version="$(read_dkms_conf_value PACKAGE_VERSION ./dkms.conf)"
|
||||
[ -n "$detected_name" ] && DRV_NAME="$detected_name"
|
||||
[ -n "$detected_version" ] && DRV_VERSION="$detected_version"
|
||||
fi
|
||||
|
||||
mapfile -t DKMS_SOURCE_DIRS < <(find /usr/src -maxdepth 1 -type d -name "${DRV_NAME}-*" -print 2>/dev/null | sort)
|
||||
|
||||
print_section() {
|
||||
echo ""
|
||||
echo -e "${BLUE}━━━ $1 ━━━${NC}"
|
||||
@@ -58,46 +81,73 @@ fi
|
||||
|
||||
print_section "2. Checking DKMS directory"
|
||||
|
||||
if [ -d "/usr/src/aic8800-1.0.0" ]; then
|
||||
echo -e "${GREEN}✓${NC} /usr/src/aic8800-1.0.0 directory exists"
|
||||
echo "Detected package: ${DRV_NAME}/${DRV_VERSION}"
|
||||
if [ "${#DKMS_SOURCE_DIRS[@]}" -gt 0 ]; then
|
||||
for source_dir in "${DKMS_SOURCE_DIRS[@]}"; do
|
||||
echo -e "${GREEN}✓${NC} $source_dir directory exists"
|
||||
echo ""
|
||||
echo "Content:"
|
||||
ls -la /usr/src/aic8800-1.0.0/
|
||||
ls -la "$source_dir/"
|
||||
echo ""
|
||||
|
||||
echo "Checking drivers/aic8800 inside DKMS:"
|
||||
if [ -d "/usr/src/aic8800-1.0.0/drivers/aic8800" ]; then
|
||||
if [ -d "$source_dir/drivers/aic8800" ]; then
|
||||
echo -e "${GREEN}✓${NC} drivers/aic8800 copied to DKMS"
|
||||
ls -la /usr/src/aic8800-1.0.0/drivers/aic8800/
|
||||
ls -la "$source_dir/drivers/aic8800/"
|
||||
else
|
||||
echo -e "${RED}✗${NC} drivers/aic8800 NOT copied correctly!"
|
||||
fi
|
||||
echo ""
|
||||
done
|
||||
else
|
||||
echo -e "${RED}✗${NC} /usr/src/aic8800-1.0.0 directory NOT FOUND"
|
||||
echo -e "${RED}✗${NC} No /usr/src/${DRV_NAME}-* directory found"
|
||||
fi
|
||||
|
||||
print_section "3. Checking DKMS build logs"
|
||||
|
||||
if [ -f "/var/lib/dkms/aic8800/1.0.0/build/make.log" ]; then
|
||||
echo -e "${GREEN}✓${NC} Build log found"
|
||||
mapfile -t BUILD_LOGS < <(find "/var/lib/dkms/${DRV_NAME}" -type f -name make.log -print 2>/dev/null | sort)
|
||||
|
||||
if [ "${#BUILD_LOGS[@]}" -gt 0 ]; then
|
||||
for build_log in "${BUILD_LOGS[@]}"; do
|
||||
echo -e "${GREEN}✓${NC} Build log found: $build_log"
|
||||
echo ""
|
||||
echo "Last 50 lines of make.log:"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
tail -50 /var/lib/dkms/aic8800/1.0.0/build/make.log
|
||||
tail -50 "$build_log"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
echo ""
|
||||
done
|
||||
else
|
||||
echo -e "${RED}✗${NC} No make.log found under /var/lib/dkms/${DRV_NAME}/"
|
||||
echo "The module may not have reached the build step yet, or this DKMS version stores logs elsewhere."
|
||||
fi
|
||||
|
||||
if [ -f "$INSTALL_LOG" ]; then
|
||||
echo ""
|
||||
echo -e "${GREEN}✓${NC} Installer log found: $INSTALL_LOG"
|
||||
echo "Last 50 lines of installer log:"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
tail -50 "$INSTALL_LOG"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
else
|
||||
echo -e "${RED}✗${NC} Build log not found in /var/lib/dkms/aic8800/1.0.0/build/make.log"
|
||||
echo -e "${YELLOW}!${NC} Installer log not found: $INSTALL_LOG"
|
||||
fi
|
||||
|
||||
print_section "4. Checking dkms.conf"
|
||||
|
||||
if [ -f "/usr/src/aic8800-1.0.0/dkms.conf" ]; then
|
||||
echo -e "${GREEN}✓${NC} dkms.conf found"
|
||||
if [ "${#DKMS_SOURCE_DIRS[@]}" -gt 0 ]; then
|
||||
for source_dir in "${DKMS_SOURCE_DIRS[@]}"; do
|
||||
if [ -f "$source_dir/dkms.conf" ]; then
|
||||
echo -e "${GREEN}✓${NC} dkms.conf found: $source_dir/dkms.conf"
|
||||
echo ""
|
||||
echo "dkms.conf content:"
|
||||
cat /usr/src/aic8800-1.0.0/dkms.conf
|
||||
cat "$source_dir/dkms.conf"
|
||||
echo ""
|
||||
else
|
||||
echo -e "${RED}✗${NC} dkms.conf NOT FOUND in $source_dir"
|
||||
fi
|
||||
done
|
||||
else
|
||||
echo -e "${RED}✗${NC} dkms.conf NOT FOUND!"
|
||||
echo -e "${RED}✗${NC} No DKMS source directory available to inspect"
|
||||
fi
|
||||
|
||||
if [ -f "./dkms.conf" ]; then
|
||||
@@ -120,13 +170,23 @@ print_section "6. System information"
|
||||
echo "Kernel: $(uname -r)"
|
||||
echo "Architecture: $(uname -m)"
|
||||
echo ""
|
||||
echo "GCC version:"
|
||||
gcc --version | head -1
|
||||
echo "Compiler version:"
|
||||
if command -v gcc >/dev/null 2>&1; then
|
||||
gcc --version | head -1
|
||||
elif command -v clang >/dev/null 2>&1; then
|
||||
clang --version | head -1
|
||||
else
|
||||
echo "No gcc or clang found"
|
||||
fi
|
||||
echo ""
|
||||
echo "Installed kernel headers:"
|
||||
ls -d /lib/modules/$(uname -r)/build 2>/dev/null && echo "✓ Headers found" || echo "✗ Headers NOT found"
|
||||
ls -d "/lib/modules/$(uname -r)/build" 2>/dev/null && echo "✓ Headers found" || echo "✗ Headers NOT found"
|
||||
|
||||
print_section "7. DKMS status"
|
||||
|
||||
echo "DKMS modules registered:"
|
||||
dkms status
|
||||
if command -v dkms >/dev/null 2>&1; then
|
||||
dkms status
|
||||
else
|
||||
echo -e "${RED}✗${NC} dkms command not found"
|
||||
fi
|
||||
|
||||
+70
-22
@@ -70,13 +70,29 @@ print_step() {
|
||||
log_message "STEP" "$1"
|
||||
}
|
||||
|
||||
run_logged() {
|
||||
local description="$1"
|
||||
shift
|
||||
local command_status=0
|
||||
|
||||
"$@" 2>&1 | tee -a "$LOG_FILE"
|
||||
command_status="${PIPESTATUS[0]}"
|
||||
if [ "$command_status" -ne 0 ]; then
|
||||
print_error "$description failed (exit code $command_status)."
|
||||
fi
|
||||
|
||||
return "$command_status"
|
||||
}
|
||||
|
||||
#############################################################################
|
||||
# Error Handling
|
||||
#############################################################################
|
||||
|
||||
cleanup_on_error() {
|
||||
print_error "Installation failed. Check $LOG_FILE for details."
|
||||
exit 1
|
||||
local exit_code=$?
|
||||
trap - ERR
|
||||
print_error "Installation failed (exit code $exit_code). Check $LOG_FILE for details."
|
||||
exit "$exit_code"
|
||||
}
|
||||
|
||||
trap cleanup_on_error ERR
|
||||
@@ -180,6 +196,8 @@ detect_package_manager() {
|
||||
echo " - build-essential / base-devel / development tools"
|
||||
echo " - linux-headers for your kernel version"
|
||||
echo " - mokutil (optional, for Secure Boot detection)"
|
||||
echo " - eject"
|
||||
echo " - usb_modeswitch / usb-modeswitch"
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
@@ -196,48 +214,78 @@ is_volumio() {
|
||||
return 1
|
||||
}
|
||||
|
||||
kernel_build_tree_available() {
|
||||
local kernel_build_dir="/lib/modules/$(uname -r)/build"
|
||||
|
||||
[ -d "$kernel_build_dir" ] && [ -r "$kernel_build_dir/Makefile" ]
|
||||
}
|
||||
|
||||
install_dependencies() {
|
||||
local pkg_manager="$1"
|
||||
local install_kernel_headers=true
|
||||
|
||||
print_step "Installing dependencies..."
|
||||
|
||||
if kernel_build_tree_available; then
|
||||
install_kernel_headers=false
|
||||
print_info "Kernel build tree already exists; skipping generic kernel headers package."
|
||||
elif is_volumio; then
|
||||
install_kernel_headers=false
|
||||
print_info "Volumio detected; skipping generic kernel headers package."
|
||||
fi
|
||||
|
||||
case "$pkg_manager" in
|
||||
apt)
|
||||
print_info "Updating package database..."
|
||||
apt-get update -qq >> "$LOG_FILE" 2>&1
|
||||
run_logged "Package database update" apt-get update
|
||||
|
||||
if is_volumio; then
|
||||
print_info "Volumio detected; skipping generic linux-headers package."
|
||||
print_info "Installing: dkms, build-essential, mokutil..."
|
||||
apt-get install -y dkms build-essential mokutil >> "$LOG_FILE" 2>&1
|
||||
else
|
||||
print_info "Installing: dkms, build-essential, linux-headers, mokutil..."
|
||||
apt-get install -y dkms build-essential linux-headers-$(uname -r) mokutil >> "$LOG_FILE" 2>&1
|
||||
local -a packages=(dkms build-essential mokutil eject usb-modeswitch)
|
||||
if [ "$install_kernel_headers" = true ]; then
|
||||
packages+=("linux-headers-$(uname -r)")
|
||||
fi
|
||||
print_info "Installing: ${packages[*]}..."
|
||||
run_logged "Dependency installation" env DEBIAN_FRONTEND=noninteractive apt-get install -y "${packages[@]}"
|
||||
;;
|
||||
|
||||
dnf)
|
||||
print_info "Installing: dkms, gcc, make, kernel-devel, kernel-headers, mokutil..."
|
||||
dnf install -y dkms make gcc kernel-devel kernel-headers mokutil >> "$LOG_FILE" 2>&1
|
||||
local -a packages=(dkms make gcc mokutil util-linux usb_modeswitch)
|
||||
if [ "$install_kernel_headers" = true ]; then
|
||||
packages+=(kernel-devel kernel-headers)
|
||||
fi
|
||||
print_info "Installing: ${packages[*]}..."
|
||||
run_logged "Dependency installation" dnf install -y "${packages[@]}"
|
||||
;;
|
||||
|
||||
yum)
|
||||
print_info "Installing: dkms, gcc, make, kernel-devel, mokutil..."
|
||||
yum install -y epel-release >> "$LOG_FILE" 2>&1
|
||||
yum install -y dkms make gcc kernel-devel mokutil >> "$LOG_FILE" 2>&1
|
||||
local -a packages=(dkms make gcc mokutil util-linux usb_modeswitch)
|
||||
if [ "$install_kernel_headers" = true ]; then
|
||||
packages+=(kernel-devel)
|
||||
fi
|
||||
print_info "Enabling EPEL repository..."
|
||||
run_logged "EPEL repository installation" yum install -y epel-release
|
||||
print_info "Installing: ${packages[*]}..."
|
||||
run_logged "Dependency installation" yum install -y "${packages[@]}"
|
||||
;;
|
||||
|
||||
pacman)
|
||||
print_info "Syncing package database..."
|
||||
pacman -Sy --noconfirm >> "$LOG_FILE" 2>&1
|
||||
run_logged "Package database sync" pacman -Sy --noconfirm
|
||||
|
||||
print_info "Installing: dkms, base-devel, linux-headers, mokutil..."
|
||||
pacman -S --noconfirm dkms base-devel linux-headers mokutil >> "$LOG_FILE" 2>&1
|
||||
local -a packages=(dkms base-devel mokutil util-linux usb_modeswitch)
|
||||
if [ "$install_kernel_headers" = true ]; then
|
||||
packages+=(linux-headers)
|
||||
fi
|
||||
print_info "Installing: ${packages[*]}..."
|
||||
run_logged "Dependency installation" pacman -S --needed --noconfirm "${packages[@]}"
|
||||
;;
|
||||
|
||||
zypper)
|
||||
print_info "Installing: dkms, gcc, make, kernel-devel, mokutil..."
|
||||
zypper install -y dkms make gcc kernel-devel mokutil >> "$LOG_FILE" 2>&1
|
||||
local -a packages=(dkms make gcc mokutil util-linux usb_modeswitch)
|
||||
if [ "$install_kernel_headers" = true ]; then
|
||||
packages+=(kernel-devel)
|
||||
fi
|
||||
print_info "Installing: ${packages[*]}..."
|
||||
run_logged "Dependency installation" zypper --non-interactive install "${packages[@]}"
|
||||
;;
|
||||
|
||||
*)
|
||||
@@ -252,11 +300,11 @@ install_dependencies() {
|
||||
check_kernel_build_tree() {
|
||||
local kernel_build_dir="/lib/modules/$(uname -r)/build"
|
||||
|
||||
if [ -e "$kernel_build_dir" ]; then
|
||||
if kernel_build_tree_available; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
print_error "Kernel build directory not found: $kernel_build_dir"
|
||||
print_error "Kernel build directory is missing or incomplete: $kernel_build_dir"
|
||||
echo ""
|
||||
if is_volumio; then
|
||||
echo "Volumio does not use the normal linux-headers package flow."
|
||||
|
||||
Reference in New Issue
Block a user