summaryrefslogtreecommitdiff
path: root/nonsystemd/libretools/nonsystemd.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2021-07-10 16:08:55 -0400
committerDavid P <megver83@parabola.nu>2021-07-10 16:08:55 -0400
commit416f90fe3a38d6421e4b07c4798e8b15a8cb6cd5 (patch)
treeef4753c1abbbf7b30d4352f32547617c13e72890 /nonsystemd/libretools/nonsystemd.patch
parent645d388e34d583cb39a51b500b45674bd8d898eb (diff)
downloadabslibre-416f90fe3a38d6421e4b07c4798e8b15a8cb6cd5.tar.gz
abslibre-416f90fe3a38d6421e4b07c4798e8b15a8cb6cd5.tar.bz2
abslibre-416f90fe3a38d6421e4b07c4798e8b15a8cb6cd5.zip
updpkg: nonsystemd/libretools 20190907-1.nonsystemd1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'nonsystemd/libretools/nonsystemd.patch')
-rw-r--r--nonsystemd/libretools/nonsystemd.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/nonsystemd/libretools/nonsystemd.patch b/nonsystemd/libretools/nonsystemd.patch
deleted file mode 100644
index 24fab7e5a..000000000
--- a/nonsystemd/libretools/nonsystemd.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/INSTALL b/INSTALL
-index a74a376..3623f07 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -71,7 +71,7 @@ main libretools subpackage:
- - GNU Make (only needed for `librefetch`)
- - ssh client (OpenSSH, only needed for `librerelease`)
- - rsync
-- - systemd-nspawn (for the chroot tools)
-+ - chroot-nspawn (for the chroot tools)
- - tokyocabinet
-
- Configuration
-diff --git a/src/chroot-tools/arch-nspawn.in b/src/chroot-tools/arch-nspawn.in
-index 96b3e38..a7d7386 100644
---- a/src/chroot-tools/arch-nspawn.in
-+++ b/src/chroot-tools/arch-nspawn.in
-@@ -18,8 +18,8 @@ working_dir=''
- files=()
-
- 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'
-@@ -116,7 +116,7 @@ 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/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
-index b3cf041..5c3f8f2 100755
---- a/src/chroot-tools/librechroot
-+++ b/src/chroot-tools/librechroot
-@@ -89,7 +89,7 @@ hack_arch_nspawn_flags() {
- prose 'Such a binfmt_misc entry is provided by the %s
- package. If you have it installed, but still see
- this message, you may need to restart %s.' \
-- qemu-user-static-binfmt systemd-binfmt.service
-+ qemu-user-static-binfmt binfmt
- return $EXIT_NOTINSTALLED
- fi
-
-diff --git a/src/chroot-tools/mkarchroot.in b/src/chroot-tools/mkarchroot.in
-index 5165960..f6c6cfa 100644
---- a/src/chroot-tools/mkarchroot.in
-+++ b/src/chroot-tools/mkarchroot.in
-@@ -90,7 +90,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 "$(librelib chroot/arch-nspawn)" \
- ${nosetarch:+-s} \