12.6.5

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

.gitignore

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

.workflow/Debian-Build-amd64.yml

@@ -0,0 +1,59 @@
+version: '1.0'
+name: Debian-Build-amd64
+displayName: Debian-Build-amd64
+triggers:
+  trigger: manual
+  push:
+    tags:
+      prefix:
+        - ''
+stages:
+  - name: stage-d1472d18
+    displayName: Build DEB
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: Build Debian amd64
+        certificate: ''
+        image: docker.jianmuhub.com/library/debian:bookworm
+        command:
+          - export DEBIAN_FRONTEND=noninteractive
+          - apt update
+          - apt install ca-certificates -y
+          - echo 'deb [trusted=yes] http://mirrors.sdu.edu.cn/debian bookworm main contrib non-free non-free-firmware' > /etc/apt/sources.list
+          - rm -rfv /etc/apt/sources.list.d/*
+          - apt update
+          - apt build-dep . -y
+          - dpkg-buildpackage -b -us -uc
+          - cd ..
+          - ''
+          - mkdir target
+          - for f in $(find . -type f -name "*.deb")
+          - 'do '
+          - mv -v $f target
+          - done
+          - ls -all
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - ../target/
+        notify: []
+        strategy:
+          retry: '0'
+  - name: stage-41e41b9f
+    displayName: push
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        dependArtifact: BUILD_ARTIFACT
+        artifactName: output
+        notify: []
+        strategy:
+          retry: '0'

README.md

@@ -16,36 +16,26 @@ With the help of bubblewrap, a super tiny container solution, you can run a `Deb
 Please use `git clone --recurse-submodules` to obtain the env
 
 
-## Install Guide
+## Install Guide（Debian/Fedora/Arch)
+
+Share Link：https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
+
+Ubuntu 18.04 Need install https://packages.debian.org/buster/bubblewrap
+
+Arch: `yay -S amber-ce-bookworm`
 
 
-### Quick Install (Need to install Spark Store first)
-
-[spk://store/tools/cn.flamescion.bookworm-compatibility-mode/](https://spk-resolv.spark-app.store/?spk=spk://store/tools/cn.flamescion.bookworm-compatibility-mode/)
-
-### Manual Install（Debian/Fedora/Arch)
-
-https://pan.huang1111.cn/s/jR1GdUy
+---
 
 
-### Amber-CE x86
-
-Use LAT to run a x86 bookworm container. Can install x86 debs and run x86 apps 
-
-https://pan.huang1111.cn/s/P63D6Cm
-
-## Build Guide
+## Build From.Source
 
 ### Debian
 
-Build the container first then build the package. Container at `src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files`
-Here are the details:
-1. Install dependencies: sudo apt-get install arch-test debootstrap libnss-mymachines systemd-container
-2. Enter the terminal at `src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files` and execute `./build-container.sh amd64`.[for amd,other arch please change]
-3. Wait for the container to complete.
-4.Get in to `amber-ce-bookworm` dir,run`fakeroot dpkg-deb -b src .`
-5.Wating for complete.
-
+```
+apt build-dep .
+dpkg-buildpackage -us -uc -b 
+```
 
 ### Fedora
 

README.zh.md

@@ -1,4 +1,4 @@
-# 书虫兼容模式
+# ACE Debian Bookworm
 
 # [English](README.md)
 
@@ -11,37 +11,26 @@
 
 请使用 `git clone --recurse-submodules` 来获取
 
-## 安装指南
-
-### 快捷安装 (需要安装星火应用商店)
-
-[spk://store/tools/cn.flamescion.bookworm-compatibility-mode/](https://spk-resolv.spark-app.store/?spk=spk://store/tools/cn.flamescion.bookworm-compatibility-mode/)
-
-### 手动安装（Debian/Fedora/Arch)
-
-https://pan.huang1111.cn/s/jR1GdUy
+## 安装指南 （Debian/Fedora/Arch)
 
 
-### Amber-CE x86
+分享链接：https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
 
-利用 LAT 运行的x86容器，可安装和运行x86的deb  
+Ubuntu 18.04 需要安装 https://packages.debian.org/buster/bubblewrap 
 
-https://pan.huang1111.cn/s/P63D6Cm
+Arch：`yay -S amber-ce-bookworm`
+
+---
 
 
-## 构建指南
+## 从源代码构建指南
 
 ### Debian
 
-先构建容器再打包，容器位置在`src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files`
-
-下面是详细步骤：
-
-1. 安装依赖：sudo apt-get install arch-test debootstrap libnss-mymachines systemd-container
-2. 在`src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files`位置进入终端，执行`./build-container.sh amd64`[amd架构，其他架构同理]`
-3. 等待容器打包完成
-4. 进入`amber-ce-bookworm`目录，执行`fakeroot dpkg-deb -b src .`
-5. 等待打包完成
+```
+apt build-dep .
+dpkg-buildpackage -us -uc -b 
+```
 
 ### Fedora
 

debian/changelog

@@ -1,6 +1,20 @@
-amber-ce-bookworm (12.4.14-2) 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
 
-  * fix: always pop up upgradable 
-  * fix: only request main repo
+
+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
+  * fix: sudo function error: Need sudo sudo to really sudo
+  * fix: ACE Host Integration fail
+  * 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,18 +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/files/bookworm-env ];then
+PACKAGE_NAME=amber-ce-bookworm # 为了后面正确清理
+if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ];then
 
-mv /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/ace-env
-ln -sfv /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/ace-env /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env
+unlink /opt/apps/amber-ce-bookworm 
+mv -v /opt/apps/cn.flamescion.bookworm-compatibility-mode/ /opt/apps/amber-ce-bookworm/
 
 
 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

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

@@ -2,6 +2,7 @@
 PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
 
 if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
+PACKAGE_NAME=amber-ce-bookworm # 为了后面正确清理
 systemctl stop ace-bookworm-auto-upgrade
 systemctl disable ace-bookworm-auto-upgrade
 fi

debian/control

@@ -2,7 +2,7 @@ Source: amber-ce-bookworm
 Section: misc
 Priority: optional
 Maintainer: shenmo <shenmo@spark-app.store>
-Build-Depends: debhelper-compat (= 13),debootstrap,systemd-container
+Build-Depends: debhelper-compat (= 13),debootstrap,systemd-container,sudo
 Standards-Version: 4.5.1
 Homepage: https://gitee.com/amber-ce/amber-ce-bookworm/
 Rules-Requires-Root: binary-targets

debian/rules

@@ -6,5 +6,8 @@
 	dh $@
 	
 override_dh_auto_configure:
-	cd src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files && bash build-container.sh $(shell uname -m)
+	cd src/opt/apps/amber-ce-bookworm/files && bash build-container.sh $(shell uname -m)
 
+override_dh_dwz:
+
+override_dh_strip:

src/opt/apps/amber-ce-bookworm

@@ -1 +0,0 @@
-./cn.flamescion.bookworm-compatibility-mode/

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

@@ -5,7 +5,7 @@ parent_dir=`dirname $curdir`
 pparent_dir=`dirname $parent_dir`
 ppparent_dir=`dirname $pparent_dir`
 PKGNAME=`basename $ppparent_dir`
-export PACKAGE_NAME=$PKGNAME
+export ACE_PACKAGE_NAME=$PKGNAME
 chrootEnvPath=/opt/apps/$PKGNAME/files/ace-env
 
 if [ ! -e $chrootEnvPath/finish.flag ];then
@@ -107,8 +107,7 @@ BIND_DIRS=(
     "--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"

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

@@ -5,7 +5,7 @@ parent_dir=`dirname $curdir`
 pparent_dir=`dirname $parent_dir`
 ppparent_dir=`dirname $pparent_dir`
 PKGNAME=`basename $ppparent_dir`
-export PACKAGE_NAME=$PKGNAME
+export ACE_PACKAGE_NAME=$PKGNAME
 chrootEnvPath=/opt/apps/$PKGNAME/files/ace-env
 
 if [ ! -e $chrootEnvPath/finish.flag ];then
@@ -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/build-container.sh

@@ -15,14 +15,14 @@ if [ "$1" = "amd64" ] || [ "$1" = "x86_64" ];then
 ARCH="amd64"
 ARCH_ANOTHERWAY="x64"
 cd "`dirname $0`"
-sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1-mesa,libgl1-mesa-glx,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH}  bookworm  ./ace-env https://mirrors.ustc.edu.cn/debian/ 
+sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH}  bookworm  ./ace-env https://mirrors.ustc.edu.cn/debian/ 
 
-elif [ "$1" = "arm64" ] || [ "$1" = "arm" ];then
+elif [ "$1" = "arm64" ] || [ "$1" = "arm" ]|| [ "$1" = "aarch64" ];then
 ARCH="arm64"
 ARCH_ANOTHERWAY="arm64"
 
 cd "`dirname $0`"
-sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1-mesa,libgl1-mesa-glx,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH} bookworm ./ace-env https://mirrors.ustc.edu.cn/debian/ 
+sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH} bookworm ./ace-env https://mirrors.ustc.edu.cn/debian/ 
 elif [ "$1" = "loong" ] || [ "$1" = "loong64" ];then
 ARCH="loong64"
 ARCH_ANOTHERWAY="loong64"

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

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

@@ -1,2 +1,2 @@
 #!/bin/bash
-host-spawn /opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap $@
+host-spawn /opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap "$@"

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

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

src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/container-init/init.sh

@@ -127,6 +127,7 @@ apt install --reinstall /flamescion-container-tools/ace-host-integration.deb
 cd /flamescion-container-tools/data-dir/
 ln -sfv ../../usr/share/applications/ .
 ln -sfv ../../usr/share/icons/ .
-ln -svf ../../usr/share/mime .
+#ln -svf ../../usr/share/mime .
+rm -vf ./mime
 update-desktop-database /usr/share/applications || true
 update-mime-database /usr/share/mime || true

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/sudo

@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ "$UID" = "0" ];then
-/usr/bin/sudo $@
-else
-host-spawn sudo bookworm-run $@
-fi

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

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