summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nonsystemd/devtools/PKGBUILD10
-rw-r--r--nonsystemd/devtools/nonsystemd.patch8
2 files changed, 9 insertions, 9 deletions
diff --git a/nonsystemd/devtools/PKGBUILD b/nonsystemd/devtools/PKGBUILD
index 02128a954..b1bd75d71 100644
--- a/nonsystemd/devtools/PKGBUILD
+++ b/nonsystemd/devtools/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: David P. <megver83@parabola.nu>
pkgname=devtools
-pkgver=20200407
+pkgver=20210202
pkgrel=1
pkgrel+=.nonsystemd1
pkgdesc='Tools for Arch Linux package maintainers'
@@ -26,12 +26,12 @@ validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
'F3691687D867B81B51CE07D9BBE43771487328A9'
'6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'
'E240B57E2C4630BA768E2F26FC1B547C8D8172C8')
-sha256sums=('313d48136b5f518ccd3d108c1f16de6938da83d12b083b8ec32ff381ee5b008e'
+sha256sums=('ad1a65f0f349093b557bd6f45fd5f84ba2be246702908193ae7351457a218d6e'
'SKIP'
- 'af85e283950e2c786fe385255bc8f8daa1f6dba68ad15f9a819de9d32addb77b')
-b2sums=('01ff4d17a9502df468d545e273e94ab7d7b6817efa6d7f2fe661b4a978a5051a03a8a04ea1e82902b30988413f32f65afdf49a234d82ab05fa510ffc52f62e02'
+ '14d303c95a75cd929a65662680638af9ebd80be6e168a827d77fa69f2abc5e31')
+b2sums=('b3f388b928f91a230e0fbc406cdeccd81d3688d5f5a6e9c7928994c680f22b4162e0cce07bb7d84e0c5bb2850cd92b35a531ca5bc8ca9b7d97a278e9f3787f45'
'SKIP'
- '2ceefecf83fdc7a302284b532757a61c36baa81e27a7e20337f57585d865ad5dd2ba8cb84378163cd3894899fdeb61a343fcc327a06faea62a5ba1b74a02dcac')
+ '14c831c5a63821d678fe8b283467030a44aef1c0184981f4aa9644190ba9262482bee9a5ffee1d0b2d11cb582177e3142487c97a2206a09f424ca6371690fa12')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/nonsystemd/devtools/nonsystemd.patch b/nonsystemd/devtools/nonsystemd.patch
index ff93aa9f4..9abdaaef5 100644
--- a/nonsystemd/devtools/nonsystemd.patch
+++ b/nonsystemd/devtools/nonsystemd.patch
@@ -29,15 +29,15 @@ index cde1f60..03dc29c 100644
-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
+index 37f6802..d5dc9c7 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"
+@@ -97,7 +97,7 @@ 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"
--
++dbus-uuidgen --ensure="$working_dir/etc/machine-id"
+
exec arch-nspawn \
"${nspawn_args[@]}" \
- "$working_dir" locale-gen