summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2019-12-27 05:51:36 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-01-01 06:16:05 -0500
commit9ec88f6b9f9f84361847b98ceaab8d44dbf76c13 (patch)
treef9fd4cafd805e01b2875e30b8254997ee338b3d9
parent06d40559a02d7fc7f3f63a87002dfbd3b7ac4559 (diff)
sq - adapt for transitional base packages
-rw-r--r--configs/profile/mkinitcpio.conf2
-rw-r--r--configs/profile/packages/packages-all.all1
-rw-r--r--configs/profile/packages/packages-openrc-gui.all7
-rw-r--r--configs/profile/packages/packages-openrc.all7
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc6
5 files changed, 17 insertions, 6 deletions
diff --git a/configs/profile/mkinitcpio.conf b/configs/profile/mkinitcpio.conf
index fc2572b..fa74c1f 100644
--- a/configs/profile/mkinitcpio.conf
+++ b/configs/profile/mkinitcpio.conf
@@ -1,3 +1,3 @@
MODULES="loop"
-HOOKS="base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard"
+HOOKS="base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard paralogo"
COMPRESSION="xz"
diff --git a/configs/profile/packages/packages-all.all b/configs/profile/packages/packages-all.all
index 4d9b4dd..4ea244f 100644
--- a/configs/profile/packages/packages-all.all
+++ b/configs/profile/packages/packages-all.all
@@ -23,6 +23,7 @@ grub
irssi
lftp
linux-atm
+linux-libre
lynx
mc
mkinitcpio-paralogo
diff --git a/configs/profile/packages/packages-openrc-gui.all b/configs/profile/packages/packages-openrc-gui.all
index 095485c..fbd05af 100644
--- a/configs/profile/packages/packages-openrc-gui.all
+++ b/configs/profile/packages/packages-openrc-gui.all
@@ -7,12 +7,15 @@
gvfs-mtp
gvfs-gphoto2
#openrc-desktop
-# these are conflict resoltuions for the transitional 'openrc-desktop'
+# FIXME: https://labs.parabola.nu/issues/2506
+# these are conflict resoltuions for the transitional 'openrc-desktop' meta-package
# not including those defined in other files (e.g. packages-openrc.all)
-# these can all be repalced eventually by the new 'openrc-desktop'
+# these can all be repalced eventually by the new 'openrc-desktop' meta-package
acpid-openrc
alsa-utils-openrc
avahi-openrc
bluez-openrc
displaymanager-openrc
modemmanager-pk-rules
+# https://labs.parabola.nu/issues/2576
+systemd-dummy
diff --git a/configs/profile/packages/packages-openrc.all b/configs/profile/packages/packages-openrc.all
index 881058c..34beb87 100644
--- a/configs/profile/packages/packages-openrc.all
+++ b/configs/profile/packages/packages-openrc.all
@@ -13,3 +13,10 @@ openssh-openrc
openvpn-openrc
rsync-openrc
wpa_supplicant-openrc
+# FIXME: https://labs.parabola.nu/issues/2506
+# these are conflict resoltuions for the transitional 'base' meta-package
+# these can all be removed eventually after the new 'base' meta-package is stabilized
+# https://labs.parabola.nu/issues/2576
+systemd-libs-dummy
+# https://labs.parabola.nu/issues/2559
+opensysusers
diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc
index d24b3ed..2dec6b1 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -3,7 +3,7 @@
# ISO_INIT
# ISO_GUI
# ENABLE_OFFLINE_INSTALL
-# HAS_BRLTTY_TTS
+# ENABLE_TTS_BRLTTY
/* timezone and locales */
@@ -37,11 +37,11 @@ readonly SYSTEMD_DELETE_FILES="/etc/conf.d/agetty.tty1 \
/etc/X11/Xwrapper.config"
readonly OPENRC_SERVICES_ALL="dbus \
+ elogind \
haveged \
NetworkManager \
pacman-init "
-readonly OPENRC_SERVICES_GUI="alsasound \
- elogind "
+readonly OPENRC_SERVICES_GUI="alsasound"
readonly SYSTEMD_SERVICES_ALL="choose-mirror.service \
multi-user.target \
pacman-init.service "