From edaf3e6728bdee17fab063f924d7a94fcdf83102 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Thu, 16 Nov 2017 14:57:45 -0500 Subject: finalize package list schema --- configs/profile/build.sh | 70 +++++++++++++++++++--- configs/profile/packages/README | 1 + configs/profile/packages/cache-lxde.all | 9 +++ configs/profile/packages/cache-lxde.i686 | 3 + configs/profile/packages/cache-lxde.x86_64 | 3 + configs/profile/packages/packages-all.all | 59 ++++++++++++++++++ configs/profile/packages/packages-all.i686 | 3 + configs/profile/packages/packages-all.x86_64 | 6 ++ configs/profile/packages/packages-cache-lxde.both | 9 --- configs/profile/packages/packages-cli.all | 3 + configs/profile/packages/packages-cli.both | 3 - configs/profile/packages/packages-cli.i686 | 4 ++ configs/profile/packages/packages-cli.x86_64 | 4 ++ configs/profile/packages/packages-gui.both | 64 -------------------- configs/profile/packages/packages-lxde.all | 30 ++++++++++ configs/profile/packages/packages-lxde.both | 30 ---------- configs/profile/packages/packages-lxde.i686 | 4 ++ configs/profile/packages/packages-lxde.x86_64 | 4 ++ configs/profile/packages/packages-mate.all | 9 +++ configs/profile/packages/packages-mate.both | 9 --- configs/profile/packages/packages-mate.i686 | 4 ++ configs/profile/packages/packages-mate.x86_64 | 4 ++ configs/profile/packages/packages-openrc-gui.all | 12 ++++ configs/profile/packages/packages-openrc-gui.i686 | 4 ++ .../profile/packages/packages-openrc-gui.x86_64 | 4 ++ configs/profile/packages/packages-openrc.all | 14 +++++ configs/profile/packages/packages-openrc.both | 68 --------------------- configs/profile/packages/packages-openrc.i686 | 3 + configs/profile/packages/packages-systemd-gui.all | 7 +++ configs/profile/packages/packages-systemd-gui.i686 | 4 ++ .../profile/packages/packages-systemd-gui.x86_64 | 4 ++ configs/profile/packages/packages-systemd.all | 13 ++++ configs/profile/packages/packages-systemd.both | 67 --------------------- configs/profile/packages/packages-systemd.x86_64 | 1 + .../root-image/root/customize_root_image.sh | 14 ++--- docs/README.package_lists | 51 ++++++++++++++++ 36 files changed, 335 insertions(+), 266 deletions(-) create mode 100644 configs/profile/packages/README create mode 100644 configs/profile/packages/cache-lxde.all create mode 100644 configs/profile/packages/cache-lxde.i686 create mode 100644 configs/profile/packages/cache-lxde.x86_64 create mode 100644 configs/profile/packages/packages-all.all create mode 100644 configs/profile/packages/packages-all.i686 create mode 100644 configs/profile/packages/packages-all.x86_64 delete mode 100644 configs/profile/packages/packages-cache-lxde.both create mode 100644 configs/profile/packages/packages-cli.all delete mode 100644 configs/profile/packages/packages-cli.both create mode 100644 configs/profile/packages/packages-cli.i686 create mode 100644 configs/profile/packages/packages-cli.x86_64 delete mode 100644 configs/profile/packages/packages-gui.both create mode 100644 configs/profile/packages/packages-lxde.all delete mode 100644 configs/profile/packages/packages-lxde.both create mode 100644 configs/profile/packages/packages-lxde.i686 create mode 100644 configs/profile/packages/packages-lxde.x86_64 create mode 100644 configs/profile/packages/packages-mate.all delete mode 100644 configs/profile/packages/packages-mate.both create mode 100644 configs/profile/packages/packages-mate.i686 create mode 100644 configs/profile/packages/packages-mate.x86_64 create mode 100644 configs/profile/packages/packages-openrc-gui.all create mode 100644 configs/profile/packages/packages-openrc-gui.i686 create mode 100644 configs/profile/packages/packages-openrc-gui.x86_64 create mode 100644 configs/profile/packages/packages-openrc.all delete mode 100644 configs/profile/packages/packages-openrc.both create mode 100644 configs/profile/packages/packages-systemd-gui.all create mode 100644 configs/profile/packages/packages-systemd-gui.i686 create mode 100644 configs/profile/packages/packages-systemd-gui.x86_64 create mode 100644 configs/profile/packages/packages-systemd.all delete mode 100644 configs/profile/packages/packages-systemd.both create mode 100644 docs/README.package_lists diff --git a/configs/profile/build.sh b/configs/profile/build.sh index 6a610d9..85cc5b5 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -2,6 +2,10 @@ set -e -u +# editions +declare -ar VALID_INITS=('openrc' 'systemd') +declare -ar VALID_GUIS=('cli' 'lxde' 'mate') + # edition-specific strings iso_title="Parabola GNU/Linux-libre Live" # $iso_edition and $iso_version appended @@ -79,14 +83,62 @@ make_basefs() { # Additional packages (root-image) make_packages() { - local _install_packages=$(grep -h -v ^# ${packages_dir}/packages-{${iso_init},${iso_gui},${iso_wm}}.{both,${arch}} 2> /dev/null || true) - local _cache_packages=$(grep -h -v ^# ${packages_dir}/packages-cache-{${iso_init},${iso_gui},${iso_wm}}.{both,${arch}} 2> /dev/null || true) - + local _packages_msg="standard packages as declared in the following files:" + local _gui_packages_msg="non-graphical packages as declared in the following files:" + # standard package lists + local _install_lists=$( ls ${packages_dir}/packages-{all,${iso_init}}.{all,${arch}} 2> /dev/null || true) + local _cache_lists=$( ls ${packages_dir}/cache-{all,${iso_init}}.{all,${arch}} 2> /dev/null || true) + # gui-specific package lists + local _install_gui_lists=$( ls ${packages_dir}/packages-{gui,${iso_gui}}.{all,${arch}} 2> /dev/null || true) + local _cache_gui_lists=$( ls ${packages_dir}/cache-{gui,${iso_gui}}.{all,${arch}} 2> /dev/null || true) + # init-specific gui package lists + local _install_initgui_lists=$(ls ${packages_dir}/packages-${iso_init}-gui.{all,${arch}} 2> /dev/null || true) + local _cache_initgui_lists=$( ls ${packages_dir}/cache-${iso_init}-gui.{all,${arch}} 2> /dev/null || true) + _install_lists=${_install_lists// /} + _cache_lists=${_cache_lists// /} + _install_gui_lists=${_install_gui_lists// /} + _cache_gui_lists=${_cache_gui_lists// /} + _install_initgui_lists=${_install_initgui_lists// /} + _cache_initgui_lists=${_cache_initgui_lists// /} + # collect standard packages + local _install_packages=$( [ "${_install_lists}" ] && grep -hv ^# ${_install_lists}) + local _cache_packages=$( [ "${_cache_lists}" ] && grep -hv ^# ${_cache_lists}) + # collect gui-specific packages + local _install_gui_packages=$( [ "${_install_gui_lists}" ] && grep -hv ^# ${_install_gui_lists}) + local _cache_gui_packages=$( [ "${_cache_gui_lists}" ] && grep -hv ^# ${_cache_gui_lists}) + # collect init-specific gui packages + local _install_initgui_packages=$([ "${_install_initgui_lists}" ] && grep -hv ^# ${_install_initgui_lists}) + local _cache_initgui_packages=$( [ "${_cache_initgui_lists}" ] && grep -hv ^# ${_cache_initgui_lists}) + if [[ "${iso_gui}" != 'cli' ]]; then + _gui_packages_msg="${_gui_packages_msg/non-graphical/graphical}" + _install_gui_lists="${_install_gui_lists} ${_install_initgui_lists}" + _cache_gui_lists="${_cache_gui_lists} ${_cache_initgui_lists}" + _install_gui_packages="${_install_gui_packages} ${_install_initgui_packages}" + _cache_gui_packages="${_cache_gui_packages} ${_cache_initgui_packages}" + fi + # display results + _install_lists=${_install_lists// /} + _cache_lists=${_cache_lists// /} + _install_gui_lists=${_install_gui_lists// /} + _cache_gui_lists=${_cache_gui_lists// /} + _install_packages=${_install_packages// /} + _cache_packages=${_cache_packages// /} + _install_gui_packages=${_install_gui_packages// /} + _cache_gui_packages=${_cache_gui_packages// /} + [ "${_install_packages}" ] && echo "Installing ${_packages_msg}" && echo "${_install_lists}" | sed "s/.*\//\t/" + [ "${_cache_packages}" ] && echo "Caching ${_packages_msg}" && echo "${_cache_lists}" | sed "s/.*\//\t/" + [ "${_install_gui_packages}" ] && echo "Installing ${_gui_packages_msg}" && echo "${_install_gui_lists}" | sed "s/.*\//\t/" + [ "${_cache_gui_packages}" ] && echo "Caching ${_gui_packages_msg}" && echo "${_cache_gui_lists}" | sed "s/.*\//\t/" + _install_packages="${_install_packages} ${_install_gui_packages}" + _cache_packages="${_cache_packages} ${_cache_gui_packages}" + + # install packages setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_install_packages}" install - # create live environment local repo + # create live environment local repo or stash package cache if [[ "$enable_offline_install" == 'true' ]]; then if [[ -n ${_cache_packages} ]]; then + # cache packages setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" -O install fi pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null @@ -120,7 +172,7 @@ make_customize_root_image() { arch="${arch}" \ iso_title="${iso_title}" \ iso_init="${iso_init}" \ - iso_wm="${iso_wm}" \ + iso_gui="${iso_gui}" \ enable_offline_install="${enable_offline_install}" \ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} \ -C ${pacman_conf} \ @@ -319,9 +371,8 @@ iso_title="${iso_title} ${iso_edition} Edition ${iso_version}" iso_filename="parabola-${iso_edition}-${iso_arch}-${iso_version}.iso" iso_filename=$(echo ${iso_filename} | tr '[:upper:]/' '[:lower:]-') iso_init=$(echo ${iso_edition} | cut -d '/' -f 1 | tr '[:upper:]' '[:lower:]') -iso_wm=$( echo ${iso_edition} | cut -d '/' -f 2 | 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' -[[ "${iso_wm}" == 'cli' ]] && iso_gui='' || iso_gui='gui' [[ "${archs}" == 'i686' ]] && arch='i686' || arch='x86_64' @@ -332,7 +383,7 @@ iso_label=${iso_label// /} iso_dirname=${iso_dirname// /} iso_filename=${iso_filename// /} iso_init=${iso_init// /} -iso_wm=${iso_wm// /} +iso_gui=${iso_gui// /} work_dir=${work_dir// /} out_dir=${out_dir// /} pacman_conf=${pacman_conf// /} @@ -350,7 +401,8 @@ elif ! pacman --version | grep libalpm > /dev/null; then elif ! pacman -Qi parabolaiso-data > /dev/null; then echo "This script needs the 'parabolaiso-data' package to be installed." exit 1 -elif ! ls ${packages_dir}/packages-{${iso_init},${iso_wm}}.both > /dev/null; then +elif ! echo "${VALID_INITS[@]}" | tr " " "\n" | grep -E "^${iso_init}$" > /dev/null || \ + ! echo "${VALID_GUIS[@]}" | tr " " "\n" | grep -E "^${iso_gui}$" > /dev/null; then echo "Invalid init/wm combination: '${iso_edition}'." exit 1 fi diff --git a/configs/profile/packages/README b/configs/profile/packages/README new file mode 100644 index 0000000..8be915a --- /dev/null +++ b/configs/profile/packages/README @@ -0,0 +1 @@ +see docs/README.package_lists diff --git a/configs/profile/packages/cache-lxde.all b/configs/profile/packages/cache-lxde.all new file mode 100644 index 0000000..67d1c9d --- /dev/null +++ b/configs/profile/packages/cache-lxde.all @@ -0,0 +1,9 @@ +# this file specifies the packages that are to be downloaded +# and cached in the /isorepo directory for offline install in all live environments +# regardless of the architecture, init system, or graphical environment + + +lightdm-gtk-greeter-settings +mate +mate-extra +volumeicon diff --git a/configs/profile/packages/cache-lxde.i686 b/configs/profile/packages/cache-lxde.i686 new file mode 100644 index 0000000..bc148a1 --- /dev/null +++ b/configs/profile/packages/cache-lxde.i686 @@ -0,0 +1,3 @@ +# this file specifies the packages that are to be downloaded +# and cached in the /isorepo directory for offline install in all i686 live environments +# regardless of the init system or graphical environment diff --git a/configs/profile/packages/cache-lxde.x86_64 b/configs/profile/packages/cache-lxde.x86_64 new file mode 100644 index 0000000..77ae04e --- /dev/null +++ b/configs/profile/packages/cache-lxde.x86_64 @@ -0,0 +1,3 @@ +# this file specifies the packages that are to be downloaded +# and cached in the /isorepo directory for offline install in all x86_64 live environments +# regardless of the init system or graphical environment diff --git a/configs/profile/packages/packages-all.all b/configs/profile/packages/packages-all.all new file mode 100644 index 0000000..dc90dd9 --- /dev/null +++ b/configs/profile/packages/packages-all.all @@ -0,0 +1,59 @@ +# this file specifies the packages that are to be installed in all live environments +# regardless of the architecture, init system, or graphical environment + + +arch-install-scripts +bash-completion +btrfs-progs +crda +darkhttpd +ddrescue +dhclient +dialog +dmraid +dnsmasq +dnsutils +dosfstools +elinks +ethtool +f2fs-tools +fsarchiver +gnu-netcat +gptfdisk +grub +irssi +lftp +linux-atm +lynx +mc +mkinitcpio-paralogo +mtools +nfs-utils +nilfs-utils +nmap +ntfs-3g +openconnect +p7zip +partclone +parted +partimage +pptpclient +ppp +rp-pppoe +smartmontools +sudo +tcpdump +testdisk +unar +unzip +usb_modeswitch +vpnc +wget +wireless_tools +wpa_actiond +wvdial +xdg-user-dirs +xl2tpd +xterm +zile +zip diff --git a/configs/profile/packages/packages-all.i686 b/configs/profile/packages/packages-all.i686 new file mode 100644 index 0000000..56e6105 --- /dev/null +++ b/configs/profile/packages/packages-all.i686 @@ -0,0 +1,3 @@ +# this file specifies the packages that are to be installed +# in all i686 live environments regardless of the init system or graphical environment +# but these packages will not be installed for other architectures diff --git a/configs/profile/packages/packages-all.x86_64 b/configs/profile/packages/packages-all.x86_64 new file mode 100644 index 0000000..bdadb22 --- /dev/null +++ b/configs/profile/packages/packages-all.x86_64 @@ -0,0 +1,6 @@ +# this file specifies the packages that are to be installed +# in all x86_64 live environments regardless of the init system or graphical environment +# but these packages will not be installed for other architectures + + +refind-efi diff --git a/configs/profile/packages/packages-cache-lxde.both b/configs/profile/packages/packages-cache-lxde.both deleted file mode 100644 index 3ee77a3..0000000 --- a/configs/profile/packages/packages-cache-lxde.both +++ /dev/null @@ -1,9 +0,0 @@ -# this file specifies the packages that are to be downloaded -# and cached in the /isorepo for offline install -# in all live environments regardless of the init system and graphical environment - - -lightdm-gtk-greeter-settings -mate -mate-extra -volumeicon diff --git a/configs/profile/packages/packages-cli.all b/configs/profile/packages/packages-cli.all new file mode 100644 index 0000000..71565c4 --- /dev/null +++ b/configs/profile/packages/packages-cli.all @@ -0,0 +1,3 @@ +# this file specifies the packages that are to be installed +# in all CLI live environments regardless of the architecture or init system +# but these packages will not be installed in graphical environments diff --git a/configs/profile/packages/packages-cli.both b/configs/profile/packages/packages-cli.both deleted file mode 100644 index e83479f..0000000 --- a/configs/profile/packages/packages-cli.both +++ /dev/null @@ -1,3 +0,0 @@ -# this file specifies the packages that are to be installed -# in all CLI live environments regardless of the init system -# but these packages will not be installed in graphical environments diff --git a/configs/profile/packages/packages-cli.i686 b/configs/profile/packages/packages-cli.i686 new file mode 100644 index 0000000..98e23e5 --- /dev/null +++ b/configs/profile/packages/packages-cli.i686 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all i686 CLI live environments regardless of the architecture or init system +# but these packages will not be installed in graphical environments +# or for other architectures diff --git a/configs/profile/packages/packages-cli.x86_64 b/configs/profile/packages/packages-cli.x86_64 new file mode 100644 index 0000000..a1de21e --- /dev/null +++ b/configs/profile/packages/packages-cli.x86_64 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all x86_64 CLI live environments regardless of the architecture or init system +# but these packages will not be installed in graphical environments +# or for other architectures diff --git a/configs/profile/packages/packages-gui.both b/configs/profile/packages/packages-gui.both deleted file mode 100644 index 1e294ad..0000000 --- a/configs/profile/packages/packages-gui.both +++ /dev/null @@ -1,64 +0,0 @@ -# this file specifies the packages that are to be installed -# in all graphical live environments regardless of the init system and WM -# but these packages will not be installed in CLI environments - - -# GUI Programs -abiword -calamares -dmidecode -gnumeric -gparted -icedove -icedove-l10n-es-es -icedove-l10n-gl -icedove-l10n-pt-br -iceweasel -iceweasel-l10n-es-es -iceweasel-l10n-gl -iceweasel-l10n-pt-br -leafpad -octopi -octopi-cachecleaner -octopi-notifier -octopi-repoeditor -pidgin -qtox -ring-client-gnome -smplayer -zenity - - -# Xserver -ttf-dejavu -xorg-server -xf86-video-amdgpu -xf86-video-ati -xf86-video-dummy -xf86-video-fbdev -xf86-video-intel -xf86-video-nouveau -xf86-video-openchrome -xf86-video-qxl -xf86-video-sisusb -xf86-video-vesa -xf86-video-vmware -xf86-video-voodoo -xorg-xinit - - -# Multimedia -alsa-utils -gst-libav -gst-plugins-good -pulseaudio-alsa - - -# Network -gnome-keyring -networkmanager -network-manager-applet - - -# Theming -grub2-theme-gnuaxiom diff --git a/configs/profile/packages/packages-lxde.all b/configs/profile/packages/packages-lxde.all new file mode 100644 index 0000000..968c910 --- /dev/null +++ b/configs/profile/packages/packages-lxde.all @@ -0,0 +1,30 @@ +# this file specifies the packages that are to be installed +# in all LXDE live environments regardless of the architecture or init system +# but these packages will not be installed in other graphical environments + + +epdfview +galculator-gtk2 +gnumeric +gparted +gpicview +gksu +gnome-screenshot +lxappearance +lxappearance-obconf +lxde-common +lxde-icon-theme +lxhotkey +lxinput +lxlauncher +lxmusic +lxpanel +lxrandr +lxsession +lxtask +lxterminal +openbox +obconf +pcmanfm +xarchiver +xscreensaver diff --git a/configs/profile/packages/packages-lxde.both b/configs/profile/packages/packages-lxde.both deleted file mode 100644 index fc8d9f0..0000000 --- a/configs/profile/packages/packages-lxde.both +++ /dev/null @@ -1,30 +0,0 @@ -# this file specifies the packages that are to be installed -# in all LXDE live environments regardless of the init system -# but these packages will not be installed in CLI or other graphical environments - - -epdfview -galculator-gtk2 -gnumeric -gparted -gpicview -gksu -gnome-screenshot -lxappearance -lxappearance-obconf -lxde-common -lxde-icon-theme -lxhotkey -lxinput -lxlauncher -lxmusic -lxpanel -lxrandr -lxsession -lxtask -lxterminal -openbox -obconf -pcmanfm -xarchiver -xscreensaver diff --git a/configs/profile/packages/packages-lxde.i686 b/configs/profile/packages/packages-lxde.i686 new file mode 100644 index 0000000..377b31b --- /dev/null +++ b/configs/profile/packages/packages-lxde.i686 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all i686 LXDE live environments regardless of the init system +# but these packages will not be installed in other graphical environments +# or for other architectures diff --git a/configs/profile/packages/packages-lxde.x86_64 b/configs/profile/packages/packages-lxde.x86_64 new file mode 100644 index 0000000..42bd23f --- /dev/null +++ b/configs/profile/packages/packages-lxde.x86_64 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all x86_64 LXDE live environments regardless of the init system +# but these packages will not be installed in other graphical environments +# or for other architectures diff --git a/configs/profile/packages/packages-mate.all b/configs/profile/packages/packages-mate.all new file mode 100644 index 0000000..20db68e --- /dev/null +++ b/configs/profile/packages/packages-mate.all @@ -0,0 +1,9 @@ +# this file specifies the packages that are to be installed +# in all Mate live environments regardless of the architecture or init system +# but these packages will not be installed in CLI or other graphical environments + + +lightdm-gtk-greeter-settings +mate +mate-extra +volumeicon diff --git a/configs/profile/packages/packages-mate.both b/configs/profile/packages/packages-mate.both deleted file mode 100644 index 0651c02..0000000 --- a/configs/profile/packages/packages-mate.both +++ /dev/null @@ -1,9 +0,0 @@ -# this file specifies the packages that are to be installed -# in all Mate live environments regardless of the init system -# but these packages will not be installed in CLI or other graphical environments - - -lightdm-gtk-greeter-settings -mate -mate-extra -volumeicon diff --git a/configs/profile/packages/packages-mate.i686 b/configs/profile/packages/packages-mate.i686 new file mode 100644 index 0000000..2a0fb12 --- /dev/null +++ b/configs/profile/packages/packages-mate.i686 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all i686 Mate live environments regardless of the init system +# but these packages will not be installed in CLI or other graphical environments +# or for other architectures diff --git a/configs/profile/packages/packages-mate.x86_64 b/configs/profile/packages/packages-mate.x86_64 new file mode 100644 index 0000000..c2c5360 --- /dev/null +++ b/configs/profile/packages/packages-mate.x86_64 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all x86_64 Mate live environments regardless of the init system +# but these packages will not be installed in CLI or other graphical environments +# or for other architectures diff --git a/configs/profile/packages/packages-openrc-gui.all b/configs/profile/packages/packages-openrc-gui.all new file mode 100644 index 0000000..03f55f0 --- /dev/null +++ b/configs/profile/packages/packages-openrc-gui.all @@ -0,0 +1,12 @@ +# this file specifies the packages that are to be installed +# in all OpenRC graphical live environments regardless of the architecture or WM +# but these packages will not be installed in CLI environments or with other init systems + + +# Services +gnome-screenshot +gvfs-mtp +gvfs-gphoto2 +networkmanager-elogind +openrc-desktop +polkit-elogind diff --git a/configs/profile/packages/packages-openrc-gui.i686 b/configs/profile/packages/packages-openrc-gui.i686 new file mode 100644 index 0000000..80a857c --- /dev/null +++ b/configs/profile/packages/packages-openrc-gui.i686 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all i686 OpenRC graphical live environments regardless of the WM +# but these packages will not be installed in CLI environments or with other init systems +# or other architectures diff --git a/configs/profile/packages/packages-openrc-gui.x86_64 b/configs/profile/packages/packages-openrc-gui.x86_64 new file mode 100644 index 0000000..6099dfe --- /dev/null +++ b/configs/profile/packages/packages-openrc-gui.x86_64 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all x86_64 OpenRC graphical live environments regardless of the WM +# but these packages will not be installed in CLI environments or with other init systems +# or other architectures diff --git a/configs/profile/packages/packages-openrc.all b/configs/profile/packages/packages-openrc.all new file mode 100644 index 0000000..7a15fb2 --- /dev/null +++ b/configs/profile/packages/packages-openrc.all @@ -0,0 +1,14 @@ +# this file specifies the packages that are to be installed +# in all OpenRC live environments regardless of the architecture or graphical environment +# but these packages will not be installed with other init systems + + +gpm-openrc +haveged-openrc +hdparm-openrc +networkmanager-openrc +ntp-openrc +openssh-openrc +openvpn-openrc +rsync-openrc +wpa_supplicant-openrc diff --git a/configs/profile/packages/packages-openrc.both b/configs/profile/packages/packages-openrc.both deleted file mode 100644 index 08d5909..0000000 --- a/configs/profile/packages/packages-openrc.both +++ /dev/null @@ -1,68 +0,0 @@ -# this file specifies the packages that are to be installed -# in all OpenRC live environments regardless of the graphical environment -# but these packages will not be installed with other init systems - - -arch-install-scripts -bash-completion -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -elinks -ethtool -f2fs-tools -fsarchiver -gnu-netcat -gpm-openrc -gptfdisk -grub -haveged-openrc -hdparm-openrc -irssi -lftp -linux-atm -lynx -mc -mkinitcpio-paralogo -mtools -networkmanager-openrc -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntp-openrc -openconnect -openssh-openrc -openvpn-openrc -p7zip -partclone -parted -partimage -pptpclient -ppp -rp-pppoe -rsync-openrc -smartmontools -sudo -tcpdump -testdisk -unar -unzip -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wpa_supplicant-openrc -wvdial -xl2tpd -xterm -zile -zip diff --git a/configs/profile/packages/packages-openrc.i686 b/configs/profile/packages/packages-openrc.i686 index e69de29..7de1acd 100644 --- a/configs/profile/packages/packages-openrc.i686 +++ b/configs/profile/packages/packages-openrc.i686 @@ -0,0 +1,3 @@ +# this file specifies the packages that are to be installed +# in all i686 OpenRC live environments regardless of the graphical environment +# but these packages will not be installed with other init systems or for other architectures diff --git a/configs/profile/packages/packages-systemd-gui.all b/configs/profile/packages/packages-systemd-gui.all new file mode 100644 index 0000000..22cf8d4 --- /dev/null +++ b/configs/profile/packages/packages-systemd-gui.all @@ -0,0 +1,7 @@ +# this file specifies the packages that are to be installed +# in all SystemD graphical live environments regardless of the architecture or WM +# but these packages will not be installed in CLI environments or with other init systems + + +# Services +networkmanager diff --git a/configs/profile/packages/packages-systemd-gui.i686 b/configs/profile/packages/packages-systemd-gui.i686 new file mode 100644 index 0000000..3c8b235 --- /dev/null +++ b/configs/profile/packages/packages-systemd-gui.i686 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all i686 SystemD graphical live environments regardless of the WM +# but these packages will not be installed in CLI environments or with other init systems +# or for other architectures diff --git a/configs/profile/packages/packages-systemd-gui.x86_64 b/configs/profile/packages/packages-systemd-gui.x86_64 new file mode 100644 index 0000000..1e74026 --- /dev/null +++ b/configs/profile/packages/packages-systemd-gui.x86_64 @@ -0,0 +1,4 @@ +# this file specifies the packages that are to be installed +# in all x86_64 SystemD graphical live environments regardless of the WM +# but these packages will not be installed in CLI environments or with other init systems +# or for other architectures diff --git a/configs/profile/packages/packages-systemd.all b/configs/profile/packages/packages-systemd.all new file mode 100644 index 0000000..5bf8c77 --- /dev/null +++ b/configs/profile/packages/packages-systemd.all @@ -0,0 +1,13 @@ +# this file specifies the packages that are to be installed +# in all SystemD live environments regardless of the architecture or graphical environment +# but these packages will not be installed with other init systems + + +gpm +haveged +hdparm +ntp +openssh +openvpn +rsync +wpa_supplicant diff --git a/configs/profile/packages/packages-systemd.both b/configs/profile/packages/packages-systemd.both deleted file mode 100644 index 65b33c1..0000000 --- a/configs/profile/packages/packages-systemd.both +++ /dev/null @@ -1,67 +0,0 @@ -# this file specifies the packages that are to be installed -# in all SystemD live environments regardless of the graphical environment -# but these packages will not be installed with other init systems - - -arch-install-scripts -bash-completion -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -elinks -ethtool -f2fs-tools -fsarchiver -gnu-netcat -gpm -gptfdisk -grub -haveged -hdparm -irssi -lftp -linux-atm -lynx -mc -mkinitcpio-paralogo -mtools -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntp -openconnect -openssh -openvpn -p7zip -partclone -parted -partimage -pptpclient -ppp -rp-pppoe -rsync -smartmontools -sudo -tcpdump -testdisk -unar -unzip -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wpa_supplicant -wvdial -xl2tpd -xterm -zile -zip diff --git a/configs/profile/packages/packages-systemd.x86_64 b/configs/profile/packages/packages-systemd.x86_64 index a93654a..ed21183 100644 --- a/configs/profile/packages/packages-systemd.x86_64 +++ b/configs/profile/packages/packages-systemd.x86_64 @@ -2,4 +2,5 @@ # in all x86_64 SystemD live environments regardless of the graphical environment # but these packages will not be installed with other init systems or for other architectures + refind-efi diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh index 505bf3d..c602220 100755 --- a/configs/profile/root-image/root/customize_root_image.sh +++ b/configs/profile/root-image/root/customize_root_image.sh @@ -31,7 +31,7 @@ readonly OPENRC_USER_GROUPS="disk,sys" readonly USER_GROUPS="${LIVE_USER_GROUPS}" [ "${enable_offline_install}" == 'true' ] && readonly INSTALL_TYPE="Complete" || \ readonly INSTALL_TYPE="NetInstall" -readonly WELCOME_TITLE="Parabola ${iso_init}/${iso_wm} Edition - (${INSTALL_TYPE})" +readonly WELCOME_TITLE="Parabola ${iso_init}/${iso_gui} Edition - (${INSTALL_TYPE})" set -e -u @@ -78,7 +78,7 @@ then systemctl enable ${SYSTEMD_SERVICES_ALL} rm /etc/X11/Xwrapper.config # enable services - [[ "${iso_wm}" != 'cli' ]] && systemctl enable ${SYSTEMD_SERVICES_GUI} + [[ "${iso_gui}" != 'cli' ]] && systemctl enable ${SYSTEMD_SERVICES_GUI} elif [[ "${iso_init}" == 'openrc' ]] # delete files that are specific to other init systems rm /etc/hostname @@ -90,7 +90,7 @@ elif [[ "${iso_init}" == 'openrc' ]] # enable services for service in ${OPENRC_SERVICES_ALL} ; do rc-update add ${service} default ; done ; - if [[ "${iso_wm}" != 'cli' ]] + if [[ "${iso_gui}" != 'cli' ]] then for service in ${OPENRC_SERVICES_GUI} ; do rc-update add ${service} default ; done ; fi @@ -105,7 +105,7 @@ usermod -s ${DEFAULT_SHELL} root 2> /dev/null # configure CLI login session sed -i "s|_EDITION_TITLE_|${iso_title}|" /etc/motd sed -i "s|_NETWORK_MOTD_MSG_|${NETWORK_MOTD_MSG}| ; s|^>>>>\(.*\)| \1|g" /etc/motd -if [[ "${iso_wm}" == 'cli' ]] +if [[ "${iso_gui}" == 'cli' ]] then cp ${ROOT_SKEL_FILES} /root/ sed -i "s|_DESKTOP_SESSION_||" /root/.bash_profile @@ -122,14 +122,14 @@ else # configure GUI login session and live user sed -i "s|--question|--info|" /home/${LIVE_USER}/.config/autostart/autostart.sh sed -i "s|--cancel-label=.*|\&|" /home/${LIVE_USER}/.config/autostart/autostart.sh - if [[ "${iso_wm}" == 'lxde' ]] + if [[ "${iso_gui}" == 'lxde' ]] then rm -f /etc/xdg/autostart/octopi-notifier.desktop 2> /dev/null sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.bash_profile sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.dmrc - elif [[ "${iso_wm}" == 'mate' ]] + elif [[ "${iso_gui}" == 'mate' ]] then sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.bash_profile sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.dmrc - else echo "invalid \$iso_wm for _DESKTOP_SESSION_ '${iso_wm}'" + else echo "invalid \$iso_gui for _DESKTOP_SESSION_ '${iso_gui}'" exit 1 fi diff --git a/docs/README.package_lists b/docs/README.package_lists new file mode 100644 index 0000000..e8bda32 --- /dev/null +++ b/docs/README.package_lists @@ -0,0 +1,51 @@ +*** Package Lists Schema + +The configs/profile/packages/ directory contains the package declarations for all ISOs. +The filename extension specifies the applicable target architecture (or '.all'). +The package lists with filenames ending in '.all' will be installed for all architectures +whereas the architecture-specific package lists will be installed only for that architecture. +In any case, these packages will be installed only where the filename prefix applies. + +An analagous set of package list files with the filename prefix 'cache-' repalcing 'packages-' +are supported for packages that are to be cached (but not installed) +in the /isorepo directory of offline-install ISOs (arg: '-O'). + +All of these package list files are strictly optional. +Any applicable package list files will be considered if they are found to exist at runtime. +Building with an empty configs/profile/packages/ directory would result in +an ISO with only the specified base package group installed ('base' by default). + +* packages-all. + => Installed in all ISOs. + +* packages-all-gui. + => Installed in all graphical ISOs exclusively. + => e.g. args: '-E OpenRC/LXDE', '-E SystemD/Mate' + +* packages-cli. + => Installed in all CLI ISOs exclusively. + => e.g. args: '-E OpenRC/CLI', '-E SystemD/CLI' + +* packages-lxde. + => Installed in all LXDE ISOs exclusively. + => e.g. args: '-E OpenRC/LXDE', '-E SystemD/LXDE' + +* packages-mate. + => Installed in all Mate ISOs exclusively. + => e.g. args: '-E OpenRC/Mate', '-E SystemD/Mate' + +* packages-openrc. + => Installed in all OpenRC ISOs exclusively. + => e.g. args: '-E OpenRC/CLI', '-E OpenRC/LXDE' + +* packages-openrc-gui. + => Installed in all graphical OpenRC ISOs exclusively. + => e.g. args: '-E OpenRC/LXDE', '-E OpenRC/Mate' + +* packages-systemd. + => Installed in all SystemD ISOs exclusively. + => e.g. args: '-E SystemD/CLI', '-E SystemD/LXDE' + +* packages-systemd-gui. + => Installed in all graphical SystemD ISOs exclusively. + => e.g. args: '-E SystemD/LXDE', '-E SystemD/Mate' -- cgit v1.2.2