[arch-commits] Commit in debootstrap/repos/community-any (4 files)
Felix Yan
felixonmars at archlinux.org
Wed Jul 26 09:26:34 UTC 2017
Date: Wednesday, July 26, 2017 @ 09:26:33
Author: felixonmars
Revision: 246422
archrelease: copy trunk to community-any
Added:
debootstrap/repos/community-any/PKGBUILD
(from rev 246421, debootstrap/trunk/PKGBUILD)
debootstrap/repos/community-any/arch-detect.patch
(from rev 246421, debootstrap/trunk/arch-detect.patch)
Deleted:
debootstrap/repos/community-any/PKGBUILD
debootstrap/repos/community-any/arch-detect.patch
-------------------+
PKGBUILD | 74 ++++++++++++++++++++++++++--------------------------
arch-detect.patch | 36 ++++++++++++-------------
2 files changed, 55 insertions(+), 55 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-26 09:26:00 UTC (rev 246421)
+++ PKGBUILD 2017-07-26 09:26:33 UTC (rev 246422)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=debootstrap
-pkgver=1.0.90
-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=('b457ed6c20ada6f5bd2810bf3eea4ad168bb5bb0d1418e07c459b5c2a5dff70bdd7d79931eff777676c896e8fede198b78825a9d07fb2ceb96c4442c9b4aa97d'
- '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 246421, debootstrap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-07-26 09:26:33 UTC (rev 246422)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=debootstrap
+pkgver=1.0.91
+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=('038d53a5f1e9c77b03695ee27aed3c5db9c8e09ae6b03a4720f52587677b5c19c62f4396920ca452dc7cd865d7ddf59239c451cf82908497f257b339cc54aa5b'
+ '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
+}
Deleted: arch-detect.patch
===================================================================
--- arch-detect.patch 2017-07-26 09:26:00 UTC (rev 246421)
+++ arch-detect.patch 2017-07-26 09:26:33 UTC (rev 246422)
@@ -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 246421, debootstrap/trunk/arch-detect.patch)
===================================================================
--- arch-detect.patch (rev 0)
+++ arch-detect.patch 2017-07-26 09:26:33 UTC (rev 246422)
@@ -0,0 +1,18 @@
+--- 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
More information about the arch-commits
mailing list