[arch-commits] Commit in debootstrap/repos/community-any (4 files)

[Eli Schwartz]

    Date: Wednesday, February 7, 2018 @ 15:53:03
  Author: eschwartz
Revision: 290018

archrelease: copy trunk to community-any

Added:
  debootstrap/repos/community-any/PKGBUILD
    (from rev 290017, debootstrap/trunk/PKGBUILD)
  debootstrap/repos/community-any/arch-detect.patch
    (from rev 290017, debootstrap/trunk/arch-detect.patch)
Deleted:
  debootstrap/repos/community-any/PKGBUILD
  debootstrap/repos/community-any/arch-detect.patch

-------------------+
 PKGBUILD          |   74 ++++++++++++++++++++++++++--------------------------
 arch-detect.patch |   39 ++++++++++++++-------------
 2 files changed, 58 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-07 15:52:41 UTC (rev 290017)
+++ PKGBUILD	2018-02-07 15:53:03 UTC (rev 290018)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=debootstrap
-pkgver=1.0.93
-pkgrel=1
-pkgdesc="Bootstrap a basic Debian system"
-arch=('any')
-license=('GPL')
-url="https://tracker.debian.org/pkg/debootstrap"
-depends=('wget' 'binutils')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/debootstrap/archive/$pkgver.tar.gz"
-        arch-detect.patch)
-optdepends=('gnupg: check release signatures'
-            'debian-archive-keyring: check release signatures for Debian'
-            'ubuntu-keyring: check release signatures for Ubuntu')
-sha512sums=('57a6aa5d27b1b600f49db847b238e412a9819c499995e4dbc63943bb7c6a738f4d97befc2a9d25575a6d619bdc64e838654fa629573ee5fe95c6bc56758a1b8b'
-            '9e4c805b174eeb9ecab13701249c56542c1dc0c371df5f708540d17959f89de80763c4311972abb8f1d4f82b13080f7aa835028c1e5016ee17eebc32c8daa6e7')
-
-prepare() {
-  cd debootstrap-$pkgver
-
-  sed -i 's/sbin/bin/g' Makefile
-
-  # Debian defaults
-  sed -i 's|export PATH|export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"|' debootstrap
-
-  # Detect Architecture
-  patch -p1 -i ../arch-detect.patch
-}
-
-package() {
-  cd debootstrap-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 debootstrap.8 "$pkgdir"/usr/share/man/man8/debootstrap.8
-}

Copied: debootstrap/repos/community-any/PKGBUILD (from rev 290017, debootstrap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-02-07 15:53:03 UTC (rev 290018)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=debootstrap
+pkgver=1.0.93
+pkgrel=2
+pkgdesc="Bootstrap a basic Debian system"
+arch=('any')
+license=('GPL')
+url="https://tracker.debian.org/pkg/debootstrap"
+depends=('wget' 'binutils')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/debootstrap/archive/$pkgver.tar.gz"
+        arch-detect.patch)
+optdepends=('gnupg: check release signatures'
+            'debian-archive-keyring: check release signatures for Debian'
+            'ubuntu-keyring: check release signatures for Ubuntu')
+sha512sums=('57a6aa5d27b1b600f49db847b238e412a9819c499995e4dbc63943bb7c6a738f4d97befc2a9d25575a6d619bdc64e838654fa629573ee5fe95c6bc56758a1b8b'
+            '824109b2ea138d0dd1a31039a165cb4079da856cb11c664fc5a7f49a42de08ff56a620887d3c0914b69140849799f4473b1f27a05cd14cd60ef2a41627f8d5e1')
+
+prepare() {
+  cd debootstrap-$pkgver
+
+  sed -i 's/sbin/bin/g' Makefile
+
+  # Debian defaults
+  sed -i 's|export PATH|export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"|' debootstrap
+
+  # Detect Architecture
+  patch -p1 -i ../arch-detect.patch
+}
+
+package() {
+  cd debootstrap-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 debootstrap.8 "$pkgdir"/usr/share/man/man8/debootstrap.8
+}

Deleted: arch-detect.patch
===================================================================
--- arch-detect.patch	2018-02-07 15:52:41 UTC (rev 290017)
+++ arch-detect.patch	2018-02-07 15:53:03 UTC (rev 290018)
@@ -1,18 +0,0 @@
---- a/debootstrap	2016-03-22 21:13:58.000000000 +0800
-+++ b/debootstrap	2016-03-22 21:13:09.573621800 +0800
-@@ -419,6 +419,15 @@
- 	HOST_ARCH=`/usr/bin/udpkg --print-architecture`
- elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
- 	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
-+elif in_path pacman; then
-+	CARCH="$(. /etc/makepkg.conf && echo $CARCH)"
-+    case "$CARCH" in
-+        "i686")   HOST_ARCH="i386" ;;
-+        "x86_64") HOST_ARCH="amd64" ;;
-+        "armv7h") HOST_ARCH="armhf" ;;
-+        "aarch64") HOST_ARCH="arm64" ;;
-+        *) echo "Unknown architecture: $CARCH" && exit 1
-+    esac
- fi
- HOST_OS="$HOST_ARCH"
- # basic host OS guessing for non-Debian systems

Copied: debootstrap/repos/community-any/arch-detect.patch (from rev 290017, debootstrap/trunk/arch-detect.patch)
===================================================================
--- arch-detect.patch	                        (rev 0)
+++ arch-detect.patch	2018-02-07 15:53:03 UTC (rev 290018)
@@ -0,0 +1,21 @@
+diff --git a/debootstrap b/debootstrap
+index fcdb20f..184900d 100755
+--- a/debootstrap
++++ b/debootstrap
+@@ -427,6 +427,16 @@ elif in_path udpkg && \
+ 	HOST_ARCH=`/usr/bin/udpkg --print-architecture`
+ elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
+ 	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
++elif in_path pacman; then
++	# pacman 5.1 will have `pacman-conf Architecture`
++	CARCH="$(bash -c '. /etc/makepkg.conf && echo $CARCH')"
++	case "$CARCH" in
++		"i686")   HOST_ARCH="i386" ;;
++		"x86_64") HOST_ARCH="amd64" ;;
++		"armv7h") HOST_ARCH="armhf" ;;
++		"aarch64") HOST_ARCH="arm64" ;;
++		*) echo "Unknown architecture: $CARCH" && exit 1
++	esac
+ fi
+ HOST_OS="$HOST_ARCH"
+ # basic host OS guessing for non-Debian systems