下载udeb包时使用config设置的apt选项,增加v101系列的debian-cd配置

This commit is contained in:
谢炜 2020-08-20 10:29:00 +08:00
parent d208e61c7a
commit 21a1f4a563
4 changed files with 44 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
live-build (3.0~a57-1ubuntu38k58) focal; urgency=medium
[ 谢炜 ]
* 下载udeb包时使用config设置的apt选项增加v101系列的debian-cd配置
-- Xie Wei <xiewei@kylinos.cn> Thu, 20 Aug 2020 10:29:37 +0800
live-build (3.0~a57-1ubuntu38k57) focal; urgency=medium
[ 谢炜 ]

View File

@ -9,3 +9,4 @@
/usr/share/live/build/data/debian-cd/squeeze /usr/share/live/build/data/debian-cd/cosmic
/usr/share/live/build/data/debian-cd/squeeze /usr/share/live/build/data/debian-cd/disco
/usr/share/live/build/data/debian-cd/juniper /usr/share/live/build/data/debian-cd/community
/usr/share/live/build/data/debian-cd/xenial /usr/share/live/build/data/debian-cd/v101

View File

@ -0,0 +1,35 @@
From: =?utf-8?b?6LCi54Kc?= <xiewei@kylinos.cn>
Date: Wed, 29 Jul 2020 11:18:42 +0800
Subject: use APT_OPTIONS in get-udeb
---
scripts/build/lb_binary_debian-installer | 2 +-
share/bin/get-udeb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 78b313a..89bfe2c 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -647,7 +647,7 @@ EOF
then
cp /usr/share/live/build/bin/get-udeb chroot/bin
cp config/package-lists/*.list.udeb chroot/root/
- Chroot chroot "/bin/get-udeb"
+ Chroot chroot "APT_OPTIONS='${APT_OPTIONS}' /bin/get-udeb"
rm -f chroot/bin/get-udeb
rm -f chroot/root/*.list.udeb
mv chroot/root/binary.udeb ./
diff --git a/share/bin/get-udeb b/share/bin/get-udeb
index b65bfef..79a80c9 100755
--- a/share/bin/get-udeb
+++ b/share/bin/get-udeb
@@ -17,7 +17,7 @@ APT_GET="apt-get --assume-yes \
-o Dir::Cache=$APTDIR/cache \
-o Acquire::Retries=3 \
-o Dir::State::Status=$APTDIR/state/status \
- --allow-unauthenticated \
+ $APT_OPTIONS \
"
set -e

View File

@ -86,3 +86,4 @@ strip-pool-for-di.patch
0087-check-makedev-in-lb_binary_grub2-efi.patch
0087-add-ext2-module-to-grub.efi.patch
0088-add-loongson-debian-cd-files.patch
0089-use-APT_OPTIONS-in-get-udeb.patch