diff options
Diffstat (limited to 'nonsystemd')
| -rw-r--r-- | nonsystemd/libretools/PKGBUILD | 132 | ||||
| -rw-r--r-- | nonsystemd/libretools/nonsystemd.patch | 63 |
2 files changed, 115 insertions, 80 deletions
diff --git a/nonsystemd/libretools/PKGBUILD b/nonsystemd/libretools/PKGBUILD index 9d21ad451..3a65fb56b 100644 --- a/nonsystemd/libretools/PKGBUILD +++ b/nonsystemd/libretools/PKGBUILD @@ -1,106 +1,78 @@ -# Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer: David P. <megver83@parabola.nu> +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com> # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Márcio Silva <coadde@hyperbola.info> -pkgbase=libretools -pkgname=(libretools librelib gitget) +pkgname=libretools +pkgver=20181004 +pkgrel=6.1 +pkgrel+=.nonsystemd3 pkgdesc="Programs for Parabola development" +arch=('any') url="https://git.parabola.nu/packages/libretools.git/" license=('GPL3' 'GPL2') - -pkgver=20190907 -source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver-nonsystemd.tar.gz{,.sig} - "revert.patch::https://git.parabola.nu/packages/libretools.git/patch/?id=42cca853176c9ff23a5d2896f9b132630f034fb7" - 0002-libremakepkg-pacman_5_2.patch) -sha256sums=('c9bdc6f422234b6b260349e488266500756857bbb65079783aa5e997b6a2d410' - 'SKIP' - '108aa8bbfb1ffe96427540cd8f7788338883b08ad038b2ed426e93ac6c57e91b' - '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df') -validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker - '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P. - -pkgrel=1 -pkgrel+=.nonsystemd2 - -arch=('any') +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" + "gitget=$pkgver" # `createworkdir` + 'pacman>=6.0.0' 'pacman<6.0.1' + 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=( bash-bats git - 'pacman>=5.1.1-1.parabola5' 'pacman<6.1' + 'pacman>=6.0.0' 'pacman<6.0.1' expac openssh rsync tokyocabinet ) +source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} + nonsystemd.patch + 0002-libremakepkg-pacman_5_2.patch) +sha256sums=('2bdefd1803ba3e6cbd1eb955fad3de9ce8a4abfd23a0bd96a60772762df7b53b' + 'SKIP' + '511de3404afcb3fe2ed002a94be00bc0b83d6abeb1cf3ab0456bf916c8f1114e' + '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df') +validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker prepare() { - cd "$srcdir/$pkgbase-$pkgver-nonsystemd" - patch -N -p1 -i $srcdir/revert.patch + cd "$srcdir/$pkgbase-$pkgver" + + # non-systemd patch changes: + # * uses chroot-nspawn instead of systemd-nspawn + # * replaces systemd-machine-id-setup with dbus-uuidgen + patch -p1 -i ../nonsystemd.patch + + # don't apply 0001-libremakepkg-rw-startdir.patch like libre/libretools because + # by using chroot-nspawn we don't have that issue patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch } build() { - cd "$srcdir/$pkgbase-$pkgver-nonsystemd" + cd "$srcdir/$pkgbase-$pkgver" make } -package_librelib() { - pkgdesc="The shell library portion of libretools" - license=(GPL2) - conflicts=('xbs') - optdepends=( - 'libretools: for libreblacklist/blacklist.sh' - 'wget: for libreblacklist/blacklist.sh' - ) - - cd "$srcdir/$pkgbase-$pkgver-nonsystemd" - make install-librelib DESTDIR="$pkgdir" -} - -package_gitget() { - pkgdesc="A simple to use downloader for git URLs" - license=(GPL2) - depends=("librelib=$pkgver" git) - - provides=("libregit=$pkgver") - conflicts=("libregit") - replaces=("libregit") - - cd "$srcdir/$pkgbase-$pkgver-nonsystemd" - make install-gitget DESTDIR="$pkgdir" -} - -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" - "gitget=$pkgver" # `createworkdir` - 'pacman>=5.1.1-1.parabola5' 'pacman<6.1' - 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` - 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' - ) - - cd "$srcdir/$pkgbase-$pkgver-nonsystemd" +package() { + cd "$srcdir/$pkgbase-$pkgver" make install-libretools DESTDIR="$pkgdir" } diff --git a/nonsystemd/libretools/nonsystemd.patch b/nonsystemd/libretools/nonsystemd.patch new file mode 100644 index 000000000..24fab7e5a --- /dev/null +++ b/nonsystemd/libretools/nonsystemd.patch @@ -0,0 +1,63 @@ +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} \ |