Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add libspa-0.2-bluetooth #39

Merged
merged 3 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-desktop-environment (2024.01.08) unstable; urgency=medium

* update deepin-desktop-environment-ll.postinst.

-- LiChengGang <[email protected]> Mon, 08 Jan 2024 10:17:30 +0800

deepin-desktop-environment (2024.01.05) unstable; urgency=medium

* fix: also add wireplumber as dependency of pipewire
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Depends: ${misc:Depends},
ostree,
pipewire-pulse,
wireplumber,
libspa-0.2-bluetooth,
pkg-config,
plymouth,
pppoe,
Expand Down Expand Up @@ -272,7 +273,6 @@ Depends: ${misc:Depends},
linglong-bin,
linglong-box,
linglong-installer,
linglong-loader,
org.deepin.downloader,
samba,
samba-common-bin,
Expand Down
83 changes: 25 additions & 58 deletions debian/deepin-desktop-environment-ll.postinst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
set -x

LL_pkgList=/etc/packages.linglong
LINGLONG_ROOT="/var/lib/linglong"

install_pkg(){
if [ ! -f $1 ]
Expand All @@ -13,82 +12,50 @@ install_pkg(){

for pkg in `cat $1 | grep -v "^#"`
do
ll-cli --nodbus install ${pkg}
ll-cli --no-dbus install ${pkg}
done
}

check_os_version(){
if [ -f /etc/os-release ]
then
VERSION=$(sed -ne '/^VERSION_ID=.*$/P' /etc/os-release | awk -F = '{print $2}' | sed -e 's/"//g' | awk -F . '{print $1}')
if [ ${VERSION} -eq '20' ]
then
LINGLONG_ROOT="/data/linglong"
elif [ ${VERSION} -eq '23' ]
then
LINGLONG_ROOT="/persistent/linglong"
fi
fi
}

change_own_ll(){
chown deepin-linglong:users -R ${LINGLONG_ROOT}
}

update_ll_repo-dev(){
cat > /persistent/linglong/config.json<< EOF
{
"appDbUrl": "http://10.0.36.228:9002",
"repoName": "release-snipe"
}
EOF

cat > /persistent/linglong/repo/config<< EOF
[core]
repo_version=1
mode=bare-user-only
min-free-space-size=600MB

[remote "release-snipe"]
url=http://10.0.36.228:9002/repos/release-snipe/
gpg-verify=false
update_ll_repo-dev(){
cat > /var/lib/linglong/config.yaml<< EOF
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: LGPL-3.0-or-later

version: 1
defaultRepo: release-snipe
repos:
release-snipe: http://10.0.36.228:9002
EOF
}

update_ll_repo(){
cat > /persistent/linglong/config.json<< EOF
{
"appDbUrl": "https://store-llrepo.deepin.com"
}
EOF
cat > /persistent/linglong/repo/config<< EOF
[core]
repo_version=1
mode=bare-user-only
min-free-space-size=600MB

[remote "repo"]
url=https://store-llrepo.deepin.com/repos/repo
gpg-verify=false
cat > /var/lib/linglong/config.yaml<< EOF
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: LGPL-3.0-or-later

version: 1
defaultRepo: repo
repos:
repo: https://mirror-repo-linglong.deepin.com
EOF
}
rm_dbus-x11_config(){

if [ -f /etc/X11/Xsession.d/75dbus_dbus-launch -a -f /etc/X11/Xsession.d/95dbus_update-activation-env ]
then
rm /etc/X11/Xsession.d/75dbus_dbus-launch /etc/X11/Xsession.d/95dbus_update-activation-env
fi

}


rm_dbus-x11_config
if [ "$1" = "configure" ] && [ "$2" = "" ]; then
update_ll_repo-dev
if [ -f /usr/libexec/linglong/create-linglong-dirs ]; then
/usr/libexec/linglong/create-linglong-dirs
fi
update_ll_repo-dev
install_pkg ${LL_pkgList}
update_ll_repo
check_os_version
change_own_ll

fi


Expand Down
Loading