wip parabola base

3 files changed, 32 insertions, 14 deletions

diff --git a/libre/parabola-base/PKGBUILD b/libre/parabola-base/PKGBUILD
index 50214cfcb..7d216b431 100644
--- a/libre/parabola-base/PKGBUILD
+++ b/libre/parabola-base/PKGBUILD
@@ -9,18 +9,36 @@
 # base <- parabola-base <- parabola <- parabola-desktop-base <- parabola-desktop <- parabola-desktop-<WMDE>
 #
 #   Where:
-#   * base, parabola, and parabola-desktop are init-specific
-#   * parabola-base, parabola-desktop-base, and parabola-desktop-<WMDE> are init-agnostic.
-#   * These form exactly two possible chains from any parabola-desktop-<WMDE> to base,
+#   * 'base', 'parabola', and 'parabola-desktop' are init-specific.
+#   * 'parabola-base', 'parabola-desktop-base', and 'parabola-desktop-<WMDE>' are init-agnostic.
+#   * These form exactly two possible chains from any 'parabola-desktop-<WMDE>' to 'base',
 #     which diverge and merge at multiple points. The actual chain is resolved at install-time.
-#   * parabola-desktop-<WMDE> is any of the complete desktop sets (eg: parabola-desktop-lxde)
-#   * Only parabola and the parabola-desktop-<WMDE> meta-packages are considered to be
+#   * 'parabola-desktop-<WMDE>' is any of the complete desktop sets (eg: 'parabola-desktop-lxde').
+#   * Only 'parabola' and the 'parabola-desktop-<WMDE>' meta-packages are considered to be
 #     complete, useful, and supported configurations.
 #
-# The recommendation is for all Parabola users to keep parabola or parabola-desktop installed always.
-# These help with bug reports and troubleshooting, by normalizing a "standard" system,
-# and plastering over the usual trouble-spots, such as general systemd/non-systemd sanity,
-# missing non-systemd init-scripts, the 'icu-compat' fallback, etc.
+#   Caveats:
+#     The logical dependent of 'base' is 'parabola-base'. However, because 'nonsystemd/base'
+#     does not require 'libsystemd' and 'udev' providers, it is not possible to install
+#     'base' or 'parabola-base' alone on a non-systemd system. For that reason, the
+#     dependency on 'base' is via 'parabola', which does require 'libsystemd' and 'udev'
+#     providers. Ie: 'parabola' is the minimal meta-package for a non-systemd system.
+#
+#     This is currently necessary to allow for alternate providers and init-systems other
+#     than OpenRC (though it would be better to remove this caveat, by handling this concern
+#     with the 'provides' mechanism). Consequently, the 'nonsystemd/parabola' meta-package
+#     must require 'libelogind' and 'libudev' explicitly, rather than generic systemd/udev
+#     providers, in order to resolve package conflicts.
+#
+#     Likewise, the logical point of 'your-init-freedom' conflict is 'libre/base'; but that
+#     conflict is pushed back into 'libre/parabola' for symmetry. Ie: 'parabola' is the
+#     minimal meta-package which resolves all systemd/non-systemd conflicts. However, this
+#     does not prevent 'base' or 'parabola-base' from being installed on a systemd system.
+#
+# Therefore, the general recommendation is to keep 'parabola-desktop' and/or 'parabola'
+# installed always. These help with bug reports and troubleshooting, by normalizing "the
+# standard Parabola systems", and plastering over the usual trouble-spots, such as general
+# init-system sanity, missing non-systemd init-scripts, the 'icu-compat' fallback, etc.
 
 
 # this is the canonical definition of the standard Parabola CLI system
@@ -39,7 +57,7 @@ license=(CCPL:zero)
 
 
 # 'base'
-depends=(base your-freedom)
+depends=(your-freedom)
 
 # (obsolete '{libre,nonsystemd}/base' groups) - ('{libre,nonsystemd}/base' meta-packages) + posix
 depends+=(cryptsetup dhcpcd inetutils jfsutils linux-libre logrotate lvm2
diff --git a/libre/parabola/PKGBUILD b/libre/parabola/PKGBUILD
index 9b3657780..8cbf45779 100644
--- a/libre/parabola/PKGBUILD
+++ b/libre/parabola/PKGBUILD
@@ -23,10 +23,10 @@ license=(CCPL:zero)
 
 
 # 'base' chain
-depends=(parabola-base)
+depends=(base parabola-base)
 
 # (obsolete 'libre/base' group) - ('libre/parabola-base' meta-package)
 depends+=(netctl)
 
 # your-init-freedom providers
-conflicts=(liblogind your-init-freedom)
+conflicts=(liblogind libudev your-init-freedom)
diff --git a/nonsystemd/parabola/PKGBUILD b/nonsystemd/parabola/PKGBUILD
index 78666307d..cd9aaf9f9 100644
--- a/nonsystemd/parabola/PKGBUILD
+++ b/nonsystemd/parabola/PKGBUILD
@@ -23,10 +23,10 @@ license=(CCPL:zero)
 
 
 # 'base' chain
-depends=(parabola-base)
+depends=(base parabola-base)
 
 # (obsolete 'base-openrc' group) - ('parabola-base' meta-package)
-depends+=(libelogind openresolv)
+depends+=(libelogind libudev openresolv)
 
 # supplemental package-set (eg: the CLI LiveISOs)
 depends+=()