Refactored package list for easier driver and common software management

build.sh

@@ -12,11 +12,10 @@ if [ "$(id -u)" != "0" ]; then
 fi
 
 # Use find to locate base files and extract filenames directly, converting newlines to spaces
-desktop_list=$(find packages -type f -name '*base*' -exec basename {} \; | tr '\n' ' ')
+find packages -type f ! -name '*base*' ! -name '*common*' ! -name '*drivers*' -exec basename {} \; | sort -u | tr '\n' ' '
 
 # Find all files in the desktop_config directory
 desktop_config_list=$(find desktop_config -type f)
-
 help_function()
 {
   printf "Usage: %s -d desktop -r release type\n" "$0"
@@ -26,7 +25,6 @@ help_function()
   printf "\t-t Test: FreeBSD os packages\n"
    exit 1 # Exit script after printing help
 }
-
 # Set mate and release to be default
 export desktop="mate"
 export build_type="release"
@@ -184,12 +182,16 @@ packages_software()
   mkdir -p ${release}/var/cache/pkg
   mount_nullfs ${packages_storage} ${release}/var/cache/pkg
   mount -t devfs devfs ${release}/dev
-  packages="$(cat "${cwd}/packages/${desktop}")"
-  vital_packages="$(cat "${cwd}/packages/vital/${desktop}")"
+  de_packages="$(cat "${cwd}/packages/${desktop}")"
+  common_packages="$(cat "${cwd}/packages/common")"
+  drivers_packages="$(cat "${cwd}/packages/drivers")"
+  echo ${drivers_packages}
+  vital_de_packages="$(cat "${cwd}/packages/vital/${desktop}")"
+  vital_common_packages="$(cat "${cwd}/packages/vital/common")"
   # shellcheck disable=SC2086
-  pkg -c ${release} install -y ${packages}
+  pkg -c ${release} install -y ${de_packages} ${common_packages} ${drivers_packages}
   # shellcheck disable=SC2086
-  pkg -c ${release} set -y -v 1 ${vital_packages}
+  pkg -c ${release} set -y -v 1 ${vital_de_packages}  ${vital_common_packages}
   mkdir -p ${release}/proc
   mkdir -p ${release}/compat/linux/proc
   rm ${release}/etc/resolv.conf

packages/common

@@ -0,0 +1,27 @@
+cups
+cups-filters
+drm-kmod
+evolution
+firefox
+foomatic-db
+fusefs-ext2
+gbi
+ghostbsd-fonts
+ghostbsd-icons
+ghostbsd-utils
+ghostbsd-wallpapers
+gnome-keyring
+nss_mdns
+pc-sysinstall
+pkg
+python
+rhythmbox
+shotwell
+slick-greeter
+system-config-printer
+unzip
+vlc
+webrtc-audio-processing
+xconfig
+xorg-minimal
+zip

packages/drivers

@@ -0,0 +1,16 @@
+bwi-firmware-kmod
+bwn-firmware-kmod
+drm-kmod
+egl-wayland
+gstreamer1-plugins-neon
+realtek-re-kmod
+utouch-kmod
+virtualbox-ose-additions
+xf86-input-evdev
+xf86-input-joystick
+xf86-input-keyboard
+xf86-input-mouse
+xf86-input-synaptics
+xf86-input-vmmouse
+xf86-video-scfb
+xf86-video-vesa

packages/mate

@@ -1,37 +1,8 @@
 brisk-menu
-cups
-cups-filters
 cursor-dmz-theme
 dconf-editor
-drm-kmod
-egl-wayland
-evolution
-firefox
-foomatic-db
 freedesktop-sound-theme
-fusefs-ext2
 gbi
-ghostbsd-drivers
-ghostbsd-fonts
-ghostbsd-icons
 ghostbsd-mate
-ghostbsd-utils
-gstreamer1-plugins-neon
-nss_mdns
-pc-sysinstall
-pkg
 plank
-python
-rhythmbox
-shotwell
-slick-greeter
-station-tweak
-system-config-printer
-utouch-kmod
-virtualbox-ose-additions
-vlc
-webrtc-audio-processing
-xconfig
-xf86-input-evdev
-xorg-minimal
-zip
+station-tweak

packages/vital/common

@@ -0,0 +1,11 @@
+cups
+ghostbsd-fonts
+ghostbsd-icons
+ghostbsd-utils
+ghostbsd-wallpapers
+gnome-keyring
+nss_mdns
+pkg
+slick-greeter
+webrtc-audio-processing
+xorg-minimal

packages/vital/mate

@@ -1,15 +1,8 @@
 brisk-menu
-cups
 cursor-dmz-theme
 freedesktop-sound-theme
 ghostbsd-icons
 ghostbsd-mate
 ghostbsd-utils
-nss_mdns
-pkg
 plank
-slick-greeter
 station-tweak
-webrtc-audio-processing
-xconfig
-xorg-minimal

packages/vital/xfce

@@ -1,16 +1,4 @@
-cups
 ffmpegthumbnailer
-ghostbsd-drivers
-ghostbsd-fonts
-ghostbsd-icons
-ghostbsd-utils
-ghostbsd-wallpapers
 ghostbsd-xfce4
 ghostbsd-xfce-settings
 ghostbsd-xfce-themes
-gnome-keyring
-pkg
-slick-greeter
-webrtc-audio-processing
-xconfig
-xorg-minimal

packages/xfce

@@ -1,40 +1,6 @@
-cups
-cups-filters
-drm-kmod
-egl-wayland
 evince-lite
-evolution
 ffmpegthumbnailer
-firefox
-foomatic-db
-fusefs-ext2
-gbi
-ghostbsd-drivers
-ghostbsd-fonts
-ghostbsd-icons
-ghostbsd-utils
-ghostbsd-wallpapers
-ghostbsd-xfce4
 ghostbsd-xfce-settings
 ghostbsd-xfce-themes
-gnome-keyring
-gstreamer1-plugins-neon
-nss_mdns
-nvidia-driver
-pc-sysinstall
-pkg
-python
-rhythmbox
-shotwell
-slick-greeter
-system-config-printer
-utouch-kmod
-unzip
-virtualbox-ose-additions
-vlc
-webrtc-audio-processing
-xarchiver
-xconfig
-xf86-input-evdev
-xorg-minimal
-zip
+ghostbsd-xfce4
+xarchiver