Compare commits

..

14 Commits

Author SHA1 Message Date
250e48b98e update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-12-19 04:54:05 +00:00
5f54c92b84 fix: can not pass args via bwrap
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-12-19 04:51:04 +00:00
df0b714c8b https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-12-15 07:03:06 +00:00
cd1f0c0c22 Nope we don't proxy mimetypes as it cause dde down
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-12-07 10:44:51 +00:00
7c2dc1bbb2 update: build-container.sh to adapt debian sid 2024-12-06 23:18:15 +08:00
338f647763 ```
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-28 17:35:36 +00:00
286ced4488 yay -S amber-ce-bookworm
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-28 17:22:57 +00:00
f8c7a53864 https://pan.huang1111.cn/s/jR1GdUy
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-13 05:04:49 +00:00
5b09d279ea readme
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-12 17:50:20 +00:00
7fdb227c93 readme
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-12 17:33:49 +00:00
b9a0472b78 update README.zh.md.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-12 16:52:33 +00:00
e4cc26e3ea update .workflow/Debian-Build-amd64.yml.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-12 11:28:44 +00:00
09a12d3595 update Debian-Build-amd64.yml 2024-11-12 10:28:32 +00:00
fc711b285e update debian/control.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-11-12 10:10:09 +00:00
8 changed files with 26 additions and 37 deletions

View File

@@ -29,17 +29,17 @@ stages:
- 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
- mv -v $f target
- done
- ''
- ls -all
artifacts:
- name: BUILD_ARTIFACT
path:
- ./target
- ../target/
notify: []
strategy:
retry: '0'

View File

@@ -25,10 +25,12 @@ Please use `git clone --recurse-submodules` to obtain the env
### Manual InstallDebian/Fedora/Arch)
https://pan.huang1111.cn/s/jR1GdUy
Share Linkhttps://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`
### Amber-CE x86
@@ -44,14 +46,10 @@ https://pan.huang1111.cn/s/P63D6Cm
### 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

View File

@@ -19,17 +19,12 @@
### 手动安装Debian/Fedora/Arch)
https://pan.huang1111.cn/s/jR1GdUy
分享链接https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
Ubuntu 18.04 需要安装 https://packages.debian.org/buster/bubblewrap
### Amber-CE x86
利用 LAT 运行的x86容器可安装和运行x86的deb
https://pan.huang1111.cn/s/P63D6Cm
Arch`yay -S amber-ce-bookworm`
---
@@ -38,15 +33,10 @@ https://pan.huang1111.cn/s/P63D6Cm
### 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

4
debian/changelog vendored
View File

@@ -1,5 +1,5 @@
amber-ce-bookworm (12.4.14-4) UNRELEASED; urgency=low
amber-ce-bookworm (12.4.15) 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

2
debian/control vendored
View File

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

View File

@@ -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" ]|| [ "$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"

View File

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

View File

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