Skip to content

Commit

Permalink
Adding support to mark packages as vital packages
Browse files Browse the repository at this point in the history
  • Loading branch information
ericbsd committed Sep 10, 2024
1 parent 12bc094 commit 6d4cc34
Show file tree
Hide file tree
Showing 6 changed files with 184 additions and 6 deletions.
15 changes: 10 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ if [ "$(id -u)" != "0" ]; then
fi

kernel="$(uname -r)"

case $kernel in
'13.3-STABLE' | '14.1-STABLE' | '15.0-CURRENT') ;;
*)
Expand Down Expand Up @@ -158,16 +157,19 @@ base()
{
if [ "${desktop}" = "test" ] ; then
base_list="$(cat "${cwd}/packages/test_base")"
vital_base="$(cat "${cwd}/packages/vital/test_base")"
else
base_list="$(cat "${cwd}/packages/base")"
vital_base="$(cat "${cwd}/packages/vital/base")"
fi
mkdir -p ${release}/etc
cp /etc/resolv.conf ${release}/etc/resolv.conf
mkdir -p ${release}/var/cache/pkg
mount_nullfs ${base_packages} ${release}/var/cache/pkg
# shellcheck disable=SC2086
pkg-static -r ${release} -R "${cwd}/pkg/" install -y -r ${PKG_CONF}_base $base_list

pkg-static -r ${release} -R "${cwd}/pkg/" install -y -r ${PKG_CONF}_base ${base_list}
# shellcheck disable=SC2086
pkg-static -r ${release} -R "${cwd}/pkg/" set -y -v 1 ${vital_base}
rm ${release}/etc/resolv.conf
umount ${release}/var/cache/pkg
touch ${release}/etc/fstab
Expand All @@ -193,9 +195,12 @@ packages_software()
mkdir -p ${release}/var/cache/pkg
mount_nullfs ${software_packages} ${release}/var/cache/pkg
mount -t devfs devfs ${release}/dev
pkg_list="$(cat "${cwd}/packages/${desktop}")"
packages="$(cat "${cwd}/packages/${desktop}")"
vital_packages="$(cat "${cwd}/packages/vital/${desktop}")"
# shellcheck disable=SC2086
pkg-static -c ${release} install -y ${packages}
# shellcheck disable=SC2086
pkg-static -c ${release} install -y $pkg_list
pkg-static -c ${release} set -y -v 1 ${vital_packages}
mkdir -p ${release}/proc
mkdir -p ${release}/compat/linux/proc
rm ${release}/etc/resolv.conf
Expand Down
127 changes: 127 additions & 0 deletions packages/vital/base
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
GhostBSD-acpi
GhostBSD-autofs
GhostBSD-bluetooth
GhostBSD-bluetooth-lib32
GhostBSD-bootloader
GhostBSD-caroot
GhostBSD-certctl
GhostBSD-clang
GhostBSD-clibs
GhostBSD-clibs-lib32
GhostBSD-console-tools
GhostBSD-csh
GhostBSD-devd
GhostBSD-devmatch
GhostBSD-devmatch-lib32
GhostBSD-dhclient
GhostBSD-dwatch
GhostBSD-ee
GhostBSD-efi-tools
GhostBSD-efi-tools-lib32
GhostBSD-elftoolchain
GhostBSD-fetch
GhostBSD-fetch-lib32
GhostBSD-fwget
GhostBSD-geom
GhostBSD-geom-lib32
GhostBSD-ggate
GhostBSD-ghostbsd-cert
GhostBSD-hostapd
GhostBSD-inetd
GhostBSD-ipf
GhostBSD-ipfw
GhostBSD-kerberos
GhostBSD-kerberos-lib
GhostBSD-kerberos-lib-lib32
GhostBSD-kerberos-lib32
GhostBSD-kernel-generic
GhostBSD-lib9p
GhostBSD-lib9p-lib32
GhostBSD-libarchive
GhostBSD-libarchive-lib32
GhostBSD-libbegemot
GhostBSD-libbegemot-lib32
GhostBSD-libblocksruntime
GhostBSD-libblocksruntime-lib32
GhostBSD-libbsdstat
GhostBSD-libbsdstat-lib32
GhostBSD-libbsm
GhostBSD-libbsm-lib32
GhostBSD-libbz2
GhostBSD-libbz2-lib32
GhostBSD-libcasper
GhostBSD-libcasper-lib32
GhostBSD-libcuse
GhostBSD-libcuse-lib32
GhostBSD-libdwarf
GhostBSD-libdwarf-lib32
GhostBSD-libevent1
GhostBSD-libevent1-lib32
GhostBSD-libexecinfo
GhostBSD-libexecinfo-lib32
GhostBSD-libipt
GhostBSD-libldns
GhostBSD-libldns-lib32
GhostBSD-liblzma
GhostBSD-liblzma-lib32
GhostBSD-libmagic
GhostBSD-libmagic-lib32
GhostBSD-libpathconv
GhostBSD-libpathconv-lib32
GhostBSD-librpcsec_gss
GhostBSD-librpcsec_gss-lib32
GhostBSD-librss
GhostBSD-librss-lib32
GhostBSD-libsdp
GhostBSD-libsdp-lib32
GhostBSD-libsqlite3
GhostBSD-libsqlite3-lib32
GhostBSD-libstdbuf
GhostBSD-libstdbuf-lib32
GhostBSD-libstdthreads
GhostBSD-libstdthreads-lib32
GhostBSD-libthread_db
GhostBSD-libthread_db-lib32
GhostBSD-libucl
GhostBSD-libucl-lib32
GhostBSD-libvgl
GhostBSD-libvgl-lib32
GhostBSD-libvmmapi
GhostBSD-lld
GhostBSD-lldb
GhostBSD-locales
GhostBSD-mlx-tools
GhostBSD-mtree
GhostBSD-newsyslog
GhostBSD-nvme-tools
GhostBSD-openssl
GhostBSD-openssl-lib
GhostBSD-openssl-lib-lib32
GhostBSD-periodic
GhostBSD-pf
GhostBSD-pkg-bootstrap
GhostBSD-ppp
GhostBSD-quotacheck
GhostBSD-rc
GhostBSD-rcmds
GhostBSD-rdma
GhostBSD-rescue
GhostBSD-resolvconf
GhostBSD-runtime
GhostBSD-runtime-lib32
GhostBSD-ssh
GhostBSD-ssh-lib32
GhostBSD-syscons
GhostBSD-syslogd
GhostBSD-tcpd
GhostBSD-tcpd-lib32
GhostBSD-unbound
GhostBSD-unbound-lib32
GhostBSD-utilities
GhostBSD-utilities-lib32
GhostBSD-vt-data
GhostBSD-wpa
GhostBSD-yp
GhostBSD-zfs
GhostBSD-zfs-lib32
GhostBSD-zoneinfo
15 changes: 15 additions & 0 deletions packages/vital/mate
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
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
15 changes: 15 additions & 0 deletions packages/vital/mate_oem
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
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
16 changes: 16 additions & 0 deletions packages/vital/xfce
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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
2 changes: 1 addition & 1 deletion pkg/GhostBSD.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ GhostBSD: {
}

GhostBSD_base: {
url: "https://pkg.ghostbsd.org/unstable/${ABI}/base",
url: "https://pkg.ghostbsd.org/stable/${ABI}/base",
enabled: yes
}

0 comments on commit 6d4cc34

Please sign in to comment.