Date: Friday, September 9, 2016 @ 06:42:49
Author: felixonmars
Revision: 189042
archrelease: copy trunk to community-any
Added:
debootstrap/repos/community-any/PKGBUILD
(from rev 189041, debootstrap/trunk/PKGBUILD)
debootstrap/repos/community-any/arch-detect.patch
(from rev 189041, debootstrap/trunk/arch-detect.patch)
Deleted:
debootstrap/repos/community-any/PKGBUILD
debootstrap/repos/community-any/arch-detect.patch
-------------------+
PKGBUILD | 100 ++++++++++++++++++++++++++--------------------------
arch-detect.patch | 34 ++++++++---------
2 files changed, 67 insertions(+), 67 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-09-09 06:42:30 UTC (rev 189041)
+++ PKGBUILD 2016-09-09 06:42:49 UTC (rev 189042)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-
-pkgname=debootstrap
-pkgver=1.0.81
-pkgrel=1
-pkgdesc="Bootstrap a basic Debian system"
-arch=('any')
-license=('GPL')
-url="https://tracker.debian.org/pkg/debootstrap";
-depends=('wget' 'binutils')
-makedepends=('git' 'makedev')
-source=("git+https://anonscm.debian.org/git/d-i/debootstrap.git#tag=$pkgver";
- arch-detect.patch)
-optdepends=('gnupg: check release signatures'
- 'debian-archive-keyring: check release signatures for Debian'
- 'ubuntu-keyring: check release signatures for Ubuntu')
-md5sums=('SKIP'
- '60043aaeb9afc1c2d7d2a2d9888eca35')
-
-prepare() {
- cd debootstrap
-
- 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
-
- # Workaround permission errors
- # MAKEDEV is not happy with the instructions here
- sed -e 's/install -o root -g root/install/' \
- -e '/chown 0:0 dev/d' \
- -e 's/(cd dev && $(MAKEDEV) std ptmx fd consoleonly)/$(MAKEDEV) -d dev
std ptmx fd consoleonly/' \
- -i Makefile
-}
-
-build() {
- cd debootstrap
- fakeroot make
-}
-
-package() {
- cd debootstrap
- make DESTDIR="$pkgdir" install
-
- install -Dm644 debootstrap.8 "$pkgdir"/usr/share/man/man8/debootstrap.8
-}
Copied: debootstrap/repos/community-any/PKGBUILD (from rev 189041,
debootstrap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-09-09 06:42:49 UTC (rev 189042)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+
+pkgname=debootstrap
+pkgver=1.0.82
+pkgrel=1
+pkgdesc="Bootstrap a basic Debian system"
+arch=('any')
+license=('GPL')
+url="https://tracker.debian.org/pkg/debootstrap";
+depends=('wget' 'binutils')
+makedepends=('git' 'makedev')
+source=("git+https://anonscm.debian.org/git/d-i/debootstrap.git#tag=$pkgver";
+ arch-detect.patch)
+optdepends=('gnupg: check release signatures'
+ 'debian-archive-keyring: check release signatures for Debian'
+ 'ubuntu-keyring: check release signatures for Ubuntu')
+md5sums=('SKIP'
+ '60043aaeb9afc1c2d7d2a2d9888eca35')
+
+prepare() {
+ cd debootstrap
+
+ 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
+
+ # Workaround permission errors
+ # MAKEDEV is not happy with the instructions here
+ sed -e 's/install -o root -g root/install/' \
+ -e '/chown 0:0 dev/d' \
+ -e 's/(cd dev && $(MAKEDEV) std ptmx fd consoleonly)/$(MAKEDEV) -d dev
std ptmx fd consoleonly/' \
+ -i Makefile
+}
+
+build() {
+ cd debootstrap
+ fakeroot make
+}
+
+package() {
+ cd debootstrap
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 debootstrap.8 "$pkgdir"/usr/share/man/man8/debootstrap.8
+}
Deleted: arch-detect.patch
===================================================================
--- arch-detect.patch 2016-09-09 06:42:30 UTC (rev 189041)
+++ arch-detect.patch 2016-09-09 06:42:49 UTC (rev 189042)
@@ -1,17 +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,14 @@
- 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" ;;
-+ *) 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 189041,
debootstrap/trunk/arch-detect.patch)
===================================================================
--- arch-detect.patch (rev 0)
+++ arch-detect.patch 2016-09-09 06:42:49 UTC (rev 189042)
@@ -0,0 +1,17 @@
+--- a/debootstrap 2016-03-22 21:13:58.000000000 +0800
++++ b/debootstrap 2016-03-22 21:13:09.573621800 +0800
+@@ -419,6 +419,14 @@
+ 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" ;;
++ *) echo "Unknown architecture: $CARCH" && exit 1
++ esac
+ fi
+ HOST_OS="$HOST_ARCH"
+ # basic host OS guessing for non-Debian systems
