From 56e2eea59a714aed76d3b22e22320dc49d035883 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <h-yamane@sios.com>
Date: Thu, 14 Mar 2019 07:34:41 +0900
Subject: [PATCH 1/4] use cached packages for debootstrap from APTCACHE

---
 debian/control          | 2 +-
 pbuilder-createbuildenv | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 24c45f89..2980fcf1 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Package: pbuilder
 Architecture: all
 Multi-Arch: foreign
 Depends:
- debootstrap | cdebootstrap,
+ debootstrap (>= 1.0.97)| cdebootstrap,
  dpkg-dev (>= 1.17.0),
  ${misc:Depends},
 Recommends:
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 07acc98e..c318e290 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -64,13 +64,18 @@ else
     exit 1
 fi
 
+# use cache for debootstrap
+if [ -n "$APTCACHE" ] && [ "${DEBOOTSTRAP}" = debootstrap ]; then
+    USE_CACHE="--cache-dir=$APTCACHE"
+fi
+
 # FIXME if the end-user passes another --include= to debootstrap in
 # DEBOOTSTRAPOPTS, it will override the --include=apt one and apt might not be
 # installed
 if ! ( "${DEBOOTSTRAP}" \
     ${ARCHITECTURE:+--arch=$ARCHITECTURE} \
     --include=apt \
-    "${DEBOOTSTRAPOPTS[@]}" \
+    "${DEBOOTSTRAPOPTS[@]}" "$USE_CACHE" \
     "$DISTRIBUTION" \
     "$BUILDPLACE" \
     "$MIRRORSITE" \
-- 
GitLab


From e5057cd47315a7174a36ad5c45376a97b1061de1 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <h-yamane@sios.com>
Date: Thu, 14 Mar 2019 08:37:26 +0900
Subject: [PATCH 2/4] adjust with tiny fix

---
 debian/control          | 2 +-
 pbuilder-createbuildenv | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 2980fcf1..1d26921c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Package: pbuilder
 Architecture: all
 Multi-Arch: foreign
 Depends:
- debootstrap (>= 1.0.97)| cdebootstrap,
+ debootstrap (>= 1.0.97) | cdebootstrap,
  dpkg-dev (>= 1.17.0),
  ${misc:Depends},
 Recommends:
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index c318e290..8923fae0 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -75,7 +75,8 @@ fi
 if ! ( "${DEBOOTSTRAP}" \
     ${ARCHITECTURE:+--arch=$ARCHITECTURE} \
     --include=apt \
-    "${DEBOOTSTRAPOPTS[@]}" "$USE_CACHE" \
+    "${DEBOOTSTRAPOPTS[@]}" \
+    "$USE_CACHE" \
     "$DISTRIBUTION" \
     "$BUILDPLACE" \
     "$MIRRORSITE" \
-- 
GitLab


From 4376088e07c2c02b66bcbb5fbc513f3ba87c5bed Mon Sep 17 00:00:00 2001
From: Hideki Yamane <h-yamane@sios.com>
Date: Thu, 14 Mar 2019 08:40:50 +0900
Subject: [PATCH 3/4] fix order to allow override --cache-dir option

---
 pbuilder-createbuildenv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 8923fae0..aab28ac6 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -75,8 +75,8 @@ fi
 if ! ( "${DEBOOTSTRAP}" \
     ${ARCHITECTURE:+--arch=$ARCHITECTURE} \
     --include=apt \
-    "${DEBOOTSTRAPOPTS[@]}" \
     "$USE_CACHE" \
+    "${DEBOOTSTRAPOPTS[@]}" \
     "$DISTRIBUTION" \
     "$BUILDPLACE" \
     "$MIRRORSITE" \
-- 
GitLab


From 761a7681901de7cca9f3a3a99624973d062c7559 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <h-yamane@sios.com>
Date: Thu, 14 Mar 2019 09:11:43 +0900
Subject: [PATCH 4/4] add qemu-debootstrap for check

---
 pbuilder-createbuildenv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index aab28ac6..9d4381e1 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -65,7 +65,7 @@ else
 fi
 
 # use cache for debootstrap
-if [ -n "$APTCACHE" ] && [ "${DEBOOTSTRAP}" = debootstrap ]; then
+if [ -n "$APTCACHE" ] && [ "${DEBOOTSTRAP}" = debootstrap -o "${DEBOOTSTRAP}" = qemu-debootstrap ]; then
     USE_CACHE="--cache-dir=$APTCACHE"
 fi
 
-- 
GitLab