diff --git a/3.ci.worker.sh b/3.ci.worker.sh index d2314c56da4366d267f6997c57d366be459798f2..fc6d18c5db1535a99c61211983d413643465b0d6 100755 --- a/3.ci.worker.sh +++ b/3.ci.worker.sh @@ -7,4 +7,7 @@ cd $CMD_PATH apt install simple-cdd -y cd isodvd rm -rf tmp/mirror/db/lockfile +export atzlinux_debian_mirror_extra="https://apt.atzlinux.com/atzlinux" +export atzlinux_debian_security_mirror="https://mirrors.huaweicloud.com/debian-security/ " +export atzlinux_debian_mirror="https://mirrors.huaweicloud.com/debian/" ./amd64.build.sh diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh index 13fcacaa73d4f191f54f45b848c79a88c534542a..81b2bc0064e214a0abffe02b069113280dca77c2 100755 --- a/isodvd/amd64.build.sh +++ b/isodvd/amd64.build.sh @@ -1 +1,17 @@ -build-simple-cdd --force-root --debug --dvd --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror https://mirrors.huaweicloud.com/debian-security/ --debian-mirror https://mirrors.huaweicloud.com/debian/ -b amd64.build +#!/usr/bin/env bash + +set -x + +export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:="http://txy.atzlinux.com/atzlinux"} +export atzlinux_debian_security_mirror=${atzlinux_debian_security_mirror:="https://mirrors.huaweicloud.com/debian-security/ "} +export atzlinux_debian_mirror=${atzlinux_debian_mirror:="https://mirrors.huaweicloud.com/debian/"} + +build-simple-cdd --force-root \ +--debug \ +--dvd \ +--dist buster \ +--locale zh_CN \ +--keyboard us \ +--security-mirror ${atzlinux_debian_mirror_extra} \ +--debian-mirror ${atzlinux_debian_mirror} \ +-b amd64.build \ No newline at end of file diff --git a/isodvd/profiles/amd64.build.conf b/isodvd/profiles/amd64.build.conf index a8d5e33ff08ec11ade2726e478c782e7eb68c91b..a5e857495ca98469f7b4cef1edf1dff4281ba06e 100644 --- a/isodvd/profiles/amd64.build.conf +++ b/isodvd/profiles/amd64.build.conf @@ -1,6 +1,6 @@ mirror_components="main contrib non-free" -debian_mirror_extra="http://txy.atzlinux.com/atzlinux" +debian_mirror_extra=${atzlinux_debian_mirror_extra} mirror_components_extra="main contrib non-free" keyring=/usr/share/keyrings/debian-archive-keyring.gpg,/etc/apt/trusted.gpg.d/atzlinux-archive-v10.gpg