summaryrefslogtreecommitdiff
path: root/configs/profile
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2019-12-27 03:29:31 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-03-27 19:32:36 -0400
commit0eddd34890ed4a88ecf65ee9f039540bcf363b9f (patch)
treeec57edc8eb0e8c04b38ecf1849c8869d88c66dab /configs/profile
parent6b779d45b097980e75738512fd2eda2ead54bb22 (diff)
adapt for transitional base packages
Diffstat (limited to 'configs/profile')
-rwxr-xr-xconfigs/profile/build.sh6
-rw-r--r--configs/profile/packages/packages-all.all2
-rw-r--r--configs/profile/packages/packages-openrc-gui.all16
-rw-r--r--configs/profile/packages/packages-openrc.all10
-rw-r--r--configs/profile/root-image/root/.install-openrc-lxde/packages17
-rw-r--r--configs/profile/root-image/root/.install-systemd-mate/packages1
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc14
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh3
8 files changed, 49 insertions, 20 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index ef40890..ede1748 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -40,7 +40,6 @@ archs='' # deferred
iso_filename='' # deferred
iso_init='' # deferred
iso_gui='' # deferred
-base_pkgs='' # deferred
arch='' # deferred
pacman_conf='' # deferred
@@ -115,7 +114,7 @@ make_pacman_conf() {
# Base installation, plus needed packages (root-image)
make_basefs() {
- setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -B ${base_group} init
+ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} init
setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "memtest86+ mkinitcpio-nfs-utils nbd" install
}
@@ -429,8 +428,7 @@ iso_filename=$( echo ${iso_filename} | tr '[:upper:]/' '[:
out_dir=${out_dir}/$(echo ${release_dirname} | tr '[:upper:]/' '[:lower:]-')
iso_init=$( echo ${iso_edition} | cut -d '/' -f 1 | tr '[:upper:]' '[:lower:]' )
iso_gui=$( echo ${iso_edition} | cut -d '/' -f 2 | tr '[:upper:]' '[:lower:]' )
-[[ "${iso_init}" == 'openrc' ]] && base_group='base-openrc' || base_group='base'
-[[ "${archs}" == 'i686' ]] && arch='i686' || arch='x86_64'
+[[ "${archs}" == 'i686' ]] && arch='i686' || arch='x86_64'
pacman_conf=${work_dir}/pacman.conf
diff --git a/configs/profile/packages/packages-all.all b/configs/profile/packages/packages-all.all
index c57c28e..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
@@ -33,6 +34,7 @@ nmap
ntfs-3g
openconnect
p7zip
+parabola-base
partclone
parted
partimage
diff --git a/configs/profile/packages/packages-openrc-gui.all b/configs/profile/packages/packages-openrc-gui.all
index c5b9aaa..fbd05af 100644
--- a/configs/profile/packages/packages-openrc-gui.all
+++ b/configs/profile/packages/packages-openrc-gui.all
@@ -6,6 +6,16 @@
# Services
gvfs-mtp
gvfs-gphoto2
-networkmanager-elogind
-openrc-desktop
-polkit-elogind
+#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' 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 7a15fb2..34beb87 100644
--- a/configs/profile/packages/packages-openrc.all
+++ b/configs/profile/packages/packages-openrc.all
@@ -3,12 +3,20 @@
# but these packages will not be installed with other init systems
+elogind
gpm-openrc
haveged-openrc
hdparm-openrc
-networkmanager-openrc
+networkmanager
ntp-openrc
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/.install-openrc-lxde/packages b/configs/profile/root-image/root/.install-openrc-lxde/packages
index 6838e54..b29de69 100644
--- a/configs/profile/root-image/root/.install-openrc-lxde/packages
+++ b/configs/profile/root-image/root/.install-openrc-lxde/packages
@@ -1,8 +1,11 @@
-base-openrc
+base
+systemd-libs-dummy
+opensysusers
+parabola-base
gpm-openrc
haveged-openrc
hdparm-openrc
-networkmanager-openrc
+networkmanager
ntp-openrc
openssh-openrc
openvpn-openrc
@@ -46,9 +49,13 @@ xf86-video-sisusb
xorg-xinit
gvfs-mtp
gvfs-gphoto2
-networkmanager-elogind
-openrc-desktop
-polkit-elogind
+acpid-openrc
+alsa-utils-openrc
+avahi-openrc
+bluez-openrc
+displaymanager-openrc
+modemmanager-pk-rules
+elogind
epdfview
galculator
gksu
diff --git a/configs/profile/root-image/root/.install-systemd-mate/packages b/configs/profile/root-image/root/.install-systemd-mate/packages
index 4262345..a07c6c0 100644
--- a/configs/profile/root-image/root/.install-systemd-mate/packages
+++ b/configs/profile/root-image/root/.install-systemd-mate/packages
@@ -1,4 +1,5 @@
base
+parabola-base
gpm
haveged
hdparm
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..9831e0f 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -3,10 +3,10 @@
# ISO_INIT
# ISO_GUI
# ENABLE_OFFLINE_INSTALL
-# HAS_BRLTTY_TTS
+# ENABLE_TTS_BRLTTY
-/* timezone and locales */
+## timezone and locales ##
readonly LOCALES="en_US\.UTF-8 \
eo \
@@ -18,12 +18,12 @@ readonly LOCALES="en_US\.UTF-8 \
pl_PL\.UTF-8 "
-/* pacman */
+## pacman ##
readonly NONSYSTEMD_REGEX='N ; s|^#\[nonsystemd\].*#Include|\[nonsystemd\]\nInclude|'
-/* services */
+## services ##
readonly OPENRC_DELETE_FILES="/etc/hostname \
/etc/systemd/scripts/choose-mirror \
@@ -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 "
@@ -56,7 +56,7 @@ readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL}
$([[ "${ENABLE_TTS_BRLTTY}" == 'yes' ]] && echo " ${SYSTEMD_SERVICES_ACC}")"
-/* system defaults and root user */
+## system defaults and root user ##
readonly DEFAULT_SHELL=/bin/bash
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 5496535..32bca8b 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -24,6 +24,9 @@ LOG_CONFIG "pacman"
[[ "${ISO_INIT}" == 'openrc' ]] && sed -i "$NONSYSTEMD_REGEX" /etc/pacman-online.conf
[[ "${INSTALL_TYPE}" == 'Complete' ]] && cp /etc/pacman-offline.conf /etc/pacman.conf || \
cp /etc/pacman-online.conf /etc/pacman.conf
+# FIXME: https://labs.parabola.nu/issues/2576
+# this LOC can be removed eventually after the new 'base' meta-package is stabilized
+pacman -R $(pacman -Qq | grep ^systemd-) netctl
LOG_CONFIG "services"