Compare commits

...

5 Commits

Author SHA1 Message Date
fa745aed12 12.5.16 2025-02-06 14:04:28 +08:00
5a7c2b41d4 update: 重新使用dpkg构建 ACE Host Integration 2025-02-06 14:02:54 +08:00
ded8320249 修改文案 2025-01-22 20:20:19 +08:00
1db8d4b98c adjust: 默认目录改成 amber-ce-bookworm 2025-01-17 21:13:16 +08:00
1ad4a2bfd4 update ignore 2025-01-17 21:12:43 +08:00
44 changed files with 19 additions and 33 deletions

2
.gitignore vendored
View File

@@ -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

View File

@@ -16,14 +16,7 @@ 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
### 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 InstallDebian/Fedora/Arch)
## Install GuideDebian/Fedora/Arch)
Share Linkhttps://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
@@ -32,17 +25,10 @@ Ubuntu 18.04 Need install https://packages.debian.org/buster/bubblewrap
Arch: `yay -S amber-ce-bookworm`
### 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

View File

@@ -11,13 +11,7 @@
请使用 `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)
## 安装指南 Debian/Fedora/Arch)
分享链接https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
@@ -29,7 +23,7 @@ Arch`yay -S amber-ce-bookworm`
---
## 构建指南
## 从源代码构建指南
### Debian

3
debian/changelog vendored
View File

@@ -1,9 +1,10 @@
amber-ce-bookworm (12.4.15-1) UNRELEASED; urgency=low
amber-ce-bookworm (12.5.16) 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
-- shenmo <shenmo@spark-app.store> Wed, 25 Sep 2024 23:15:49 +0800

View File

@@ -2,17 +2,21 @@
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
if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ] || [[ -f "/opt/apps/amber-ce-bookworm" ]];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/
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
systemctl daemon-reload
systemctl enable ace-bookworm-auto-upgrade

View File

@@ -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

2
debian/rules vendored
View File

@@ -6,7 +6,7 @@
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:

View File

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

View File

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 196 KiB

View File

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 134 KiB

View File

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 118 KiB

View File

@@ -40,7 +40,7 @@ sudo rm -rf ace-env
pushd flamescion-container-tools/ace-host-integration
#dpkg-deb -Z xz -b . ../ace-host-integration.deb
dpkg-deb -Z xz -b . ../ace-host-integration.deb
popd

View File

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