summaryrefslogtreecommitdiff
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-01-01 06:16:05 -0500
commita2988a3aed82e28351d82ff5277bd503f1eb256f (patch)
treea8c0c9b580212b9fc98c03f08d832514358b603c
parent1b16732bc84936d5ad0f8df3e5f2cbd22a2901d4 (diff)
adapt for transitional base packages
-rwxr-xr-xconfigs/profile/build.sh8
-rw-r--r--configs/profile/packages/packages-all.all1
-rw-r--r--configs/profile/packages/packages-openrc-gui.all13
-rw-r--r--configs/profile/packages/packages-openrc.all3
-rw-r--r--configs/profile/root-image/root/.install-openrc-lxde/packages17
-rw-r--r--configs/profile/root-image/root/.install-systemd-mate/packages1
-rwxr-xr-xparabolaiso/mkparabolaiso12
7 files changed, 35 insertions, 20 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index ef40890..eecfc54 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -12,6 +12,8 @@ readonly END_COLOR='\033[00m'
# edition-specific data
declare -ar VALID_INITS=('openrc' 'systemd')
declare -ar VALID_GUIS=('cli' 'lxde' 'mate')
+declare -ar BASE_SYSTEMD_PKGS=('base')
+declare -ar BASE_OPENRC_PKGS=('base' 'systemd-libs-dummy' 'opensysusers')
iso_title="Parabola GNU/Linux-libre Live" # $iso_edition and $iso_version appended
# environment
@@ -115,7 +117,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} -B ${base_pkgs} init
setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "memtest86+ mkinitcpio-nfs-utils nbd" install
}
@@ -429,8 +431,8 @@ 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'
+[[ "${iso_init}" == 'openrc' ]] && base_pkgs=${BASE_OPENRC_PKGS[@]} || base_pkgs=${BASE_SYSTEMD_PKGS[@]}
+[[ "${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..4d9b4dd 100644
--- a/configs/profile/packages/packages-all.all
+++ b/configs/profile/packages/packages-all.all
@@ -33,6 +33,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..095485c 100644
--- a/configs/profile/packages/packages-openrc-gui.all
+++ b/configs/profile/packages/packages-openrc-gui.all
@@ -6,6 +6,13 @@
# Services
gvfs-mtp
gvfs-gphoto2
-networkmanager-elogind
-openrc-desktop
-polkit-elogind
+#openrc-desktop
+# these are conflict resoltuions for the transitional 'openrc-desktop'
+# not including those defined in other files (e.g. packages-openrc.all)
+# these can all be repalced eventually by the new 'openrc-desktop'
+acpid-openrc
+alsa-utils-openrc
+avahi-openrc
+bluez-openrc
+displaymanager-openrc
+modemmanager-pk-rules
diff --git a/configs/profile/packages/packages-openrc.all b/configs/profile/packages/packages-openrc.all
index 7a15fb2..881058c 100644
--- a/configs/profile/packages/packages-openrc.all
+++ b/configs/profile/packages/packages-openrc.all
@@ -3,10 +3,11 @@
# 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
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/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 0947860..077829e 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -6,7 +6,7 @@ export LANG=C
app_name=${0##*/}
arch=$(uname -m)
-base_group=""
+base_pkgs=""
pkg_list=""
run_cmd=""
quiet="y"
@@ -86,7 +86,7 @@ _chroot_umount () {
_chroot_init() {
if [[ ! -d "${work_dir}/root-image/var/cache/pacman" ]]; then
mkdir -p "${work_dir}"/root-image/{dev,proc,run,sys,tmp,var/lib/pacman}
- _pacman ${base_group}
+ _pacman "${base_pkgs}"
_pacman "syslinux"
fi
}
@@ -204,7 +204,7 @@ _show_config () {
case "${_mode}" in
init)
_msg_info " Pacman config file: ${pacman_conf}"
- _msg_info " Base package group: ${base_group}"
+ _msg_info " Base packages: ${base_pkgs}"
;;
install)
_msg_info " Pacman config file: ${pacman_conf}"
@@ -614,7 +614,7 @@ fi
while getopts 'B:p:r:C:L:P:A:D:Ow:o:vh' arg; do
case "${arg}" in
- B) base_group="${OPTARG}" ;;
+ B) base_pkgs="${OPTARG}" ;;
p) pkg_list="${pkg_list} ${OPTARG}" ;;
r) run_cmd="${OPTARG}" ;;
C) pacman_conf="${OPTARG}" ;;
@@ -634,10 +634,6 @@ while getopts 'B:p:r:C:L:P:A:D:Ow:o:vh' arg; do
esac
done
-if [ "${base_group}" != 'base-openrc' ]; then
- base_group='base'
-fi
-
shift $((OPTIND - 1))
if [[ $# -lt 1 ]]; then