From 21a1f4a56370d3f9c7edfd5cb3d6a1b1b816be85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
Date: Thu, 20 Aug 2020 10:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BDudeb=E5=8C=85=E6=97=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8config=E8=AE=BE=E7=BD=AE=E7=9A=84apt=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0v101=E7=B3=BB=E5=88=97?=
 =?UTF-8?q?=E7=9A=84debian-cd=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog                              |  7 ++++
 debian/live-build.links                       |  1 +
 .../0089-use-APT_OPTIONS-in-get-udeb.patch    | 35 +++++++++++++++++++
 debian/patches/series                         |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 debian/patches/0089-use-APT_OPTIONS-in-get-udeb.patch

diff --git a/debian/changelog b/debian/changelog
index be2bbb8..4459098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
   [ 谢炜 ]
diff --git a/debian/live-build.links b/debian/live-build.links
index d49462d..bb54957 100644
--- a/debian/live-build.links
+++ b/debian/live-build.links
@@ -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
diff --git a/debian/patches/0089-use-APT_OPTIONS-in-get-udeb.patch b/debian/patches/0089-use-APT_OPTIONS-in-get-udeb.patch
new file mode 100644
index 0000000..fe5c2cb
--- /dev/null
+++ b/debian/patches/0089-use-APT_OPTIONS-in-get-udeb.patch
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index 4350c27..67cf6b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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