From b72b9e51fefba3e23aa8fe05d8cab7af169761d6 Mon Sep 17 00:00:00 2001 From: act365 Date: Fri, 8 Apr 2022 00:43:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8C=81=E7=BB=AD?= =?UTF-8?q?=E9=9B=86=E6=88=90=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=20auto?= =?UTF-8?q?=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3.ci.worker.sh | 8 ++-- isodvd/amd64.build.sh | 20 ++++++---- isodvd/profiles/arm64.build.conf | 64 ++++++-------------------------- 3 files changed, 29 insertions(+), 63 deletions(-) diff --git a/3.ci.worker.sh b/3.ci.worker.sh index fc6d18c..9d74836 100755 --- a/3.ci.worker.sh +++ b/3.ci.worker.sh @@ -7,7 +7,9 @@ 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/" + +export my_atzlinux_debian_mirror_extra="https://apt.atzlinux.com/atzlinux" +export my_atzlinux_debian_security_mirror="http://192.168.3.103:35780/debian-security/ " +export my_atzlinux_debian_mirror="http://192.168.3.103:35780/debian/" +export my_atzlinux_backports_mirror="http://192.168.3.103:35780/debian/" ./amd64.build.sh diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh index 2e4efaf..b039233 100755 --- a/isodvd/amd64.build.sh +++ b/isodvd/amd64.build.sh @@ -1,17 +1,21 @@ #!/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/"} - +set +x +export atzlinux_debian_mirror_extra=${my_atzlinux_debian_mirror_extra:-"https://apt.atzlinux.com/atzlinux"} +export atzlinux_debian_security_mirror=${my_atzlinux_debian_security_mirror:-"https://mirrors.huaweicloud.com/debian-security/ "} +export atzlinux_debian_mirror=${my_atzlinux_debian_mirror:-"https://mirrors.huaweicloud.com/debian/"} +export atzlinux_backports_mirror=${my_atzlinux_backports_mirror:-"https://mirrors.huaweicloud.com/debian/"} build-simple-cdd --force-root \ --debug \ --dvd \ --dist buster \ --locale zh_CN \ --keyboard us \ ---security-mirror ${atzlinux_debian_security_mirror} \ ---debian-mirror ${atzlinux_debian_mirror} \ +--security-mirror \ +$atzlinux_debian_security_mirror \ +--debian-mirror \ +$atzlinux_debian_mirror \ +--backports-mirror \ +$atzlinux_backports_mirror \ -b amd64.build + diff --git a/isodvd/profiles/arm64.build.conf b/isodvd/profiles/arm64.build.conf index 6ed3f70..18b0878 100644 --- a/isodvd/profiles/arm64.build.conf +++ b/isodvd/profiles/arm64.build.conf @@ -1,73 +1,33 @@ mirror_components="main contrib non-free" -debian_mirror_extra="https://www.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 -#profiles="atzlinux-arm64-xfce atzlinux-arm64-xall atzlinux-arm64-kde atzlinux-arm64-xfce-mini atzlinux-arm64-txt-tech" -profiles="atzlinux-arm64-xfce-mini" -#default_profiles='atzlinux-arm64-xfce' -default_profiles='atzlinux-arm64-xfce-mini' -kernel_packages='linux-image-rt-arm64, linux-image-5.15.0-0.bpo.2-rt-arm64' +profiles="atzlinux-amd64-xfce atzlinux-amd64-xall atzlinux-amd64-kde atzlinux-amd64-xfce-mini atzlinux-all-txt-tech" +default_profiles='atzlinux-amd64-xfce' +kernel_packages='linux-image-rt-amd64, linux-image-5.10.0-0.bpo.12-rt-amd64' backports="true" backports_packages=' -atmel-firmware, -bluez-firmware, -dahdi-firmware-nonfree, -firmware-amd-graphics, -firmware-ath9k-htc, -firmware-atheros, -firmware-b43-installer, -firmware-b43legacy-installer, -firmware-bnx2, -firmware-bnx2x, -firmware-brcm80211, -firmware-cavium, -firmware-intel-sound, -firmware-intelwimax, -firmware-ipw2x00, -firmware-ivtv, -firmware-iwlwifi, -firmware-libertas, -firmware-linux-free, -firmware-misc-nonfree, -firmware-myricom, -firmware-netronome, -firmware-netxen, -firmware-qcom-soc, -firmware-qlogic, -firmware-realtek, -firmware-samsung, -firmware-siano, -firmware-sof-signed, -firmware-ti-connectivity, -firmware-zd1211, -hdmi2usb-fx2-firmware, -linux-image-5.15.0-0.bpo.2-rt-arm64, +linux-image-5.10.0-0.bpo.12-rt-amd64, wireless-regdb, dwz, -libdebhelper-perl, -debhelper, +libdebhelper-perl,debhelper, +lintian, tlp, tlp-rdw, -stardict-gtk, -stardict-plugin-spell, -stardict-plugin-espeak, -stardict-plugin-festival, ' -BOOT_TIMEOUT=50 -export DISKINFO="atzlinux 11.2.1" +BOOT_TIMEOUT=28 +export DISKINFO="atzlinux 10.12.1 buster" export DEBFULLNAME='肖盛文' -#export MAXJIGDOS=ALL +export MAXJIGDOS=ALL export CHECKSUMS="md5 sha1 sha512 sha256" -export ARCHES="arm64" -export DEBVERSION="11.2.1" +export ARCHES="amd64" +export DEBVERSION="10.12.1" export CDNAME="atzlinux" -export CODENAME=bullseye - # Set to 1 to save space by omitting the installation manual. # If so the README will link to the manual on the web site. export OMIT_MANUAL=1 -- Gitee From ca955979e4b9d4d64c8dfb7590f404acf8f65f0b Mon Sep 17 00:00:00 2001 From: act365 Date: Fri, 8 Apr 2022 01:12:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20auto=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- isodvd/profiles/amd64.build.conf | 3 +- isodvd/profiles/arm64.build.conf | 64 ++++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 14 deletions(-) diff --git a/isodvd/profiles/amd64.build.conf b/isodvd/profiles/amd64.build.conf index 9307bc8..18b0878 100644 --- a/isodvd/profiles/amd64.build.conf +++ b/isodvd/profiles/amd64.build.conf @@ -1,7 +1,6 @@ mirror_components="main contrib non-free" -debian_mirror_extra=${atzlinux_debian_mirror_extra} -debian_mirror_extra="https://apt.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 diff --git a/isodvd/profiles/arm64.build.conf b/isodvd/profiles/arm64.build.conf index 18b0878..6ed3f70 100644 --- a/isodvd/profiles/arm64.build.conf +++ b/isodvd/profiles/arm64.build.conf @@ -1,33 +1,73 @@ mirror_components="main contrib non-free" -debian_mirror_extra=$atzlinux_debian_mirror_extra +debian_mirror_extra="https://www.atzlinux.com/atzlinux" mirror_components_extra="main contrib non-free" keyring=/usr/share/keyrings/debian-archive-keyring.gpg,/etc/apt/trusted.gpg.d/atzlinux-archive-v10.gpg -profiles="atzlinux-amd64-xfce atzlinux-amd64-xall atzlinux-amd64-kde atzlinux-amd64-xfce-mini atzlinux-all-txt-tech" -default_profiles='atzlinux-amd64-xfce' -kernel_packages='linux-image-rt-amd64, linux-image-5.10.0-0.bpo.12-rt-amd64' +#profiles="atzlinux-arm64-xfce atzlinux-arm64-xall atzlinux-arm64-kde atzlinux-arm64-xfce-mini atzlinux-arm64-txt-tech" +profiles="atzlinux-arm64-xfce-mini" +#default_profiles='atzlinux-arm64-xfce' +default_profiles='atzlinux-arm64-xfce-mini' +kernel_packages='linux-image-rt-arm64, linux-image-5.15.0-0.bpo.2-rt-arm64' backports="true" backports_packages=' -linux-image-5.10.0-0.bpo.12-rt-amd64, +atmel-firmware, +bluez-firmware, +dahdi-firmware-nonfree, +firmware-amd-graphics, +firmware-ath9k-htc, +firmware-atheros, +firmware-b43-installer, +firmware-b43legacy-installer, +firmware-bnx2, +firmware-bnx2x, +firmware-brcm80211, +firmware-cavium, +firmware-intel-sound, +firmware-intelwimax, +firmware-ipw2x00, +firmware-ivtv, +firmware-iwlwifi, +firmware-libertas, +firmware-linux-free, +firmware-misc-nonfree, +firmware-myricom, +firmware-netronome, +firmware-netxen, +firmware-qcom-soc, +firmware-qlogic, +firmware-realtek, +firmware-samsung, +firmware-siano, +firmware-sof-signed, +firmware-ti-connectivity, +firmware-zd1211, +hdmi2usb-fx2-firmware, +linux-image-5.15.0-0.bpo.2-rt-arm64, wireless-regdb, dwz, -libdebhelper-perl,debhelper, -lintian, +libdebhelper-perl, +debhelper, tlp, tlp-rdw, +stardict-gtk, +stardict-plugin-spell, +stardict-plugin-espeak, +stardict-plugin-festival, ' -BOOT_TIMEOUT=28 -export DISKINFO="atzlinux 10.12.1 buster" +BOOT_TIMEOUT=50 +export DISKINFO="atzlinux 11.2.1" export DEBFULLNAME='肖盛文' -export MAXJIGDOS=ALL +#export MAXJIGDOS=ALL export CHECKSUMS="md5 sha1 sha512 sha256" -export ARCHES="amd64" -export DEBVERSION="10.12.1" +export ARCHES="arm64" +export DEBVERSION="11.2.1" export CDNAME="atzlinux" +export CODENAME=bullseye + # Set to 1 to save space by omitting the installation manual. # If so the README will link to the manual on the web site. export OMIT_MANUAL=1 -- Gitee