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

[Felix Yan]

    Date: Friday, March 13, 2020 @ 08:50:07
  Author: felixonmars
Revision: 595688

archrelease: copy trunk to community-any

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

-------------------+
 PKGBUILD          |   72 ++++++++++++++++++++++++++--------------------------
 arch-detect.patch |   64 +++++++++++++++++++++++-----------------------
 2 files changed, 68 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-13 08:49:48 UTC (rev 595687)
+++ PKGBUILD	2020-03-13 08:50:07 UTC (rev 595688)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=debootstrap
-pkgver=1.0.121
-pkgrel=1
-pkgdesc="Bootstrap a basic Debian system"
-arch=('any')
-license=('GPL')
-url="https://tracker.debian.org/pkg/debootstrap"
-depends=('perl' 'wget' 'binutils')
-source=(https://salsa.debian.org/installer-team/debootstrap/-/archive/$pkgver/debootstrap-$pkgver.tar.bz2
-        arch-detect.patch)
-optdepends=('gnupg: check release signatures'
-            'debian-archive-keyring: check release signatures for Debian'
-            'ubuntu-keyring: check release signatures for Ubuntu')
-sha512sums=('cc4a10122a3dc66143050b6400ba508f4758b4f93aebed5195f2ffb0fcf4e95d75251b07d59b960ee0ab39eec0d464690a33107f2106df6e5adc33ae3c0b3371'
-            'd70a9d096d1692f71970cc818515bd783a6031bfe2d2857134eabf6fd36e4137152ebafa8e2d4ae7c8cb442c8532cd4192715b286e38b4d947b0b467e9ed54a5')
-
-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 595687, debootstrap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-13 08:50:07 UTC (rev 595688)
@@ -0,0 +1,36 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=debootstrap
+pkgver=1.0.122
+pkgrel=1
+pkgdesc="Bootstrap a basic Debian system"
+arch=('any')
+license=('GPL')
+url="https://tracker.debian.org/pkg/debootstrap"
+depends=('perl' 'wget' 'binutils')
+source=(https://salsa.debian.org/installer-team/debootstrap/-/archive/$pkgver/debootstrap-$pkgver.tar.bz2
+        arch-detect.patch)
+optdepends=('gnupg: check release signatures'
+            'debian-archive-keyring: check release signatures for Debian'
+            'ubuntu-keyring: check release signatures for Ubuntu')
+sha512sums=('b034a1e76a2fe0e6cd7817f082e058fb283781842ac4ea72ad733bf99e93d809a86dbbef4ca461aebe8fbb7d31be6b934b0c417e77940c137ab9000a1b28e594'
+            'd70a9d096d1692f71970cc818515bd783a6031bfe2d2857134eabf6fd36e4137152ebafa8e2d4ae7c8cb442c8532cd4192715b286e38b4d947b0b467e9ed54a5')
+
+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	2020-03-13 08:49:48 UTC (rev 595687)
+++ arch-detect.patch	2020-03-13 08:50:07 UTC (rev 595688)
@@ -1,32 +0,0 @@
-From b15594e90a8de4a9cd844bc80388e7b64fc4a51a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at archlinux.org>
-Date: Fri, 16 Aug 2019 14:20:19 -0400
-Subject: [PATCH] add pacman capability to debootstrap architecture detection
-
----
- debootstrap | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/debootstrap b/debootstrap
-index 29c0443..f9d49a9 100755
---- a/debootstrap
-+++ b/debootstrap
-@@ -506,6 +506,15 @@ 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-conf; then
-+	CARCH=$(pacman-conf Architecture)
-+	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
--- 
-2.22.1
-

Copied: debootstrap/repos/community-any/arch-detect.patch (from rev 595687, debootstrap/trunk/arch-detect.patch)
===================================================================
--- arch-detect.patch	                        (rev 0)
+++ arch-detect.patch	2020-03-13 08:50:07 UTC (rev 595688)
@@ -0,0 +1,32 @@
+From b15594e90a8de4a9cd844bc80388e7b64fc4a51a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Fri, 16 Aug 2019 14:20:19 -0400
+Subject: [PATCH] add pacman capability to debootstrap architecture detection
+
+---
+ debootstrap | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/debootstrap b/debootstrap
+index 29c0443..f9d49a9 100755
+--- a/debootstrap
++++ b/debootstrap
+@@ -506,6 +506,15 @@ 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-conf; then
++	CARCH=$(pacman-conf Architecture)
++	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
+-- 
+2.22.1
+