[arch-commits] Commit in debootstrap/trunk (PKGBUILD arch-detect.patch)

2019-08-16 Thread Eli Schwartz via arch-commits 
Date: Friday, August 16, 2019 @ 18:28:02
  Author: eschwartz
Revision: 499887

update arch-detection patch to make use of pacman-conf

pacman 5.1 is a thing, now

Modified:
  debootstrap/trunk/PKGBUILD
  debootstrap/trunk/arch-detect.patch

---+
 PKGBUILD  |2 +-
 arch-detect.patch |   31 +--
 2 files changed, 22 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-16 15:43:24 UTC (rev 499886)
+++ PKGBUILD2019-08-16 18:28:02 UTC (rev 499887)
@@ -14,7 +14,7 @@
 'debian-archive-keyring: check release signatures for Debian'
 'ubuntu-keyring: check release signatures for Ubuntu')
 
sha512sums=('36310ae320abce915fa39204a92a90bcbf8ebee864a550097fef2266df64c510304cc220d56bd4a092fa3b3f43864931170f8b25ca7ae585e0018d7a44f3c1df'
-
'56e25f48027f99f7e720859a9e14fe769b1cbd6227c7a7e27e14c2fea88520109342d6e5b127dc34ce8cc40f46941a0c5157ad35cf8ef9b3e4323877a4b32d97')
+
'd70a9d096d1692f71970cc818515bd783a6031bfe2d2857134eabf6fd36e4137152ebafa8e2d4ae7c8cb442c8532cd4192715b286e38b4d947b0b467e9ed54a5')
 
 prepare() {
   cd debootstrap-$pkgver

Modified: arch-detect.patch
===
--- arch-detect.patch   2019-08-16 15:43:24 UTC (rev 499886)
+++ arch-detect.patch   2019-08-16 18:28:02 UTC (rev 499887)
@@ -1,21 +1,32 @@
+From b15594e90a8de4a9cd844bc80388e7b64fc4a51a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+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 fcdb20f..184900d 100755
+index 29c0443..f9d49a9 100755
 --- a/debootstrap
 +++ b/debootstrap
-@@ -427,6 +427,16 @@ elif in_path udpkg && \
+@@ -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; 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" ;;
++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
+

[arch-commits] Commit in debootstrap/trunk (PKGBUILD arch-detect.patch)

2018-05-17 Thread Felix Yan via arch-commits 
Date: Thursday, May 17, 2018 @ 06:40:43
  Author: felixonmars
Revision: 323326

upgpkg: debootstrap 1.0.99-1

Modified:
  debootstrap/trunk/PKGBUILD
  debootstrap/trunk/arch-detect.patch

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

Modified: PKGBUILD
===
--- PKGBUILD2018-05-17 06:40:33 UTC (rev 323325)
+++ PKGBUILD2018-05-17 06:40:43 UTC (rev 323326)
@@ -2,7 +2,7 @@
 # Maintainer: Felix Yan 
 
 pkgname=debootstrap
-pkgver=1.0.96
+pkgver=1.0.99
 pkgrel=1
 pkgdesc="Bootstrap a basic Debian system"
 arch=('any')
@@ -14,8 +14,8 @@
 optdepends=('gnupg: check release signatures'
 'debian-archive-keyring: check release signatures for Debian'
 'ubuntu-keyring: check release signatures for Ubuntu')
-sha512sums=('f0cc0363aa122dfcff0c8b2853a0b1c7aaff052374842554fa7f1904bb9ded6fa0965850bbf3fdbfdefdd21b01dcb5710449d040c6292606f645370b7ced4a23'
-
'824109b2ea138d0dd1a31039a165cb4079da856cb11c664fc5a7f49a42de08ff56a620887d3c0914b69140849799f4473b1f27a05cd14cd60ef2a41627f8d5e1')
+sha512sums=('011c38e1cf6d402032b8e44253fa278dd39bf19b90390a81be28eae2689dc0a46aefb06084eb75c770c7fdfc864e70e2b1b399c3fe02172ba5d9ef97b4348eb7'
+
'56e25f48027f99f7e720859a9e14fe769b1cbd6227c7a7e27e14c2fea88520109342d6e5b127dc34ce8cc40f46941a0c5157ad35cf8ef9b3e4323877a4b32d97')
 
 prepare() {
   cd debootstrap-$pkgver

Modified: arch-detect.patch
===
--- arch-detect.patch   2018-05-17 06:40:33 UTC (rev 323325)
+++ arch-detect.patch   2018-05-17 06:40:43 UTC (rev 323326)
@@ -3,9 +3,9 @@
 --- 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`
+   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')"

[arch-commits] Commit in debootstrap/trunk (PKGBUILD arch-detect.patch)

2018-02-07 Thread Eli Schwartz via arch-commits 
Date: Wednesday, February 7, 2018 @ 15:52:41
  Author: eschwartz
Revision: 290017

upgpkg: debootstrap 1.0.93-2

FS#48908 fix sourcing bashisms in a script using #!/bin/sh

Modified:
  debootstrap/trunk/PKGBUILD
  debootstrap/trunk/arch-detect.patch

---+
 PKGBUILD  |4 ++--
 arch-detect.patch |   25 ++---
 2 files changed, 16 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-07 15:28:28 UTC (rev 290016)
+++ PKGBUILD2018-02-07 15:52:41 UTC (rev 290017)
@@ -3,7 +3,7 @@
 
 pkgname=debootstrap
 pkgver=1.0.93
-pkgrel=1
+pkgrel=2
 pkgdesc="Bootstrap a basic Debian system"
 arch=('any')
 license=('GPL')
@@ -15,7 +15,7 @@
 'debian-archive-keyring: check release signatures for Debian'
 'ubuntu-keyring: check release signatures for Ubuntu')
 
sha512sums=('57a6aa5d27b1b600f49db847b238e412a9819c45e4dbc63943bb7c6a738f4d97befc2a9d25575a6d619bdc64e838654fa629573ee5fe95c6bc56758a1b8b'
-
'9e4c805b174eeb9ecab13701249c56542c1dc0c371df5f708540d17959f89de80763c4311972abb8f1d4f82b13080f7aa835028c1e5016ee17eebc32c8daa6e7')
+
'824109b2ea138d0dd1a31039a165cb4079da856cb11c664fc5a7f49a42de08ff56a620887d3c0914b69140849799f4473b1f27a05cd14cd60ef2a41627f8d5e1')
 
 prepare() {
   cd debootstrap-$pkgver

Modified: arch-detect.patch
===
--- arch-detect.patch   2018-02-07 15:28:28 UTC (rev 290016)
+++ arch-detect.patch   2018-02-07 15:52:41 UTC (rev 290017)
@@ -1,18 +1,21 @@
 a/debootstrap  2016-03-22 21:13:58.0 +0800
-+++ b/debootstrap  2016-03-22 21:13:09.573621800 +0800
-@@ -419,6 +419,15 @@
+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
-+  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
++  # 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

[arch-commits] Commit in debootstrap/trunk (PKGBUILD arch-detect.patch)

2016-10-06 Thread Felix Yan 
Date: Thursday, October 6, 2016 @ 07:38:31
  Author: felixonmars
Revision: 191454

upgpkg: debootstrap 1.0.84-1

Modified:
  debootstrap/trunk/PKGBUILD
  debootstrap/trunk/arch-detect.patch

---+
 PKGBUILD  |4 ++--
 arch-detect.patch |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-06 04:54:05 UTC (rev 191453)
+++ PKGBUILD2016-10-06 07:38:31 UTC (rev 191454)
@@ -2,7 +2,7 @@
 # Maintainer: Felix Yan 
 
 pkgname=debootstrap
-pkgver=1.0.83
+pkgver=1.0.84
 pkgrel=1
 pkgdesc="Bootstrap a basic Debian system"
 arch=('any')
@@ -16,7 +16,7 @@
 'debian-archive-keyring: check release signatures for Debian'
 'ubuntu-keyring: check release signatures for Ubuntu')
 md5sums=('SKIP'
- '60043aaeb9afc1c2d7d2a2d9888eca35')
+ 'af21c8c6e073dbedcd472d876f5a50c2')
 
 prepare() {
   cd debootstrap

Modified: arch-detect.patch
===
--- arch-detect.patch   2016-10-06 04:54:05 UTC (rev 191453)
+++ arch-detect.patch   2016-10-06 07:38:31 UTC (rev 191454)
@@ -1,6 +1,6 @@
 --- a/debootstrap  2016-03-22 21:13:58.0 +0800
 +++ b/debootstrap  2016-03-22 21:13:09.573621800 +0800
-@@ -419,6 +419,14 @@
+@@ -419,6 +419,15 @@
HOST_ARCH=`/usr/bin/udpkg --print-architecture`
  elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
@@ -10,6 +10,7 @@
 +"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