2020-08-20 10:29:00 +08:00
|
|
|
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 +-
|
2020-09-02 11:18:42 +08:00
|
|
|
share/bin/get-udeb | 3 ++-
|
|
|
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
2020-08-20 10:29:00 +08:00
|
|
|
|
|
|
|
|
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
|
2020-09-02 11:18:42 +08:00
|
|
|
index 78b313a..79e9822 100755
|
2020-08-20 10:29:00 +08:00
|
|
|
--- 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"
|
2020-09-02 11:18:42 +08:00
|
|
|
+ Chroot chroot "/bin/get-udeb ${APT_OPTIONS}"
|
2020-08-20 10:29:00 +08:00
|
|
|
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
|
2020-09-02 11:18:42 +08:00
|
|
|
index b65bfef..87a0ef6 100755
|
2020-08-20 10:29:00 +08:00
|
|
|
--- a/share/bin/get-udeb
|
|
|
|
|
+++ b/share/bin/get-udeb
|
2020-09-02 11:18:42 +08:00
|
|
|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
|
|
|
|
cd /root
|
|
|
|
|
APTDIR="`pwd`/udeb_tmp"
|
|
|
|
|
+APT_OPTIONS=$*
|
|
|
|
|
|
|
|
|
|
rm -rf ${APTDIR}
|
|
|
|
|
|
|
|
|
|
@@ -17,7 +18,7 @@ APT_GET="apt-get --assume-yes \
|
2020-08-20 10:29:00 +08:00
|
|
|
-o Dir::Cache=$APTDIR/cache \
|
|
|
|
|
-o Acquire::Retries=3 \
|
|
|
|
|
-o Dir::State::Status=$APTDIR/state/status \
|
|
|
|
|
- --allow-unauthenticated \
|
|
|
|
|
+ $APT_OPTIONS \
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
set -e
|
