ArchPOWER/packages
1
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 18 Wiki Activity

* update debootstrap to 1.0.137-1

Browse Source
This commit is contained in:
Alexander Baldeck 2024-10-10 09:06:05 +02:00
parent 24b5d010d6
commit 1bf309f1a8
3 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debootstrap/.SRCINFO Normal file
View File

@ -0,0 +1,21 @@
pkgbase = debootstrap
pkgdesc = Bootstrap a basic Debian system
pkgver = 1.0.137
pkgrel = 1
url = https://tracker.debian.org/pkg/debootstrap
arch = any
license = GPL
makedepends = git
depends = distro-info
depends = perl
depends = wget
optdepends = gnupg: check release signatures
optdepends = debian-archive-keyring: check release signatures for Debian
optdepends = debian-ports-archive-keyring: check release signatures for Debian Ports
optdepends = ubuntu-keyring: check release signatures for Ubuntu
source = git+https://salsa.debian.org/installer-team/debootstrap.git#tag=1.0.137
source = arch-detect.patch
sha512sums = 7eb537510c6b05751a413ef32d255f7479dbbccc6702e503ecf00d71cfa17e225981fb6f04c851f5ec9b162df8631d29e3dd75789d0c3d63493375b179496986
sha512sums = b1fdff6142326c2a5075e457181a85cb2a37848c777f128f4c0eb3740980784d25d4f143a76b97c90ef252463cc5d8bd0797b2544c27b6dd8e05a6258a6b0c02
pkgname = debootstrap

19
debootstrap/PKGBUILD
View File

@ -2,24 +2,25 @@
# Maintainer: Felix Yan <felixonmars@archlinux.org> # Maintainer: Felix Yan <felixonmars@archlinux.org>
pkgname=debootstrap pkgname=debootstrap
pkgver=1.0.134 pkgver=1.0.137
pkgrel=2 pkgrel=1
pkgdesc="Bootstrap a basic Debian system" pkgdesc="Bootstrap a basic Debian system"
arch=(any) arch=(any)
license=('GPL') license=('GPL')
url="https://tracker.debian.org/pkg/debootstrap" url="https://tracker.debian.org/pkg/debootstrap"
depends=('perl' 'wget' 'binutils') depends=('distro-info' 'perl' 'wget')
source=(https://salsa.debian.org/installer-team/debootstrap/-/archive/$pkgver/debootstrap-$pkgver.tar.bz2 makedepends=('git')
source=(git+https://salsa.debian.org/installer-team/debootstrap.git#tag=$pkgver
arch-detect.patch) arch-detect.patch)
optdepends=('gnupg: check release signatures' optdepends=('gnupg: check release signatures'
'debian-archive-keyring: check release signatures for Debian' 'debian-archive-keyring: check release signatures for Debian'
'debian-ports-archive-keyring: check release signatures for Debian Ports' 'debian-ports-archive-keyring: check release signatures for Debian Ports'
'ubuntu-keyring: check release signatures for Ubuntu') 'ubuntu-keyring: check release signatures for Ubuntu')
sha512sums=('e7b9726632d3816975c8cbd0020882f69db6d2a84f6c2d086a4e002c58afa61f8b08a8a35b40dd6a284e2cdb584817292462e5dc354fb83d177d50a56aa8cda6' sha512sums=('7eb537510c6b05751a413ef32d255f7479dbbccc6702e503ecf00d71cfa17e225981fb6f04c851f5ec9b162df8631d29e3dd75789d0c3d63493375b179496986'
'247132de66fed4219799af07dfbdc0d1371ca53f429207cd7e0cd24c205e050f73864381a18c578b47762395a4d7bf5adc7970437fef24764417cbb0afd31a04') 'fce304545bb9dd5fc024b836237588baaac64365c715c464b03fdc0077062dfc151184c6f575a5f64c332ea9396cc7bffbd0ffccee01804b4471391d0ea39b89')
prepare() { prepare() {
cd debootstrap-$pkgver cd debootstrap
sed -i 's/sbin/bin/g' Makefile sed -i 's/sbin/bin/g' Makefile
@ -27,11 +28,11 @@ prepare() {
sed -i 's|export PATH|export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"|' debootstrap sed -i 's|export PATH|export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"|' debootstrap
# Detect Architecture # Detect Architecture
patch -p1 -i ../arch-detect.patch #patch -p0 -i ../arch-detect.patch
} }
package() { package() {
cd debootstrap-$pkgver cd debootstrap
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
install -Dm644 debootstrap.8 "$pkgdir"/usr/share/man/man8/debootstrap.8 install -Dm644 debootstrap.8 "$pkgdir"/usr/share/man/man8/debootstrap.8

32
debootstrap/arch-detect.patch
View File

@ -1,22 +1,24 @@
--- debootstrap-1.0.133.orig/debootstrap 2024-02-12 16:27:48.395141268 +0100 diff -ruN debootstrap.orig/debootstrap debootstrap/debootstrap
+++ debootstrap-1.0.133/debootstrap 2024-02-12 16:28:43.181616352 +0100 --- debootstrap.orig/debootstrap 2024-10-10 09:01:13.476774575 +0200
@@ -547,6 +547,19 @@ +++ debootstrap/debootstrap 2024-10-10 09:01:54.564520315 +0200
@@ -553,6 +553,20 @@
HOST_ARCH=$(/usr/bin/udpkg --print-architecture) HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch") HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
+elif in_path pacman-conf; then +elif in_path pacman-conf; then
+ CARCH=$(pacman-conf Architecture) + CARCH=$(pacman-conf Architecture)
+ case $CARCH in + case $CARCH in
+ i686) HOST_ARCH=i386 ;; + i686) HOST_ARCH=i386 ;;
+ x86_64) HOST_ARCH=amd64 ;; + x86_64) HOST_ARCH=amd64 ;;
+ armv7h) HOST_ARCH=armhf ;; + armv7h) HOST_ARCH=armhf ;;
+ aarch64) HOST_ARCH=arm64 ;; + aarch64) HOST_ARCH=arm64 ;;
+ powerpc) HOST_ARCH=powerpc ;; + loong64) HOST_ARCH=loong64 ;;
+ powerpc64) HOST_ARCH=powerpc64 ;; + powerpc) HOST_ARCH=powerpc ;;
+ powerpc64le) HOST_ARCH=powerpc64le ;; + powerpc64) HOST_ARCH=powerpc64 ;;
+ riscv64) HOST_ARCH=riscv64 ;; + powerpc64le) HOST_ARCH=powerpc64le ;;
+ *) echo "Unknown architecture: $CARCH" && exit 1 + riscv64) HOST_ARCH=riscv64 ;;
+ esac + *) echo "Unknown architecture: $CARCH" && exit 1
+ esac
fi fi
HOST_OS="$HOST_ARCH" HOST_OS="$HOST_ARCH"
# basic host OS guessing for non-Debian systems # basic host OS guessing for non-Debian systems