PKGBUILD

@@ -11,20 +11,16 @@ pkgname=('manjaro-tools-base-git'
          'manjaro-tools-iso-git'
          'manjaro-tools-yaml-git')
 pkgbase=manjaro-tools-git
-pkgver=r3016.263d640
-pkgrel=1
+pkgver=r3035.3a5c25c
+pkgrel=2
 pkgdesc="Development tools for Manjaro Linux"
 arch=('any')
 url="https://gitlab.manjaro.org/tools/development-tools/manjaro-tools"
 license=('GPL-3.0-or-later')
 groups=('manjaro-tools')
 makedepends=('git' 'docbook2x')
-source=("git+$url.git#branch=${_branch}"
-        'etc-pacman.d-gnupg.mount'
-        'pacman-init.service')
-sha256sums=('SKIP'
-            'b6d14727ec465bb66d0a0358163b1bbfafcb4eaed55a0f57c30aabafae7eed68'
-            '65d8bdccdcccb64ae05160b5d1e7f3e45e1887baf89dda36c1bd44c62442f91b')
+source=("git+$url.git#branch=${_branch}")
+sha256sums=('SKIP')
 
 pkgver() {
     cd "${srcdir}/${pkgbase%-git}"
@@ -57,10 +53,6 @@ package_manjaro-tools-base-git() {
 
     cd "${srcdir}/${pkgbase%-git}"
     make PREFIX=/usr DESTDIR="${pkgdir}" install_base
-
-    # install pacman-init
-    install -Dm644 $srcdir/etc-pacman.d-gnupg.mount $pkgdir/usr/lib/systemd/system/etc-pacman.d-gnupg.mount
-    install -m644 $srcdir/pacman-init.service $pkgdir/usr/lib/systemd/system/pacman-init.service
 }
 
 package_manjaro-tools-pkg-git() {

etc-pacman.d-gnupg.mount

-[Unit]
-Description=Temporary /etc/pacman.d/gnupg directory
-
-[Mount]
-What=tmpfs
-Where=/etc/pacman.d/gnupg
-Type=tmpfs
-Options=mode=0755

pacman-init.service

-[Unit]
-Description=Initialize Pacman keyring
-Wants=haveged.service
-After=haveged.service
-Requires=etc-pacman.d-gnupg.mount
-After=etc-pacman.d-gnupg.mount
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/pacman-key --init
-ExecStart=/usr/bin/pacman-key --populate archlinux manjaro
-
-[Install]
-WantedBy=multi-user.target