From 94a2e22b20c2b280399aa94d8011204fb93fb446 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Wed, 8 Jul 2020 15:38:55 -0400
Subject: addpkg: nonsystemd/devtools 20200407-1.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>
---
 nonsystemd/devtools/PKGBUILD         | 51 ++++++++++++++++++++++++++++++++++++
 nonsystemd/devtools/nonsystemd.patch | 43 ++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 nonsystemd/devtools/PKGBUILD
 create mode 100644 nonsystemd/devtools/nonsystemd.patch

(limited to 'nonsystemd/devtools')

diff --git a/nonsystemd/devtools/PKGBUILD b/nonsystemd/devtools/PKGBUILD
new file mode 100644
index 000000000..02128a954
--- /dev/null
+++ b/nonsystemd/devtools/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: David P. <megver83@parabola.nu>
+
+pkgname=devtools
+pkgver=20200407
+pkgrel=1
+pkgrel+=.nonsystemd1
+pkgdesc='Tools for Arch Linux package maintainers'
+arch=('any')
+license=('GPL')
+url='https://git.archlinux.org/devtools.git/'
+depends=('bash' 'openssh' 'subversion' 'rsync' 'arch-install-scripts'
+         'git' 'bzr' 'mercurial' 'diffutils' 'util-linux' 'awk')
+depends+=('chroot-nspawn')
+makedepends=('asciidoc')
+optdepends=('btrfs-progs: btrfs support')
+source=(https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
+source+=(nonsystemd.patch)
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
+              '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
+              '86CFFCA918CF3AF47147588051E8B148A9999C34'
+              '8FC15A064950A99DD1BD14DD39E4B877E62EB915'
+              '8218F88849AAC522E94CF470A5E9288C4FA415FA'
+              'B81B051F2D7FC867AAFF35A58DBD63B82072D77A'
+              'F3691687D867B81B51CE07D9BBE43771487328A9'
+              '6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'
+              'E240B57E2C4630BA768E2F26FC1B547C8D8172C8')
+sha256sums=('313d48136b5f518ccd3d108c1f16de6938da83d12b083b8ec32ff381ee5b008e'
+            'SKIP'
+            'af85e283950e2c786fe385255bc8f8daa1f6dba68ad15f9a819de9d32addb77b')
+b2sums=('01ff4d17a9502df468d545e273e94ab7d7b6817efa6d7f2fe661b4a978a5051a03a8a04ea1e82902b30988413f32f65afdf49a234d82ab05fa510ffc52f62e02'
+        'SKIP'
+        '2ceefecf83fdc7a302284b532757a61c36baa81e27a7e20337f57585d865ad5dd2ba8cb84378163cd3894899fdeb61a343fcc327a06faea62a5ba1b74a02dcac')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../nonsystemd.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make PREFIX=/usr
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/nonsystemd/devtools/nonsystemd.patch b/nonsystemd/devtools/nonsystemd.patch
new file mode 100644
index 000000000..ff93aa9f4
--- /dev/null
+++ b/nonsystemd/devtools/nonsystemd.patch
@@ -0,0 +1,43 @@
+diff --git a/arch-nspawn.in b/arch-nspawn.in
+index cde1f60..03dc29c 100644
+--- a/arch-nspawn.in
++++ b/arch-nspawn.in
+@@ -23,8 +23,8 @@ files=()
+ mount_args=()
+ 
+ usage() {
+-	echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
+-	echo "A wrapper around systemd-nspawn. Provides support for pacman."
++	echo "Usage: ${0##*/} [options] working-dir [chroot-nspawn arguments]"
++	echo "A wrapper around chroot-nspawn. Provides support for pacman."
+ 	echo
+ 	echo ' options:'
+ 	echo '    -C <file>     Location of a pacman config file'
+@@ -124,10 +124,13 @@ fi
+ copy_hostconf
+ 
+ eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
++case "$CARCH" in
++        armv7h) CARCH=armv7l;;
++esac
+ 
+ [[ -z $nosetarch ]] || unset CARCH
+ 
+-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
++exec ${CARCH:+setarch "$CARCH"} chroot-nspawn -q \
+ 	-D "$working_dir" \
+ 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
+ 	--register=no --keep-unit --as-pid2 \
+diff --git a/mkarchroot.in b/mkarchroot.in
+index 37f6802..d20a859 100644
+--- a/mkarchroot.in
++++ b/mkarchroot.in
+@@ -97,8 +97,6 @@ printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
+ echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
+ echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
+ 
+-systemd-machine-id-setup --root="$working_dir"
+-
+ exec arch-nspawn \
+ 	"${nspawn_args[@]}" \
+ 	"$working_dir" locale-gen
-- 
cgit v1.2.3