spark-store-project/amber-ce-bookworm
15
0
Fork 0
mirror of https://gitee.com/amber-ce/amber-ce-bookworm.git synced 2025-12-14 19:12:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add-depend-flatpak

Browse Source
This commit is contained in:
shenmo
2023-11-09 19:03:43 +08:00
parent c6f9ed07ff
commit a03f37fa37
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DEBIAN/control
View File

@@ -2,7 +2,7 @@ Package: cn.flamescion.bookworm-compatibility-mode
Version: 12.3 Version: 12.3
Section: misc Section: misc
Priority: optional Priority: optional
Depends: bubblewrap Depends: bubblewrap,flatpak
Maintainer: shenmo <shenmo@spark-app.store> Maintainer: shenmo <shenmo@spark-app.store>
Architecture: amd64 Architecture: amd64
Description: bwrap wrapper for install and running debs inside a bookworm container Description: bwrap wrapper for install and running debs inside a bookworm container

7
src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init
View File

@@ -59,7 +59,8 @@ bwrap --dev-bind $chrootEnvPath/ / \
} }
bookworm-run apt update bookworm-run apt update
bookworm-run apt install apt-utils bc curl dialog diffutils findutils gnupg2 less libnss-myhostname libvte-2.9*-common 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 -y bookworm-run apt install apt-utils bc curl dialog diffutils findutils gnupg2 less libnss-myhostname libvte-2.9*-common 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 -y
echo "Update the flamescion container tools"
cp -rv `dirname $chrootEnvPath`/flamescion-container-tools/ $chrootEnvPath
rm -rf $chrootEnvPath/usr/lib/`gcc -dumpmachine`/dri/dri rm -rf $chrootEnvPath/usr/lib/`gcc -dumpmachine`/dri/dri
# 之前错误的多复制了一个，这里删掉 # 之前错误的多复制了一个，这里删掉
@@ -187,8 +188,7 @@ chmod +x $chrootEnvPath/init.sh
bookworm-run bash /init.sh bookworm-run bash /init.sh
bookworm-run rm /init.sh bookworm-run rm /init.sh
bookworm-run cp /host/etc/locale.gen /etc/locale.gen && locale-gen bookworm-run cp /host/etc/locale.gen /etc/locale.gen && locale-gen
echo "Update the flamescion container tools"
cp -rv `dirname $chrootEnvPath`/flamescion-container-tools/ $chrootEnvPath
if [ ! -e $chrootEnvPath/opt/ace-host-integration/ace-host-integration ];then if [ ! -e $chrootEnvPath/opt/ace-host-integration/ace-host-integration ];then
echo "Fix: 12.3-new feature: integrate. Installing..." echo "Fix: 12.3-new feature: integrate. Installing..."
@@ -203,6 +203,7 @@ fi
bookworm-run touch /finish.flag bookworm-run touch /finish.flag
bookworm-run apt clean bookworm-run apt clean
bookworm-run chown -R $(who | awk '{print $1}' | head -n 1) /usr/lib/locale/
sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ / \ sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ / \
--setenv LANG "$LANG" \ --setenv LANG "$LANG" \
--setenv LC_COLLATE "$LC_COLLATE" \ --setenv LC_COLLATE "$LC_COLLATE" \