Date: Wednesday, July 27, 2022 @ 16:22:32
Author: felixonmars
Revision: 1258928
archrelease: copy trunk to community-any
Added:
debootstrap/repos/community-any/PKGBUILD
(from rev 1258927, debootstrap/trunk/PKGBUILD)
debootstrap/repos/community-any/arch-detect.patch
(from rev 1258927, debootstrap/trunk/arch-detect.patch)
Deleted:
debootstrap/repos/community-any/PKGBUILD
debootstrap/repos/community-any/arch-detect.patch
-------------------+
PKGBUILD | 73 ++++++++++++++++++++++++++--------------------------
arch-detect.patch | 64 ++++++++++++++++++++++-----------------------
2 files changed, 69 insertions(+), 68 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-27 16:22:15 UTC (rev 1258927)
+++ PKGBUILD 2022-07-27 16:22:32 UTC (rev 1258928)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-
-pkgname=debootstrap
-pkgver=1.0.127
-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=('4fc5dc23c9a2ab7255d19df74f413e8e17302b57468291da88f5980d48c8a2959e3318829d6eb4cbaf5441d326cbe01ef212d2d1c1f3f41659fbb21861eec904'
-
'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 1258927,
debootstrap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-07-27 16:22:32 UTC (rev 1258928)
@@ -0,0 +1,37 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+
+pkgname=debootstrap
+pkgver=1.0.127
+pkgrel=2
+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'
+ 'debian-ports-archive-keyring: check release signatures for Debian
Ports'
+ 'ubuntu-keyring: check release signatures for Ubuntu')
+sha512sums=('4fc5dc23c9a2ab7255d19df74f413e8e17302b57468291da88f5980d48c8a2959e3318829d6eb4cbaf5441d326cbe01ef212d2d1c1f3f41659fbb21861eec904'
+
'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 2022-07-27 16:22:15 UTC (rev 1258927)
+++ arch-detect.patch 2022-07-27 16:22:32 UTC (rev 1258928)
@@ -1,32 +0,0 @@
-From b15594e90a8de4a9cd844bc80388e7b64fc4a51a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwa...@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 1258927,
debootstrap/trunk/arch-detect.patch)
===================================================================
--- arch-detect.patch (rev 0)
+++ arch-detect.patch 2022-07-27 16:22:32 UTC (rev 1258928)
@@ -0,0 +1,32 @@
+From b15594e90a8de4a9cd844bc80388e7b64fc4a51a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwa...@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
+
