update debian/changelog.

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

.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 ..
+          - ls -all
+          - mkdir target
+          - for f in $(find . -type f -name "*.deb")
+          - 'do '
+          - mv $f target
+          - done
+          - ''
+        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

@@ -27,6 +27,8 @@ Please use `git clone --recurse-submodules` to obtain the env
 
 https://pan.huang1111.cn/s/jR1GdUy
 
+Ubuntu 18.04 Need install https://packages.debian.org/buster/bubblewrap
+
 
 ### Amber-CE x86
 
@@ -34,6 +36,10 @@ Use LAT to run a x86 bookworm container. Can install x86 debs and run x86 apps
 
 https://pan.huang1111.cn/s/P63D6Cm
 
+
+---
+
+
 ## Build Guide
 
 ### Debian

README.zh.md

@@ -1,4 +1,4 @@
-# 书虫兼容模式
+# ACE Debian Bookworm
 
 # [English](README.md)
 
@@ -21,6 +21,8 @@
 
 https://pan.huang1111.cn/s/jR1GdUy
 
+Ubuntu 18.04 需要安装 https://packages.debian.org/buster/bubblewrap 
+
 
 ### Amber-CE x86
 
@@ -29,6 +31,9 @@ https://pan.huang1111.cn/s/jR1GdUy
 https://pan.huang1111.cn/s/P63D6Cm
 
 
+---
+
+
 ## 构建指南
 
 ### Debian

debian/changelog

@@ -1,6 +1,8 @@
-amber-ce-bookworm (12.4.14-2) UNRELEASED; urgency=low
+amber-ce-bookworm (12.4.14-4) UNRELEASED; urgency=low
 
-  * fix: always pop up upgradable 
+  * fix: Auto upgrade service always pop up upgradable notifier
-  * fix: only request main repo
+  * fix: /etc/apt/sources.list only request main repo
+  * fix: sudo function error: Need sudo sudo to really sudo
+  * fix: ACE Host Integration fail
 
  -- shenmo <shenmo@spark-app.store>  Wed, 25 Sep 2024 23:15:49 +0800

debian/rules

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

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/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

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/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

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/build-container.sh

@@ -17,7 +17,7 @@ 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/ 
 
-elif [ "$1" = "arm64" ] || [ "$1" = "arm" ];then
+elif [ "$1" = "arm64" ] || [ "$1" = "arm" ]|| [ "$1" = "aarch64" ];then
 ARCH="arm64"
 ARCH_ANOTHERWAY="arm64"
 

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration

@@ -63,7 +63,7 @@ local file=$1
     chmod +x $file
 }
 
-if [  "${IS_ACE_ENV}" != "" ];then
+if [  "${IS_ACE_ENV}" != "" ] || [[ -e /opt/ace-host-integration/ace-host-integration ]] && [[ -e /flamescion-container-tools ]];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/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/sudo

@@ -2,5 +2,5 @@
 if [ "$UID" = "0" ];then
 /usr/bin/sudo $@
 else
-host-spawn sudo bookworm-run $@
+host-spawn sudo bookworm-run sudo $@
 fi