[nonsystemd/parabola-base][libre/parabola-base]: accommodate your-initfreedom in base

4 files changed, 62 insertions, 14 deletions

diff --git a/libre/base/PKGBUILD b/libre/base/PKGBUILD
index 1f48f3898..a0ca93365 100644
--- a/libre/base/PKGBUILD
+++ b/libre/base/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=base
 pkgver=2
 pkgrel=2
 pkgrel+=.parabola1
-pkgdesc='Minimal package set to define a basic Parabola GNU/Linux-libre installation'
+pkgdesc="Minimal package-set to define the essential Parabola GNU/Linux-libre systemd CLI system"
 url='https://www.parabola.nu'
 arch=('any')
 license=('GPL')
diff --git a/libre/parabola-base/PKGBUILD b/libre/parabola-base/PKGBUILD
index f3110d00d..de99b0282 100644
--- a/libre/parabola-base/PKGBUILD
+++ b/libre/parabola-base/PKGBUILD
@@ -1,13 +1,24 @@
 # Contributor: bill-auger <bill-auger@programmer.net>
 
+# this is the canonical definition of the standard Parabola systemd CLI system
+#   as installed onto the systemd CLI LiveISOs, and installed by the installers
+# users may also use this meta-package during the manual install process
+#   to replicate the systemd CLI live system
+
 
 pkgname=parabola-base
-pkgver=1
+pkgver=2
 pkgrel=1
-pkgdesc="Extended package set to define the standard Parabola GNU/Linux-libre CLI system"
-arch=('any')
+pkgdesc="Extended package-set to define the standard Parabola GNU/Linux-libre systemd CLI system"
 url=https://www.parabola.nu
+arch=('any')
 license=('GPL')
 
-depends=(dhcpcd inetutils jfsutils linux-libre logrotate lvm2 man-db mc mdadm nano netctl
-         reiserfsprogs s-nail sysfsutils texinfo usbutils vi xfsprogs $(: || TODO: your-system-sanity) )
+
+# (obsolete 'base' group) - ('libre/base' meta-package) + posix
+depends=(cryptsetup dialog dhcpcd inetutils jfsutils linux-libre logrotate lvm2
+         mdadm netctl posix reiserfsprogs sysfsutils usbutils vi xfsprogs) # TODO: your-system-sanity
+
+# supplemental package-set for the systemd CLI LiveISOs
+depends+=(bash-completion elinks haveged hdparm mc nano networkmanager ntp
+          openssh openvpn p7zip rsync screen sudo unarchiver unzip w3m zip)
diff --git a/nonsystemd/base/PKGBUILD b/nonsystemd/base/PKGBUILD
index 80140be3e..8c6c09584 100644
--- a/nonsystemd/base/PKGBUILD
+++ b/nonsystemd/base/PKGBUILD
@@ -1,14 +1,13 @@
-# Maintainer: David P. <megver83@parabola.nu>
 # Maintainer (Arch): Arch Linux Team
 # Contributor (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Contributor (Arch): Eli Schwartz <eschwartz@archlinux.org>
+# Maintainer: David P. <megver83@parabola.nu>
 
 pkgname=base
 pkgver=2
 pkgrel=2
-pkgrel+=.parabola1
-pkgrel+=.nonsystemd2
-pkgdesc='Minimal package set to define a basic Parabola GNU/Linux-libre installation'
+pkgrel+=.parabola1.nonsystemd1
+pkgdesc="Minimal package-set to define the essential Parabola GNU/Linux-libre non-systemd CLI system"
 url='https://www.parabola.nu'
 arch=('any')
 license=('GPL')
@@ -31,7 +30,5 @@ depends=(
   # parabola
   'your-freedom' 'your-initfreedom'
 )
-optdepends=('linux-libre: bare metal support')
-
-# vim: ts=2 sw=2 et:
-
+optdepends=('linux-libre: bare metal support'
+            'parabola-base: standard Parabola GNU/Linux-libre CLI system')
diff --git a/nonsystemd/parabola-base/PKGBUILD b/nonsystemd/parabola-base/PKGBUILD
new file mode 100644
index 000000000..b1822a0eb
--- /dev/null
+++ b/nonsystemd/parabola-base/PKGBUILD
@@ -0,0 +1,40 @@
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+# this is the canonical definition of the standard Parabola non-systemd CLI system
+#   as installed onto the non-systemd CLI LiveISOs, and installed by the installers
+# users may also use this meta-package during the manual install process
+#   to replicate the non-systemd CLI live system
+
+
+pkgname=parabola-base
+pkgver=2
+pkgrel=1
+pkgdesc="Extended package-set to define the standard Parabola GNU/Linux-libre non-systemd CLI system"
+url=https://www.parabola.nu
+arch=('any')
+license=('GPL')
+
+
+# (deprecated 'base-openrc' group) - ('nonsystemd/base' meta-package) + posix
+depends=(cryptsetup dhcpcd elogind inetutils jfsutils linux-libre logrotate lvm2
+         mdadm openresolv posix reiserfsprogs sysfsutils usbutils vi xfsprogs) # TODO: your-system-sanity
+
+# supplemental package-set for the non-systemd CLI LiveISOs
+depends+=(bash-completion elinks haveged hdparm mc nano networkmanager ntp
+          openssh openvpn p7zip rsync screen sudo unarchiver unzip w3m zip)
+
+# TODO: these are in the deprecated 'base-openrc' group
+#       (most important, installed in ths group, is 'udev-init-scripts')
+#       many of these will eventually be moved from [pcr] into the corresponding
+#         main program packages [nonsystemd] (without the *-openrc suffix)
+#       once that happens, these can be merged into the base packages array above
+#         https://labs.parabola.nu/issues/2549
+depends+=(cronie-openrc cryptsetup-openrc dhcpcd-openrc glibc-openrc
+          inetutils-openrc lvm2-openrc mdadm-openrc netifrc nfs-utils-openrc
+          quota-tools-openrc rpcbind-openrc syslog-ng-openrc udev-init-scripts)
+
+# TODO: analogous *-openrc sub-set, corresponding to the supplemental LiveISOs package set
+#       these can eventually be merged into the supplemental packages array above
+#         https://labs.parabola.nu/issues/2549
+depends+=(gpm-openrc haveged-openrc hdparm-openrc ntp-openrc openssh-openrc
+          openvpn-openrc rsync-openrc wpa_supplicant-openrc)