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

Felix Yan felixonmars at archlinux.org
Sat Dec 1 06:10:45 UTC 2018


    Date: Saturday, December 1, 2018 @ 06:10:45
  Author: felixonmars
Revision: 410665

archrelease: copy trunk to community-any

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-01 06:10:31 UTC (rev 410664)
+++ PKGBUILD	2018-12-01 06:10:45 UTC (rev 410665)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=debootstrap
-pkgver=1.0.110
-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=('e687bd3ca43f41f2f2d196b1519e6a7cc3a3e63d9b2e50c808a7508ff90aece4499d61f613a872325df27e44b723e9157a27f85f0e0aa355e49017f84bbb1561'
-            '56e25f48027f99f7e720859a9e14fe769b1cbd6227c7a7e27e14c2fea88520109342d6e5b127dc34ce8cc40f46941a0c5157ad35cf8ef9b3e4323877a4b32d97')
-
-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 410664, debootstrap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-01 06:10:45 UTC (rev 410665)
@@ -0,0 +1,36 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=debootstrap
+pkgver=1.0.111
+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=('495d0f8d42efde933ca9d2581d6ed4aec18648abbb777890071645949bcc4af2aefa621360642a5269fdf915155f1b26d827f0825a69488fba3562cc80622ead'
+            '56e25f48027f99f7e720859a9e14fe769b1cbd6227c7a7e27e14c2fea88520109342d6e5b127dc34ce8cc40f46941a0c5157ad35cf8ef9b3e4323877a4b32d97')
+
+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-12-01 06:10:31 UTC (rev 410664)
+++ arch-detect.patch	2018-12-01 06:10:45 UTC (rev 410665)
@@ -1,21 +0,0 @@
-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

Copied: debootstrap/repos/community-any/arch-detect.patch (from rev 410664, debootstrap/trunk/arch-detect.patch)
===================================================================
--- arch-detect.patch	                        (rev 0)
+++ arch-detect.patch	2018-12-01 06:10:45 UTC (rev 410665)
@@ -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


More information about the arch-commits mailing list