chiark - git - mdw - termux-packages/blob - packages/debootstrap/functions.patch

   1 diff -u -r ../debootstrap-1.0.97/functions ./functions
   2 --- ../debootstrap-1.0.97/functions     2018-04-17 04:06:32.000000000 +0200
   3 +++ ./functions 2018-04-30 03:18:01.010494588 +0200
   4 @@ -906,7 +906,7 @@
   5  extract_dpkg_deb_data () {
   6         local pkg="$1"
   7
   8 -       dpkg-deb --fsys-tarfile "$pkg" | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
   9 +       dpkg-deb --fsys-tarfile "$pkg" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf -
  10  }
  11
  12  # Raw .deb extractors
  13 @@ -946,7 +946,7 @@
  14         esac
  15
  16         if in_path "$cat_cmd"; then
  17 -               ar -p "$pkg" "$tarball" | "$cat_cmd" | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
  18 +               ar -p "$pkg" "$tarball" | "$cat_cmd" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf -
  19         else
  20                 error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
  21         fi
  22 @@ -1171,7 +1171,6 @@
  23             hurd*)
  24                 ;;
  25             *)
  26 -               setup_devices_simple
  27                 ;;
  28         esac
  29  }