12.6.5

Signed-off-by: shenmo <jifengshenmo@outlook.com>

.gitignore

@@ -1,2 +1,2 @@
-#*.deb
+*.deb
 src/opt/apps/amber-ce-bookworm/files/ace-env.tar.xz

debian/changelog

@@ -1,4 +1,12 @@
-amber-ce-bookworm (12.6.0) UNRELEASED; urgency=low
+amber-ce-bookworm (12.6.5) UNRELEASED; urgency=low
+  * 修复 Arch 下无法在容器中使用 Bwrap
+  * 修复 bwrap 下无法使用N卡加速
+  * 修复 无法启动自动更新
+  * 修复 绝对路径图标路径检查出错
+ -- shenmo <shenmo@spark-app.store>  Wed, 25 Sep 2024 23:15:49 +0800
+
+
+amber-ce-bookworm (12.6.2) UNRELEASED; urgency=low
   * fix: Can't pass args via bwrap
   * fix: Auto upgrade service always pop up upgradable notifier
   * fix: /etc/apt/sources.list only request main repo
@@ -7,5 +15,6 @@ amber-ce-bookworm (12.6.0) UNRELEASED; urgency=low
   * adjust: remove dpkg from building depends
   * 把默认目录改为 amber-ce-bookworm
   * 支持使用Nvidia驱动加速
+  * 修复 Root 下无法获取IS_ACE_ENV=1
 
  -- shenmo <shenmo@spark-app.store>  Wed, 25 Sep 2024 23:15:49 +0800

debian/cn.flamescion.bookworm-compatibility-mode.postinst

@@ -2,22 +2,24 @@
 export PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
 
 if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
-if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ] || [[ -f "/opt/apps/amber-ce-bookworm" ]];then
+PACKAGE_NAME=amber-ce-bookworm # 为了后面正确清理
+if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ];then
 
 unlink /opt/apps/amber-ce-bookworm 
 mv -v /opt/apps/cn.flamescion.bookworm-compatibility-mode/ /opt/apps/amber-ce-bookworm/
 
-ln -sv ./amber-ce-bookworm /opt/apps/cn.flamescion.bookworm-compatibility-mode
-
 
 fi
 fi
 
 
+
+
+
 /opt/apps/$PACKAGE_NAME/files/bin/ace-init
 
 
-if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
+if [ "${PACKAGE_NAME}" = "amber-ce-bookworm" ];then
 systemctl daemon-reload
 systemctl enable ace-bookworm-auto-upgrade
 systemctl start ace-bookworm-auto-upgrade

src/opt/apps/amber-ce-bookworm/files/bin/ace-init

@@ -114,3 +114,4 @@ sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ /
 bookworm-run update-locale LANG=$LANG
 chown -R root $chrootEnvPath
 chmod 777 -R $chrootEnvPath/usr/share/icons
+amber-ce-bookworm-configure-nvidia || true

src/opt/apps/amber-ce-bookworm/files/bin/amber-ce-bookworm-configure-nvidia

@@ -0,0 +1,67 @@
+#!/bin/bash
+log.warn() { echo -e "[\e[33mWARN\e[0m]:  \e[1m$*\e[0m"; }
+log.error()  { echo -e "[\e[31mERROR\e[0m]: \e[1m$*\e[0m"; }
+log.info() { echo -e "[\e[96mINFO\e[0m]:  \e[1m$*\e[0m"; }
+log.debug()  { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; }
+
+if [ "$UID" != "0" ];then
+log.error "需要以root权限运行 Need to be run as root."
+exit 1
+fi
+
+# 1\. 获取宿主机 NVIDIA 驱动版本
+nvidia_version=$(cat /sys/module/nvidia/version 2>/dev/null)
+if [ -z "$nvidia_version" ]; then
+    log.error "无法获取 NVIDIA 驱动版本 Can not determine NVIDIA Driver version"
+    exit 1
+fi
+
+# 2\. 目标目录准备
+ACE_DIR="/opt/apps/amber-ce-bookworm/files/ace-env"
+if [[ ! -e "${ACE_DIR}" ]];then
+log.error "未检测到 ACE Bookworm 安装，请安装后再试 ACE Bookworm is not detected. Please try again after installation"
+spark-store spk://store/tools/cn.flamescion.bookworm-compatibility-mode &
+log.info "请按回车关闭... Press Enter to close..."
+read
+exit 1
+fi
+mkdir -p "$ACE_DIR/usr/lib" "$ACE_DIR/usr/lib32"
+
+log.info "正在链接 NVIDIA 驱动库 Linking NVIDIA Driver Libs"
+
+# 3\. 收集库文件路径
+lib_list=$(ldconfig -p | grep -Ei "nvidia|libcuda" | cut -d'>' -f2)
+
+# 4\. 复制库文件
+copied=0
+for lib in $lib_list; do
+    resolved=$(readlink -f "$lib") # 解析符号链接
+    if file "$resolved" | grep -q "32-bit"; then
+        ln -sf "/host/$resolved" "$ACE_DIR/usr/lib32/$(basename $lib)"
+    else
+        ln -sf "/host/$resolved" "$ACE_DIR/usr/lib/$(basename $lib)"
+        copied=1
+    fi
+done
+
+# 5\. 复制辅助文件
+additional_files=(
+    /usr/share/vulkan/icd.d/nvidia_icd.json
+    /usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json
+)
+for file in "${additional_files[@]}"; do
+    if [ -f "$file" ]; then
+        file=$(readlink -f "$file")
+        dir=$(dirname "$file")
+        mkdir -p "$ACE_DIR/$dir"
+        ln -sf "/host/$file" "$ACE_DIR/$dir"
+    fi
+done
+
+# 6\. 标记版本
+if [ $copied -eq 1 ]; then
+    echo "$nvidia_version" > "$ACE_DIR/current_version"
+    log.info "NVIDIA 驱动库已成功链接 Nvidia Driver Libs are successfully linked. "
+else
+    log.error "未找到有效 NVIDIA 库文件 No valid NVIDIA Driver Libs found."
+fi

src/opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap

@@ -104,10 +104,10 @@ ENV_VARS=(
 BIND_DIRS=(
     "--dev-bind $chrootEnvPath/ /"
     "--dev-bind-try /media /media"
+    "--dev-bind-try /mnt /mnt"
     "--dev-bind-try /tmp /tmp"
     "--dev-bind-try /data /data"
-    "--dev /dev"
-    "--dev-bind-try /dev/dri /dev/dri"
+    "--dev-bind-try /dev /dev"
     "--proc /proc"
     "--dev-bind /sys /sys"
     "--dev-bind /run /run"
@@ -116,10 +116,8 @@ BIND_DIRS=(
     "--ro-bind-try /usr/share/themes /usr/local/share/themes"
     "--ro-bind-try /usr/share/icons /usr/local/share/icons"
     "--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
-    "--ro-bind-try $(realpath /etc/localtime) /etc/localtime"
     "--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
     "--dev-bind-try /home /home"
-
 )
 EXTRA_ARGS=(
     "--hostname Amber-CE-Bookworm"

src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/etc/environment.d/90is_ace_env.conf

@@ -0,0 +1 @@
+IS_ACE_ENV=1

src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration

@@ -54,7 +54,7 @@ local file=$1
             	icon_line=$(grep "^Icon=" "$file")
             	if [[ "$icon_line" == "Icon=/"* ]]; then
     			# 如果Icon=后面接的是/，则添加前缀
-    			sed -i 's|^Icon=/|Icon=/opt/apps/amber-ce-bookworm/files/bookworm-env/|' "$file"
+    			sed -i 's|^Icon=/|Icon=/opt/apps/amber-ce-bookworm/files/ace-env/|' "$file"
     		fi
 		
     	fi
@@ -63,7 +63,7 @@ local file=$1
     chmod +x $file
 }
 
-if [  "${IS_ACE_ENV}" != "" ] || [[ -e /opt/ace-host-integration/ace-host-integration ]] && [[ -e /flamescion-container-tools ]];then
+if [  "${IS_ACE_ENV}" != "" ] ;then
 	if [ -e /opt/apps/ ];then
 	for app_dir in $(ls /opt/apps/); do
 		for file in /opt/apps/$app_dir/entries/applications/*.desktop;do

src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/sudo

@@ -2,5 +2,5 @@
 if [ "$UID" = "0" ];then
 /usr/bin/sudo $@
 else
-host-spawn sudo bookworm-run sudo $@
+host-spawn sudo bookworm-run sudo env IS_ACE_ENV="1" PATH="/flamescion-container-tools/bin-override:$PATH" "$@"
 fi

src/opt/apps/cn.flamescion.bookworm-compatibility-mode

@@ -1 +0,0 @@
-./amber-ce-bookworm/

src/usr/bin/amber-ce-bookworm-configure-nvidia

@@ -0,0 +1 @@
+../../opt/apps/amber-ce-bookworm/files/bin/amber-ce-bookworm-configure-nvidia