ci-test-sample/debian/patches/fix-chroot-archive.patch

31 lines
907 B
Diff

From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: fix-chroot-archive
---
scripts/build/lb_chroot_archives | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index dcfc260..379b591 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -291,7 +291,7 @@ EOF
do
if [ -e "${FILE}" ]
then
- cp config/archives/$(basename ${FILE} .chroot) chroot/etc/apt/preferences.d
+ cp ${FILE} chroot/etc/apt/preferences.d/$(basename ${FILE} .chroot)
fi
done
fi
@@ -846,7 +846,7 @@ EOF
do
if [ -e "${FILE}" ]
then
- cp config/archives/$(basename ${FILE} .binary) chroot/etc/apt/preferences.d
+ cp ${FILE} chroot/etc/apt/preferences.d/$(basename ${FILE} .binary)
fi
done
fi