summaryrefslogtreecommitdiff
path: root/nonsystemd
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-08-20 23:21:21 -0300
committerDavid P <megver83@parabola.nu>2018-08-20 23:35:45 -0300
commit4307c2b1cdb299cd12403f499cb3fde70781bd1e (patch)
tree0bd340aafb4ee4fe728c9e480ffef08ea96c2ffc /nonsystemd
parentb0798981ede6248dbe84b3b2422ef7051b146878 (diff)
downloadabslibre-4307c2b1cdb299cd12403f499cb3fde70781bd1e.tar.gz
abslibre-4307c2b1cdb299cd12403f499cb3fde70781bd1e.tar.bz2
abslibre-4307c2b1cdb299cd12403f499cb3fde70781bd1e.zip
upgpkg: nonsystemd/libretools 20180815-1.nonsystemd1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'nonsystemd')
-rw-r--r--nonsystemd/libretools/PKGBUILD66
-rw-r--r--nonsystemd/libretools/Remove-systemd-support.patch49
2 files changed, 47 insertions, 68 deletions
diff --git a/nonsystemd/libretools/PKGBUILD b/nonsystemd/libretools/PKGBUILD
index c3a7710af..5d890e681 100644
--- a/nonsystemd/libretools/PKGBUILD
+++ b/nonsystemd/libretools/PKGBUILD
@@ -4,20 +4,49 @@
# Contributor: Márcio Silva <coadde@hyperbola.info>
pkgname=libretools
-pkgver=20180520
+pkgver=20180815
pkgrel=1
pkgrel+=.nonsystemd1
pkgdesc="Programs for Parabola development"
arch=('any')
url="https://git.parabola.nu/packages/libretools.git/"
license=('GPL3' 'GPL2')
+backup=(etc/libretools.conf
+ etc/libretools.d/chroot.conf
+ etc/libretools.d/libredbdiff.conf
+ etc/libretools.d/librefetch.conf)
+install=libretools.install
+conflicts=(devtools libretools-mips64el)
+replaces=(libretools-mips64el)
+depends=(
+ "librelib=$pkgver"
+ 'pacman>=5.1' 'pacman<5.2'
+ arch-install-scripts # `mkarchroot` uses `pacstrap`
+ binutils # `libremakepkg` uses `makepkg` uses `strip`
+ expac # `libredbdiff`
+ fakeroot # `libremakepkg` uses `makepkg` uses `fakeroot`
+ make # `librefetch`
+ openssh # `librerelease`
+ rsync # `librerelease` and `makechrootpkg.sh`
+ chroot-nspawn # chroot-nspawn
+ tokyocabinet # `toru`
+ #namcap # Namcap is currently dissabled in libremakepkg :-(
+ subversion # `diff-unfree`
+ wget # `aur`, optdepend for librelib:`blacklist`
+)
+optdepends=('qemu-user-static-binfmt: To build ARM packages from x86')
makedepends=(ruby-ronn)
-checkdepends=(sh-roundup git expac tokyocabinet)
+checkdepends=(
+ sh-roundup git
+ 'pacman>=5.1' 'pacman<5.2'
+ expac
+ tokyocabinet
+)
source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
Remove-systemd-support.patch)
-sha256sums=('784047edc25afbfb294980287b8f04c52cde527f5e1eca9ac0b63f0f89383db9'
+sha256sums=('787907a2cbc9a2aafece5e31543a93c17ca91aa6a0b714e0c6bc158df75d9b2a'
'SKIP'
- '6042a1f468b5a9969f74069b19e643746bbec739cd28d066c3c3b7d96260e43e')
+ '4257e7c5383df8c322d79f8e601893f71eeccbd1b9ceac76c8ebbc90fb609875')
validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
build() {
@@ -35,34 +64,7 @@ check() {
SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
}
-package_libretools() {
- backup=(etc/libretools.conf
- etc/libretools.d/chroot.conf
- etc/libretools.d/libredbdiff.conf
- etc/libretools.d/librefetch.conf)
- install=libretools.install
- conflicts=(devtools libretools-mips64el)
- replaces=(libretools-mips64el)
-
- depends=(
- "librelib=$pkgver"
- "xbs=$pkgver" # `createworkdir`, `librestage`
- 'pacman>=5.0.1-2.parabola4' 'pacman<5.1'
- arch-install-scripts # `mkarchroot` uses `pacstrap`
- expac # `libredbdiff`
- make # `librefetch`
- openssh # `librerelease`
- rsync # `librerelease` and `makechrootpkg.sh`
- chroot-nspawn # chroot-nspawn
- tokyocabinet # `toru`
- #namcap # Namcap is currently dissabled in libremakepkg :-(
- #subversion # `diff-unfree` # ignore because of xbs
- wget # `aur`, optdepend for librelib:`blacklist`
- )
- optdepends=(
- 'qemu-user-static-binfmt: To build ARM packages from x86'
- )
-
+package() {
cd "$srcdir/$pkgbase-$pkgver"
make install-libretools DESTDIR="$pkgdir"
}
diff --git a/nonsystemd/libretools/Remove-systemd-support.patch b/nonsystemd/libretools/Remove-systemd-support.patch
index 0e1eb0311..89090b171 100644
--- a/nonsystemd/libretools/Remove-systemd-support.patch
+++ b/nonsystemd/libretools/Remove-systemd-support.patch
@@ -1,6 +1,6 @@
-From 16e877ff4f66de4a24b614ea74adb9f35142f06f Mon Sep 17 00:00:00 2001
+From bd3b3ab9bf12ad1293cd2d5eaaa44c40545bfdc5 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
-Date: Sat, 12 May 2018 13:53:09 -0300
+Date: Mon, 20 Aug 2018 23:17:48 -0300
Subject: [PATCH] Remove systemd support
Libretools uses systemd-nspawn and systemd-id-machine-setup
@@ -10,17 +10,17 @@ with chroot-nspawn
Signed-off-by: David P <megver83@parabola.nu>
---
- INSTALL | 2 +-
- src/chroot-tools/arch-nspawn.in | 6 +++---
- src/chroot-tools/librechroot | 18 +++++++++---------
- src/chroot-tools/mkarchroot.in | 2 --
- 4 files changed, 13 insertions(+), 15 deletions(-)
+ INSTALL | 2 +-
+ src/chroot-tools/arch-nspawn.in | 6 +++---
+ src/chroot-tools/librechroot | 2 +-
+ src/chroot-tools/mkarchroot.in | 2 --
+ 4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/INSTALL b/INSTALL
-index e91f1ea..b8516ec 100644
+index a74a376..3623f07 100644
--- a/INSTALL
+++ b/INSTALL
-@@ -76,7 +76,7 @@ main libretools subpackage:
+@@ -71,7 +71,7 @@ main libretools subpackage:
- GNU Make (only needed for `librefetch`)
- ssh client (OpenSSH, only needed for `librerelease`)
- rsync
@@ -30,7 +30,7 @@ index e91f1ea..b8516ec 100644
Configuration
diff --git a/src/chroot-tools/arch-nspawn.in b/src/chroot-tools/arch-nspawn.in
-index c448056..a90b90a 100644
+index 96b3e38..a7d7386 100644
--- a/src/chroot-tools/arch-nspawn.in
+++ b/src/chroot-tools/arch-nspawn.in
@@ -18,8 +18,8 @@ working_dir=''
@@ -44,7 +44,7 @@ index c448056..a90b90a 100644
echo
echo ' options:'
echo ' -C <file> Location of a pacman config file'
-@@ -115,7 +115,7 @@ esac
+@@ -116,7 +116,7 @@ esac
[[ -z $nosetarch ]] || unset CARCH
@@ -54,7 +54,7 @@ index c448056..a90b90a 100644
-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 868741f..f81fbca 100755
+index 5d1db21..39dfc08 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -89,7 +89,7 @@ hack_arch_nspawn_flags() {
@@ -66,29 +66,6 @@ index 868741f..f81fbca 100755
return $EXIT_NOTINSTALLED
fi
-@@ -405,14 +405,14 @@ main() {
- umask 0022
-
- # XXX: SYSTEMD-STDIN HACK
-- if ! [[ -t 0 ]]; then
-- error "Input is not a TTY"
-- plain "https://labs.parabola.nu/issues/431"
-- plain "https://bugs.freedesktop.org/show_bug.cgi?id=70290"
-- prose "Due to a bug in systemd-nspawn, redirecting stdin is not
-- supported." >&2
-- return $EXIT_FAILURE
-- fi
-+# if ! [[ -t 0 ]]; then
-+# error "Input is not a TTY"
-+# plain "https://labs.parabola.nu/issues/431"
-+# plain "https://bugs.freedesktop.org/show_bug.cgi?id=70290"
-+# prose "Due to a bug in systemd-nspawn, redirecting stdin is not
-+# supported." >&2
-+# return $EXIT_FAILURE
-+# fi
-
- # Keep this lock for as long as we are running
- # Note that '9' is the same FD number as in mkarchroot et al.
diff --git a/src/chroot-tools/mkarchroot.in b/src/chroot-tools/mkarchroot.in
index 5165960..7ac9d1c 100644
--- a/src/chroot-tools/mkarchroot.in
@@ -103,5 +80,5 @@ index 5165960..7ac9d1c 100644
${nosetarch:+-s} \
${pac_conf:+-C "$pac_conf"} \
--
-2.17.0
+2.18.0