From e96dbab83a45db2f66017a07591e37c79df70602 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Mon, 4 May 2026 23:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dloong64=20zhuangzhuang?= =?UTF-8?q?=E4=BA=A4=E5=8F=89=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gfdgd_xi <3025613752@qq.com> --- .../building-deb-zhuangzhuang-cross-host.yml | 1 + .../workflows/building-deb-zhuangzhuang-cross.yml | 3 ++- .github/workflows/configure-building-enviroment.sh | 4 ++-- .github/workflows/sources-zhuangzhuang.list | 12 ------------ 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/building-deb-zhuangzhuang-cross-host.yml b/.github/workflows/building-deb-zhuangzhuang-cross-host.yml index d5b452c..92fbd90 100644 --- a/.github/workflows/building-deb-zhuangzhuang-cross-host.yml +++ b/.github/workflows/building-deb-zhuangzhuang-cross-host.yml @@ -80,3 +80,4 @@ jobs: rootfs-source: https://deb.debian.org/debian/ gxde-codename: lizhi gxde-codename-upload: zhuangzhuang + gxde-cross-arch: loong64 diff --git a/.github/workflows/building-deb-zhuangzhuang-cross.yml b/.github/workflows/building-deb-zhuangzhuang-cross.yml index 31e09e4..af74a5f 100755 --- a/.github/workflows/building-deb-zhuangzhuang-cross.yml +++ b/.github/workflows/building-deb-zhuangzhuang-cross.yml @@ -79,4 +79,5 @@ jobs: rootfs-codename: trixie rootfs-source: https://deb.debian.org/debian/ gxde-codename: lizhi - gxde-codename-upload: zhuangzhuang \ No newline at end of file + gxde-codename-upload: zhuangzhuang + gxde-cross-arch: loong64 \ No newline at end of file diff --git a/.github/workflows/configure-building-enviroment.sh b/.github/workflows/configure-building-enviroment.sh index 5ef0c34..f6574c1 100755 --- a/.github/workflows/configure-building-enviroment.sh +++ b/.github/workflows/configure-building-enviroment.sh @@ -34,10 +34,10 @@ fi apt install -f -y apt install debian-ports-archive-keyring debian-archive-keyring -y if [[ -f /sources-list/sources-$1.list ]]; then - if [[ $(dpkg --print-architecture) == "riscv64" ]]; then + if [[ $(dpkg --print-architecture) == "riscv64" ]] || [[ $GXDE_CROSS_ARCH == "riscv64" ]]; then cp /sources-list/sources-$1-without-backport.list /etc/apt/sources.list.d -v else - if [[ $(dpkg --print-architecture) == "loong64" ]]; then + if [[ $(dpkg --print-architecture) == "loong64" ]] || [[ $GXDE_CROSS_ARCH == "loong64" ]]; then cp /sources-list/sources-$1-loong64.list /etc/apt/sources.list.d -v else cp /sources-list/sources-$1.list /etc/apt/sources.list.d -v diff --git a/.github/workflows/sources-zhuangzhuang.list b/.github/workflows/sources-zhuangzhuang.list index e5dfb2e..53390b1 100644 --- a/.github/workflows/sources-zhuangzhuang.list +++ b/.github/workflows/sources-zhuangzhuang.list @@ -1,15 +1,3 @@ -deb [trusted=true] http://loong13.debian.net/debian-loong64/ trixie main contrib non-free non-free-firmware -deb-src [trusted=true] http://loong13.debian.net/debian-loong64/ trixie main contrib non-free non-free-firmware - -deb [trusted=true] http://loong13.debian.net/debian-loong64/ trixie-updates main contrib non-free non-free-firmware -deb-src [trusted=true] http://loong13.debian.net/debian-loong64/ trixie-updates main contrib non-free non-free-firmware - -deb [trusted=true] http://loong13.debian.net/debian-loong64/ trixie-backports main contrib non-free non-free-firmware -deb-src [trusted=true] http://loong13.debian.net/debian-loong64/ trixie-backports main contrib non-free non-free-firmware - -deb [trusted=true] http://loong13.debian.net/debian-loong64-security/ trixie-security main contrib non-free non-free-firmware -deb-src [trusted=true] http://loong13.debian.net/debian-loong64-security/ trixie-security main contrib non-free non-free-firmware - # 默认注释了源码镜像以提高 apt update 速度，如有需要可自行取消注释 deb https://deb.debian.org/debian/ trixie main contrib non-free non-free-firmware deb-src https://deb.debian.org/debian/ trixie main contrib non-free non-free-firmware