[arch-commits] Commit in archiso/trunk (PKGBUILD)

[David Runge]

    Date: Saturday, July 31, 2021 @ 17:32:50
  Author: dvzrv
Revision: 420963

upgpkg: archiso 57-2: Rebuild to remove mkinitcpio-archiso.

Remove the mkinitcpio-archiso split-package as the source is now tracked in a separate project:
https://gitlab.archlinux.org/mkinitcpio/mkinitcpio-archiso
Run check target in check().

Modified:
  archiso/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-31 17:25:46 UTC (rev 420962)
+++ PKGBUILD	2021-07-31 17:32:50 UTC (rev 420963)
@@ -2,33 +2,33 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 # Contributor: Gerardo Exequiel Pozzi <djgera at archlinux.org>
 
-pkgbase=archiso
-pkgname=('archiso' 'mkinitcpio-archiso')
+pkgname=archiso
 pkgver=57
-pkgrel=1
+pkgrel=2
 pkgdesc='Tools for creating Arch Linux live and install iso images'
 arch=('any')
 license=('GPL3')
 url="https://gitlab.archlinux.org/archlinux/archiso"
+depends=('arch-install-scripts' 'bash' 'dosfstools' 'e2fsprogs' 'libarchive'
+'libisoburn' 'mtools' 'squashfs-tools')
 makedepends=('git')
+checkdepends=('shellcheck')
+optdepends=(
+  'edk2-ovmf: for emulating UEFI with run_archiso'
+  'erofs-utils: for experimental EROFS support in mkarchiso'
+  'openssl: for codesigning support when building netboot artifacts'
+  'qemu: for run_archiso'
+)
 source=("git+https://gitlab.archlinux.org/archlinux/archiso.git#tag=v${pkgver}?signed")
 sha256sums=('SKIP')
 validpgpkeys=('C7E7849466FE2358343588377258734B41C31549') # David Runge <dvzrv at archlinux.org>
 
-package_archiso() {
-  depends=('arch-install-scripts' 'bash' 'dosfstools' 'e2fsprogs' 'libarchive'
-  'libisoburn' 'mtools' 'squashfs-tools')
-  optdepends=('edk2-ovmf: for emulating UEFI with run_archiso'
-              'erofs-utils: for experimental EROFS support in mkarchiso'
-              'openssl: for codesigning support when building netboot artifacts'
-              'qemu: for run_archiso')
+check() {
   cd "${pkgbase}"
-  make DESTDIR="${pkgdir}" install
+  make -k check
 }
 
-package_mkinitcpio-archiso() {
-  pkgdesc='Mkinitcpio hooks and scripts for archiso'
-  depends=('mkinitcpio')
+package() {
   cd "${pkgbase}"
-  make DESTDIR="${pkgdir}" install-initcpio
+  make DESTDIR="${pkgdir}" install
 }