diff --git a/debian/changelog b/debian/changelog index f171b0f..3f7ec5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-desktop-environment (2024.11.26) unstable; urgency=medium + + * add packages.linglong.$arch + + -- lichenggang Tue, 26 Nov 2024 15:47:45 +0800 + deepin-desktop-environment (2024.11.25) unstable; urgency=medium * update package linglong. diff --git a/debian/deepin-desktop-environment-ll.install b/debian/deepin-desktop-environment-ll.install index 2f5f632..bb4c5e7 100644 --- a/debian/deepin-desktop-environment-ll.install +++ b/debian/deepin-desktop-environment-ll.install @@ -1 +1 @@ -packages.linglong /etc/ +packages.linglong.${DEB_HOST_MULTIARCH} /etc/ diff --git a/debian/deepin-desktop-environment-ll.postinst b/debian/deepin-desktop-environment-ll.postinst index 006663d..6c8846a 100644 --- a/debian/deepin-desktop-environment-ll.postinst +++ b/debian/deepin-desktop-environment-ll.postinst @@ -1,29 +1,36 @@ #!/bin/bash set -x -LL_pkgList=/etc/packages.linglong +LL_pkgList_amd64=/etc/packages.linglong.amd64 +LL_pkgList_arm64=/etc/packages.linglong.arm64 + +# 获取系统架构 +arch=$(dpkg --print-architecture) install_pkg(){ - if [ ! -f $1 ] - then - echo "Error: $1 Not Found." - exit 0 + +if [ ! -f $1 ] +then + echo "Error: $1 Not Found." + exit 0 +fi + +for pkg in `cat $1 | grep -v "^#"` +do +ll-cli --no-dbus install ${pkg} + if [ $? -ne 0 ]; then + echo "Command failed. Exiting." + exit 1 fi +done - for pkg in `cat $1 | grep -v "^#"` - do - ll-cli --no-dbus install ${pkg} - if [ $? -ne 0 ]; then - echo "Command failed. Exiting." - exit 1 - fi - done } + update_ll_repo-dev(){ cat > /usr/share/linglong/config.yaml<< EOF # SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. @@ -64,7 +71,19 @@ if [ "$1" = "configure" ] && [ "$2" = "" ]; then /usr/libexec/linglong/create-linglong-dirs fi update_ll_repo-dev - install_pkg ${LL_pkgList} + +case "$arch" in + amd64) + install_pkg ${LL_pkgList_amd64} + ;; + arm64) + install_pkg ${LL_pkgList_arm64} + ;; + *) + echo "Unknown architecture: $arch" + ;; +esac + update_ll_repo fi diff --git a/packages.linglong b/packages.linglong.amd64 similarity index 100% rename from packages.linglong rename to packages.linglong.amd64 diff --git a/packages.linglong.arm64 b/packages.linglong.arm64 new file mode 100644 index 0000000..68f58f2 --- /dev/null +++ b/packages.linglong.arm64 @@ -0,0 +1,20 @@ +org.dde.calendar +org.deepin.introduction +org.deepin.calculator +org.deepin.draw +org.deepin.editor +org.deepin.movie +org.deepin.reader +#org.deepin.manual +#org.deepin.browser +org.deepin.mail +org.deepin.camera +org.deepin.fontmanager +#org.deepin.gomoku +#org.deepin.lianliankan +#org.deepin.screen-recorder +#org.deepin.voice.note +#org.deepin.image.viewer +#org.deepin.album +#org.deepin.compressor +#org.deepin.music