Adding debian version 20170201-3.

debian/changelog

+obs-build (20170201-3) unstable; urgency=medium
+
+  [ Sjoerd Simons ]
+  * Added a selection of patches to improve full-distro builds:
+    - dsc-Keep-everything.patch
+    - deboostrap-Enable-dpkg-unsafe-io-usage.patch
+    - HACK-Make-glibc-build.patch
+    - debootstrap-generate-apt-caches.patch
+
+  [ Andrew Lee (李健秋) ]
+  * Added depends to sudo, libarchive-tools. (Closes: #866580)
+  * debian/source/options: drop no-preparation as it breaks pbuilder.
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 05 Aug 2017 05:24:36 +0800
+
 obs-build (20170201-2) unstable; urgency=medium
 
   * Refine exist and import new patches:

debian/control

@@ -10,7 +10,8 @@ Standards-Version: 3.9.8
 
 Package: obs-build
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, rpm, debootstrap
+Depends:
+ ${misc:Depends}, ${perl:Depends}, rpm, debootstrap, sudo, libarchive-tools
 Recommends: rpm2cpio, osc, libcrypt-ssleay-perl
 Description: scripts for building RPM/debian packages for multiple distributions
  This package provides scripts for building RPM and debian packages in

debian/patches/HACK-Make-glibc-build.patch

+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Mon, 13 Mar 2017 14:28:10 +0100
+Subject: HACK: Make glibc build
+
+See:
+  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=844420
+
+Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+---
+ build-recipe-debootstrap | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/build-recipe-debootstrap b/build-recipe-debootstrap
+index e1c3200..85e02ad 100644
+--- a/build-recipe-debootstrap
++++ b/build-recipe-debootstrap
+@@ -68,6 +68,10 @@ recipe_build_debootstrap() {
+         cp $BUILD_ROOT/etc/hosts $BUILD_ROOT/$myroot/etc/hosts
+     fi
+ 
++    # Hack for glibc build, make localhost. resolve
++    echo "127.0.0.2 localhost."  >> $BUILD_ROOT/$myroot/etc/hosts
++    cat $BUILD_ROOT/$myroot/etc/hosts
++
+     # Mount special filesystem in the debootstrap build root
+     mount -n -tproc none $BUILD_ROOT/$myroot/proc
+     mount -n -tsysfs -o ro none $BUILD_ROOT/$myroot/sys

debian/patches/deboostrap-Enable-dpkg-unsafe-io-usage.patch

+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Mon, 13 Mar 2017 14:27:31 +0100
+Subject: deboostrap: Enable dpkg unsafe io usage
+
+To speed up dpkg a little bit one can turn on usage of unsafe-io to
+lower the amount of sync() like calls it does. Enable this early in the
+debootstrap run.
+
+Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+---
+ build-recipe-debootstrap | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build-recipe-debootstrap b/build-recipe-debootstrap
+index c1ef4ad..e1c3200 100644
+--- a/build-recipe-debootstrap
++++ b/build-recipe-debootstrap
+@@ -45,6 +45,9 @@ recipe_build_debootstrap() {
+     done
+     FULL_PKG_LIST="${FULL_PKG_LIST#,}"
+     rm -rf "$BUILD_ROOT/$myroot"
++    mkdir -p "$BUILD_ROOT/$myroot/etc/dpkg/dpkg.cfg.d"
++    echo force-unsafe-io > "$BUILD_ROOT/$myroot/etc/dpkg/dpkg.cfg.d/force-unsafe-io"
++
+     set -- chroot $BUILD_ROOT debootstrap --keep-debootstrap-dir --no-check-gpg --variant=buildd --arch="${arch}" --include="$FULL_PKG_LIST" "$dist" "$myroot" file:///.build.binaries
+     echo "running debootstrap..."
+     if ! "$@" || ! chroot $BUILD_ROOT dpkg --configure -a; then

debian/patches/debootstrap-generate-apt-caches.patch

+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Mon, 13 Mar 2017 14:36:52 +0100
+Subject: debootstrap: generate apt caches
+
+Some packages seemingly rely on apt-cache (with populated caches) being
+available during build. This seems an ugly assumption, but it does work on
+the Debian buildd infrastructure so make it work on OBS as well.
+
+Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+---
+ build-recipe-debootstrap | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build-recipe-debootstrap b/build-recipe-debootstrap
+index 85e02ad..2f2c058 100644
+--- a/build-recipe-debootstrap
++++ b/build-recipe-debootstrap
+@@ -79,6 +79,8 @@ recipe_build_debootstrap() {
+     mkdir -p $BUILD_ROOT/$myroot/dev/shm
+     mount -n -ttmpfs none $BUILD_ROOT/$myroot/dev/shm
+ 
++    chroot $BUILD_ROOT/$myroot apt-cache gencaches
++
+     # move topdir over
+     mv "$BUILD_ROOT/$TOPDIR" "$BUILD_ROOT/$myroot/${TOPDIR%/*}"
+ 

debian/patches/dsc-Keep-everything.patch

+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Mon, 13 Mar 2017 14:27:12 +0100
+Subject: dsc: Keep everything
+
+Debian package build dependencies allow for direct or indirect build
+cycles, when doing a full distribution build in OBS this means keeping
+the keep list gets very tedious very quickly.
+
+Adjust the default keep processing such that for Debian (dsc) builds
+everything is kept by default
+
+Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+---
+ Build.pm | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Build.pm b/Build.pm
+index ccf8735..89b4af5 100644
+--- a/Build.pm
++++ b/Build.pm
+@@ -532,7 +532,9 @@ sub get_build {
+     @directdepsend = grep {!/^-/} splice(@directdepsend, @deps + 1);
+   }
+   my @extra = (@{$config->{'required'}}, @{$config->{'support'}});
+-  if (@{$config->{'keep'} || []}) {
++  if ($config->{'type'} eq 'dsc') {
++	  ;
++  } elsif (@{$config->{'keep'} || []}) {
+     my %keep = map {$_ => 1} (@deps, @{$config->{'keep'} || []}, @{$config->{'preinstall'}});
+     for (@{$subpacks || []}) {
+       next if $keep{$_};

debian/patches/series

@@ -10,3 +10,8 @@
 0008-debootstrap-Improve-devpts-mounting.patch
 debootstrap-Also-mount-sysfs.patch
 deb-Don-t-create-an-empty-rcS.patch
+dsc-Keep-everything.patch
+deboostrap-Enable-dpkg-unsafe-io-usage.patch
+HACK-Make-glibc-build.patch
+debootstrap-generate-apt-caches.patch
+

debian/source/options

-no-preparation
 extend-diff-ignore=configs/sles11.conf