diff --git a/ace-base.config b/ace-base.config index 505e057..4f5b3b0 100644 --- a/ace-base.config +++ b/ace-base.config @@ -2,5 +2,5 @@ @HOST_NAME@=Amber-CE-Bookworm @EXEC_NAME@=bookworm-run @PRETTY_NAME@=Bookworm -@VERSION@=12.8.4 +@VERSION@=12.8.5 @CODE_NAME@=bookworm diff --git a/debian/changelog b/debian/changelog index c578557..a2c70ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -amber-ce-bookworm (12.8.4) UNRELEASED; urgency=low +amber-ce-bookworm (12.8.5) UNRELEASED; urgency=low * 通用 ACE 构建,现不再需要单独使用构建脚本 * 更方便地更改成其他ACE * 现可在容器内使用 dpkg-buildpackage diff --git a/src/opt/apps/@PKG_NAME@/files/bin/ace-init b/src/opt/apps/@PKG_NAME@/files/bin/ace-init index edd99de..7c7fcca 100755 --- a/src/opt/apps/@PKG_NAME@/files/bin/ace-init +++ b/src/opt/apps/@PKG_NAME@/files/bin/ace-init @@ -112,4 +112,5 @@ sudo -u $(get_current_user) bwrap --dev-bind $chrootEnvPath/ / \ bookworm-run update-locale LANG=$LANG chown -R root $chrootEnvPath chmod 777 -R $chrootEnvPath/usr/share/icons +rm -vfr $chrootEnvPath/dev/* ${HERE}/amber-ce-configure-nvidia || true \ No newline at end of file diff --git a/src/opt/apps/@PKG_NAME@/files/build-container.sh b/src/opt/apps/@PKG_NAME@/files/build-container.sh index c9f6a5f..38dce14 100755 --- a/src/opt/apps/@PKG_NAME@/files/build-container.sh +++ b/src/opt/apps/@PKG_NAME@/files/build-container.sh @@ -14,27 +14,35 @@ echo "Usage: $0 ARCHITECTURE CODENAME" exit fi +sudo cp /usr/share/debootstrap/scripts/sid /usr/share/debootstrap/scripts/crimson -v +sudo cp /usr/share/debootstrap/scripts/sid /usr/share/debootstrap/scripts/beige -v + +CODENAME=$2 + +# Set distroname based on codename +if [ "$CODENAME" = "beige" ] || [ "$CODENAME" = "crimson" ]; then + DISTRONAME="deepin" +else + DISTRONAME="debian" +fi + 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,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} $2 ./ace-env https://mirrors.cernet.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,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} $2 ./ace-env https://mirrors.cernet.edu.cn/${DISTRONAME}/ 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,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} $2 ./ace-env https://mirrors.cernet.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,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} $2 ./ace-env https://mirrors.cernet.edu.cn/${DISTRONAME}/ fi sudo rm -rf ace-env/var/cache/apt/archives/*.deb - +sudo rm -vfr ace-env/dev/* sudo tar -I 'xz -T0' -cvf ace-env.tar.xz ace-env/* -sudo rm -rf ace-env - - - - +sudo rm -rf ace-env \ No newline at end of file