Remove Linux Minimal build

- Merge archiso profiles
- Merge package lists
- Merge full/minimal sections in build_linux
- Remove minimal boot entries
- Remove minimal from build-ufd config and scripts
- Update Linux README.md

Addresses #207

scripts/wk/cfg/ufd.py

@@ -9,7 +9,6 @@ from wk.cfg.main import KIT_NAME_FULL
 # General
 SOURCES = OrderedDict({
   'Linux':            {'Arg': '--linux',          'Type': 'ISO'},
-  'Linux (Minimal)':  {'Arg': '--linux-minimal',  'Type': 'ISO'},
   'WinPE':            {'Arg': '--winpe',          'Type': 'ISO'},
   'Main Kit':         {'Arg': '--main-kit',       'Type': 'KIT'},
   'Extra Dir':        {'Arg': '--extra-dir',      'Type': 'DIR'},
@@ -18,7 +17,6 @@ SOURCES = OrderedDict({
 # Definitions: Boot entries
 BOOT_ENTRIES = {
   # Path to check:      Comment to remove
-  '/arch_minimal':      'UFD-MINIMAL',
   '/sources/boot.wim':  'UFD-WINPE',
   }
 BOOT_FILES = {
@@ -44,12 +42,6 @@ ITEMS = {
     ('/EFI/boot',                             '/EFI/'),
     ('/syslinux',                             '/'),
     ),
-  'Linux (Minimal)': (
-    ('/arch/boot/x86_64/initramfs-linux.img', '/arch_minimal/'),
-    ('/arch/boot/x86_64/vmlinuz-linux',       '/arch_minimal/'),
-    ('/arch/pkglist.x86_64.txt',              '/arch_minimal/'),
-    ('/arch/x86_64',                          '/arch_minimal/'),
-    ),
   'Main Kit': (
     ('/',                                     f'/{KIT_NAME_FULL}/'),
     ),
@@ -69,7 +61,6 @@ ITEMS = {
 ITEMS_HIDDEN = (
   # Linux (all versions)
   'arch',
-  'arch_minimal',
   'EFI',
   'syslinux',
   # Main Kit

scripts/wk/kit/ufd.py

@@ -30,7 +30,6 @@ DOCSTRING = '''WizardKit: Build UFD
 Usage:
   build-ufd [options] --ufd-device PATH
             [--linux PATH]
-            [--linux-minimal PATH]
             [--main-kit PATH]
             [--winpe PATH]
             [--extra-dir PATH]
@@ -41,7 +40,6 @@ Options:
   -e PATH, --extra-dir PATH
   -k PATH, --main-kit PATH
   -l PATH, --linux PATH
-  -m PATH, --linux-minimal PATH
   -u PATH, --ufd-device PATH
   -w PATH, --winpe PATH
 

setup/build_linux

@@ -76,12 +76,7 @@ function load_settings() {
 
 function copy_live_env() {
   echo "Copying Archlinux files..."
-  rsync -aI "$ROOT_DIR/setup/linux/profile_base/" "$PROFILE_DIR/"
+  rsync -aI "$ROOT_DIR/setup/linux/profile/" "$PROFILE_DIR/"
-
-  # Add items
-  if [[ "${1:-}" != "--minimal" ]]; then
-    rsync -aI "$ROOT_DIR/setup/linux/profile_gui/" "$PROFILE_DIR/"
-  fi
   mkdir -p "$PROFILE_DIR/airootfs/usr/local/bin"
   rsync -aI "$ROOT_DIR/scripts/" "$PROFILE_DIR/airootfs/usr/local/bin/"
 
@@ -159,9 +154,6 @@ function update_live_env() {
 
   # Live packages
   cp "$ROOT_DIR/setup/linux/packages/base" "$PROFILE_DIR/packages.x86_64"
-  if [[ "${1:-}" != "--minimal" ]]; then
-    cat "$ROOT_DIR/setup/linux/packages/gui" >> "$PROFILE_DIR/packages.x86_64"
-  fi
   echo "[custom]" >> "$PROFILE_DIR/pacman.conf"
   echo "SigLevel = Optional TrustAll" >> "$PROFILE_DIR/pacman.conf"
   echo "Server = file://$REPO_DIR" >> "$PROFILE_DIR/pacman.conf"
@@ -182,22 +174,20 @@ function update_live_env() {
   rm -Rf "$SKEL_DIR/.oh-my-zsh/.git"
   curl -o "$SKEL_DIR/.oh-my-zsh/themes/lean.zsh-theme" https://raw.githubusercontent.com/miekg/lean/master/prompt_lean_setup
 
-  if [[ "${1:-}" != "--minimal" ]]; then
+  # Openbox theme
-    # Openbox theme
+  git clone --depth=1 https://github.com/addy-dclxvi/Openbox-Theme-Collections.git "$TEMP_DIR/ob-themes"
-    git clone --depth=1 https://github.com/addy-dclxvi/Openbox-Theme-Collections.git "$TEMP_DIR/ob-themes"
+  mkdir -p "$PROFILE_DIR/airootfs/usr/share/themes"
-    mkdir -p "$PROFILE_DIR/airootfs/usr/share/themes"
+  cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$PROFILE_DIR/airootfs/usr/share/themes/"
-    cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$PROFILE_DIR/airootfs/usr/share/themes/"
 
-    # Rofi
+  # Rofi
-    ## Probably don't need the exact commit but it'll be fine
+  ## Probably don't need the exact commit but it'll be fine
-    mkdir -p "$PROFILE_DIR/airootfs/usr/share/fonts/"
+  mkdir -p "$PROFILE_DIR/airootfs/usr/share/fonts/"
-    curl -Lo \
+  curl -Lo \
-      "$PROFILE_DIR/airootfs/usr/share/fonts/Fantasque-Sans-Mono-Nerd-Font.ttf" \
+    "$PROFILE_DIR/airootfs/usr/share/fonts/Fantasque-Sans-Mono-Nerd-Font.ttf" \
-      "https://github.com/adi1090x/rofi/raw/9c4093c665326bb08d6affc7e16d18d8f25c4452/fonts/Fantasque-Sans-Mono-Nerd-Font.ttf"
+    "https://github.com/adi1090x/rofi/raw/9c4093c665326bb08d6affc7e16d18d8f25c4452/fonts/Fantasque-Sans-Mono-Nerd-Font.ttf"
-    curl -Lo \
+  curl -Lo \
-      "$PROFILE_DIR/airootfs/usr/share/fonts/Feather.ttf" \
+    "$PROFILE_DIR/airootfs/usr/share/fonts/Feather.ttf" \
-      "https://github.com/adi1090x/rofi/raw/9c4093c665326bb08d6affc7e16d18d8f25c4452/fonts/Feather.ttf"
+    "https://github.com/adi1090x/rofi/raw/9c4093c665326bb08d6affc7e16d18d8f25c4452/fonts/Feather.ttf"
-  fi
 
   # SSH
   mkdir -p "$SKEL_DIR/.ssh"
@@ -216,15 +206,13 @@ function update_live_env() {
   # Timezone
   ln -sf "/usr/share/zoneinfo/$LINUX_TIME_ZONE" "$PROFILE_DIR/airootfs/etc/localtime"
 
-  if [[ "${1:-}" != "--minimal" ]]; then
+  # VNC password
-    # VNC password
+  mkdir "$SKEL_DIR/.vnc"
-    mkdir "$SKEL_DIR/.vnc"
+  echo "$TECH_PASSWORD" | vncpasswd -f > "$SKEL_DIR/.vnc/passwd"
-    echo "$TECH_PASSWORD" | vncpasswd -f > "$SKEL_DIR/.vnc/passwd"
 
-    # Wallpaper
+  # Wallpaper
-    mkdir -p "$PROFILE_DIR/airootfs/usr/share/wallpaper"
+  mkdir -p "$PROFILE_DIR/airootfs/usr/share/wallpaper"
-    cp "$ROOT_DIR/images/Linux.png" "$PROFILE_DIR/airootfs/usr/share/wallpaper/burned.in"
+  cp "$ROOT_DIR/images/Linux.png" "$PROFILE_DIR/airootfs/usr/share/wallpaper/burned.in"
-  fi
 
   # udevil
   mkdir -p "$PROFILE_DIR/airootfs/media"
@@ -320,21 +308,12 @@ function build_linux() {
     update_repo
   fi
 
-  # Build requested version(s)
+  # Build live environment
-  for version in "$@"; do
+  copy_live_env
-    if [[ "$version" == "Full" ]]; then
+  update_live_env
-      copy_live_env
+
-      update_live_env
+  # Rerun script as root to start Archiso build process
-    elif [[ "$version" == "Minimal" ]]; then
+  run_elevated "$(realpath "$0")" --build-iso
-      copy_live_env --minimal
-      update_live_env --minimal
-    fi
-    # Rerun script as root to start Archiso build process
-    run_elevated "$(realpath "$0")" --build-iso
-    # Cleanup
-    mv -nv "$PROFILE_DIR" "${PROFILE_DIR}.${version}"
-    perl-rename -v "s/(${KIT_NAME_SHORT}-Linux)-(${DATE}.*)/\1-${version}-\2/" "$OUT_DIR"/*
-  done
 }
 
 function build_iso() {
@@ -385,13 +364,8 @@ function build_iso() {
 
 # Check input
 case ${1:-} in
-  -a|--build-all)
+  -b|--build)
-    build_linux Full Minimal
+    build_linux
-    echo Done
-    ;;
-
-  -b|--build-full)
-    build_linux Full
     echo Done
     ;;
 
@@ -405,18 +379,6 @@ case ${1:-} in
     echo Done
     ;;
 
-  -m|--build-minimal)
-    build_linux Minimal
-    echo Done
-    ;;
-
-  -n|--prep-minimal-env)
-    load_settings --edit
-    copy_live_env --minimal
-    update_live_env --minimal
-    echo Done
-    ;;
-
   -o|--build-iso)
     load_settings
     build_iso
@@ -439,18 +401,15 @@ case ${1:-} in
     echo "Usage: $(basename "$0") [OPTIONS]"
     echo ""
     echo "Options:"
-    echo "    -a --build-all        Perform all tasks to build all isos"
+    echo "    -b --build          Perform all tasks to build the iso"
-    echo "    -b --build-full       Perform all tasks to build the full iso"
+    echo "    -h --help           Show usage"
-    echo "    -m --build-minimal    Perform all tasks to build the minimal iso"
-    echo "    -h --help             Show usage"
     echo ""
     echo "Advanced options:"
-    echo "    -f --fix-perms        Fix folder permissions"
+    echo "    -f --fix-perms      Fix folder permissions"
-    echo "    -i --install-deps     Install build dependencies"
+    echo "    -i --install-deps   Install build dependencies"
-    echo "    -n --prep-minimal-env Prep live & airootfs folders (minimal packages)"
+    echo "    -o --build-iso      Build ISO (using current setup)"
-    echo "    -o --build-iso        Build ISO (using current setup)"
+    echo "    -p --prep-live-env  Prep live & airootfs folders"
-    echo "    -p --prep-live-env    Prep live & airootfs folders"
+    echo "    -u --update-repo    Update custom pacman repo"
-    echo "    -u --update-repo      Update custom pacman repo"
     ;;
 esac
 

setup/linux/README.md

@@ -1,11 +1,3 @@
 # WizardKit: Linux #
 
 Files used to create the Linux build(s).
-
-## Profiles ##
-
-profile_base is used for both full and minimal Linux builds.
-
-profile_gui is only used for full Linux builds.
-
-NOTE: The Minimal Linux build is currently deprecated and may be removed from a future release.

setup/linux/packages/base

@@ -2,6 +2,8 @@ aic94xx-firmware
 alsa-utils
 amd-ucode
 antiword
+arandr
+arc-gtk-theme
 arch-install-scripts
 base
 bc
@@ -9,35 +11,52 @@ bind
 bluez
 bluez-utils
 btrfs-progs
+cbatticon
 chntpw
 cmatrix
 colordiff
+conky
 cpio
 cryptsetup
 curl
 ddrescue
+ddrescueview-bin
 device-mapper
 diffutils
 dmidecode
 dmraid
 dos2unix
 dosfstools
+dunst
 e2fsprogs
 edk2-shell
+evince
 exfatprogs
+feh
+ffmpeg
+firefox
+gnome-keyring
+gparted
+gpicview
 gptfdisk
+gsmartcontrol
+hardinfo-gtk3
 hexedit
 hfsprogs
 htop
 inetutils
 intel-ucode
 iwd
+iwgtk
 jfsutils
 ldns
+leafpad
 less
 lha
 libewf
+libinput
 libldm
+libxft
 linux
 linux-firmware
 lm_sensors
@@ -49,16 +68,26 @@ mdadm
 mediainfo
 memtest86+
 memtest86-efi
+mesa-demos
 mkinitcpio
 mkinitcpio-archiso
+mkvtoolnix-cli
 mprime-bin
+mpv
 mtools
 nano
 ncdu
+noto-fonts
+noto-fonts-cjk
+numlockx
 nvme-cli
+openbox
 openssh
+otf-font-awesome-4
 p7zip
+papirus-icon-theme
 perl
+picom
 pipes.sh
 pv
 python
@@ -67,14 +96,19 @@ python-psutil
 python-pytz
 python-requests
 qemu-guest-agent
+qemu-guest-agent
 reiserfsprogs
 reiserfsprogs
 rfkill
 rng-tools
+rofi
 rsync
+rxvt-unicode
 rxvt-unicode-terminfo
 smartmontools-svn
 speedtest-cli
+spice-vdagent
+st
 sudo
 sysbench
 sysfsutils
@@ -83,8 +117,15 @@ systemd-sysvcompat
 terminus-font
 testdisk
 texinfo
+thunar
+tigervnc
+tint2
+tk
 tmux
 tree
+ttf-font-awesome-4
+ttf-hack
+ttf-inconsolata
 udevil
 udisks2
 ufw
@@ -93,11 +134,26 @@ unrar
 unzip
 usbutils
 util-linux
+veracrypt
 vim
+virtualbox-guest-utils
+volumeicon
 wd719x-firmware
 which
 wimlib
+wmctrl
+xarchiver
+xf86-input-libinput
+xf86-video-amdgpu
+xf86-video-fbdev
+xf86-video-nouveau
+xf86-video-vesa
 xfsprogs
+xorg-server
+xorg-xdpyinfo
+xorg-xev
+xorg-xinit
+xorg-xinput
 xz
 zip
 zsh

setup/linux/packages/gui

@@ -1,56 +0,0 @@
-arandr
-arc-gtk-theme
-cbatticon
-conky
-ddrescueview-bin
-dunst
-evince
-feh
-ffmpeg
-firefox
-gnome-keyring
-gparted
-gpicview
-gsmartcontrol
-hardinfo-gtk3
-iwgtk
-leafpad
-libinput
-libxft
-mesa-demos
-mkvtoolnix-cli
-mpv
-noto-fonts
-noto-fonts-cjk
-numlockx
-openbox
-otf-font-awesome-4
-papirus-icon-theme
-picom
-qemu-guest-agent
-rofi
-rxvt-unicode
-spice-vdagent
-st
-thunar
-tigervnc
-tint2
-tk
-ttf-font-awesome-4
-ttf-hack
-ttf-inconsolata
-veracrypt
-virtualbox-guest-utils
-volumeicon
-wmctrl
-xarchiver
-xf86-input-libinput
-xf86-video-amdgpu
-xf86-video-fbdev
-xf86-video-nouveau
-xf86-video-vesa
-xorg-server
-xorg-xdpyinfo
-xorg-xev
-xorg-xinit
-xorg-xinput

setup/linux/profile/EFI/boot/refind.conf

@@ -30,15 +30,6 @@ menuentry "Linux" {
     submenuentry "Linux (CLI)" {
         add_options "nox"
     }
-    #UFD-MINIMAL#submenuentry "Linux (Minimal)" {
-    #UFD-MINIMAL#    loader /arch_minimal/vmlinuz-linux
-    #UFD-MINIMAL#    initrd
-    #UFD-MINIMAL#    initrd /arch/boot/intel_ucode.img
-    #UFD-MINIMAL#    initrd /arch/boot/amd_ucode.img
-    #UFD-MINIMAL#    initrd /arch_minimal/initramfs-linux.img
-    #UFD-MINIMAL#    options
-    #UFD-MINIMAL#    options "archisobasedir=arch_minimal archisolabel=%ARCHISO_LABEL% copytoram loglevel=3"
-    #UFD-MINIMAL#}
 }
 
 #UFD-MACOS-10.11#menuentry "macOS (El Capitan)" {