Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed ghostbsd-build to install the OS from PKGBASE #194

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
# * @global-owner1 @global-owner2
* @ghostbsd/developers
* @ghostbsd/contributors @ghostbsd/new-contributors @ghostbsd/core-contributors @ghostbsd/project-leader
13 changes: 8 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ case $kernrel in
;;
esac

desktop_list=$(find packages -type f | cut -d '/' -f2 | tr -s '\n' ' ')
desktop_list=$(find packages -type f | grep base | cut -d '/' -f2 | tr -s '\n' ' ')
desktop_config_list=$(find desktop_config -type f)

help_function()
Expand Down Expand Up @@ -100,8 +100,8 @@ label="GhostBSD"

workspace()
{
umount ${base_packages} >/dev/null 2>/dev/null || true
umount ${software_packages} >/dev/null 2>/dev/null || true
umount ${base_packages} >/dev/null 2>/dev/null || true
ericbsd marked this conversation as resolved.
Show resolved Hide resolved
umount ${release}/dev >/dev/null 2>/dev/null || true
zpool destroy ghostbsd >/dev/null 2>/dev/null || true
umount ${release} >/dev/null 2>/dev/null || true
Expand All @@ -123,12 +123,13 @@ workspace()

base()
{
base_list="$(cat "${cwd}/packages/base")"
ericbsd marked this conversation as resolved.
Show resolved Hide resolved
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
pkg-static -r ${release} -R "${cwd}/pkg/" install -y -r ${PKGCONG} \
os-generic-kernel os-generic-userland os-generic-userland-lib32
# shellcheck disable=SC2086
pkg-static -r ${release} -R "${cwd}/pkg/" install -y -r ${PKGCONG}_base $base_list
ericbsd marked this conversation as resolved.
Show resolved Hide resolved

rm ${release}/etc/resolv.conf
umount ${release}/var/cache/pkg
Expand All @@ -152,7 +153,9 @@ packages_software()
mount_nullfs ${software_packages} ${release}/var/cache/pkg
mount -t devfs devfs ${release}/dev
pkg_list="$(cat "${cwd}/packages/${desktop}")"
echo "$pkg_list" | xargs pkg -c ${release} install -y
# shellcheck disable=SC2086
pkg-static -c ${release} install -y $pkg_list
ericbsd marked this conversation as resolved.
Show resolved Hide resolved
mkdir -p ${release}/proc
mkdir -p ${release}/compat/linux/proc
rm ${release}/etc/resolv.conf
umount ${release}/var/cache/pkg
Expand Down
251 changes: 251 additions & 0 deletions packages/base
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
GhostBSD-acct
GhostBSD-acct-man
GhostBSD-acpi
GhostBSD-acpi-man
GhostBSD-apm
GhostBSD-apm-man
GhostBSD-at
GhostBSD-at-man
GhostBSD-autofs
GhostBSD-autofs-man
GhostBSD-bhyve
GhostBSD-bhyve-man
GhostBSD-blocklist
GhostBSD-blocklist-lib32
GhostBSD-blocklist-man
GhostBSD-bluetooth
GhostBSD-bluetooth-lib32
GhostBSD-bluetooth-man
GhostBSD-bootloader
GhostBSD-bsnmp
GhostBSD-bsnmp-lib32
GhostBSD-bsnmp-man
GhostBSD-caroot
GhostBSD-ccdconfig
GhostBSD-ccdconfig-man
GhostBSD-certctl
GhostBSD-certctl-man
GhostBSD-clang
GhostBSD-clang-man
GhostBSD-clibs
GhostBSD-clibs-lib32
GhostBSD-clibs-man
GhostBSD-clibs-man-lib32
GhostBSD-console-tools
GhostBSD-console-tools-man
GhostBSD-csh
GhostBSD-csh-man
GhostBSD-ctf-tools
GhostBSD-ctf-tools-man
GhostBSD-cxgbe-tools
GhostBSD-cxgbe-tools-man
GhostBSD-devd
GhostBSD-devd-man
GhostBSD-devmatch
GhostBSD-devmatch-lib32
GhostBSD-devmatch-man
GhostBSD-dhclient
GhostBSD-dhclient-man
GhostBSD-dma
GhostBSD-dma-man
GhostBSD-dpv
GhostBSD-dpv-lib32
GhostBSD-dpv-man
GhostBSD-dtrace
GhostBSD-dtrace-lib32
GhostBSD-dtrace-man
GhostBSD-dwatch
GhostBSD-dwatch-man
GhostBSD-ee
GhostBSD-ee-man
GhostBSD-efi-tools
GhostBSD-efi-tools-lib32
GhostBSD-efi-tools-man
GhostBSD-elftoolchain
GhostBSD-elftoolchain-man
GhostBSD-fetch
GhostBSD-fetch-lib32
GhostBSD-fetch-man
GhostBSD-ftp
GhostBSD-ftp-man
GhostBSD-ftpd
GhostBSD-ftpd-man
GhostBSD-fwget
GhostBSD-fwget-man
GhostBSD-geom
GhostBSD-geom-lib32
GhostBSD-geom-man
GhostBSD-ggate
GhostBSD-ggate-man
GhostBSD-ghostbsd-cert
GhostBSD-hast
GhostBSD-hast-man
GhostBSD-hostapd
GhostBSD-hostapd-man
GhostBSD-hyperv-tools
GhostBSD-inetd
GhostBSD-inetd-man
GhostBSD-ipf
GhostBSD-ipf-man
GhostBSD-ipfilter
GhostBSD-ipfw
GhostBSD-ipfw-man
GhostBSD-iscsi
GhostBSD-iscsi-man
GhostBSD-jail
GhostBSD-jail-man
GhostBSD-kerberos
GhostBSD-kerberos-lib
GhostBSD-kerberos-lib-lib32
GhostBSD-kerberos-lib-man
GhostBSD-kerberos-lib32
GhostBSD-kerberos-man
GhostBSD-kernel-generic
GhostBSD-lib9p
GhostBSD-lib9p-lib32
GhostBSD-libarchive
GhostBSD-libarchive-lib32
GhostBSD-libarchive-man
GhostBSD-libbegemot
GhostBSD-libbegemot-lib32
GhostBSD-libbegemot-man
GhostBSD-libblocksruntime
GhostBSD-libblocksruntime-lib32
GhostBSD-libbsdstat
GhostBSD-libbsdstat-lib32
GhostBSD-libbsm
GhostBSD-libbsm-lib32
GhostBSD-libbsm-man
GhostBSD-libbz2
GhostBSD-libbz2-lib32
GhostBSD-libcasper
GhostBSD-libcasper-lib32
GhostBSD-libcasper-man
GhostBSD-libcompat-man
GhostBSD-libcuse
GhostBSD-libcuse-lib32
GhostBSD-libcuse-man
GhostBSD-libdwarf
GhostBSD-libdwarf-lib32
GhostBSD-libdwarf-man
GhostBSD-libevent1
GhostBSD-libevent1-lib32
GhostBSD-libexecinfo
GhostBSD-libexecinfo-lib32
GhostBSD-libexecinfo-man
GhostBSD-libipt
GhostBSD-libldns
GhostBSD-libldns-lib32
GhostBSD-liblzma
GhostBSD-liblzma-lib32
GhostBSD-libmagic
GhostBSD-libmagic-lib32
GhostBSD-libmagic-man
GhostBSD-libpathconv
GhostBSD-libpathconv-lib32
GhostBSD-libpathconv-man
GhostBSD-librpcsec_gss
GhostBSD-librpcsec_gss-lib32
GhostBSD-librpcsec_gss-man
GhostBSD-librss
GhostBSD-librss-lib32
GhostBSD-libsdp
GhostBSD-libsdp-lib32
GhostBSD-libsdp-man
GhostBSD-libsqlite3
GhostBSD-libsqlite3-lib32
GhostBSD-libstdbuf
GhostBSD-libstdbuf-lib32
GhostBSD-libstdbuf-man
GhostBSD-libstdthreads
GhostBSD-libstdthreads-lib32
GhostBSD-libstdthreads-man
GhostBSD-libthread_db
GhostBSD-libthread_db-lib32
GhostBSD-libucl
GhostBSD-libucl-lib32
GhostBSD-libucl-man
GhostBSD-libvgl
GhostBSD-libvgl-lib32
GhostBSD-libvgl-man
GhostBSD-libvmmapi
GhostBSD-lld
GhostBSD-lld-man
GhostBSD-lldb
GhostBSD-lldb-man
GhostBSD-locales
GhostBSD-mlx-tools
GhostBSD-mlx-tools-man
GhostBSD-mtree
GhostBSD-mtree-man
GhostBSD-natd
GhostBSD-natd-lib32
GhostBSD-natd-man
GhostBSD-netmap
GhostBSD-netmap-lib32
GhostBSD-netmap-man
GhostBSD-newsyslog
GhostBSD-newsyslog-man
GhostBSD-nfs
GhostBSD-nfs-man
GhostBSD-nvme-tools
GhostBSD-nvme-tools-man
GhostBSD-openssl
GhostBSD-openssl-lib
GhostBSD-openssl-lib-lib32
GhostBSD-openssl-lib-man
GhostBSD-openssl-man
GhostBSD-periodic
GhostBSD-periodic-man
GhostBSD-pf
GhostBSD-pf-man
GhostBSD-pkg-bootstrap
GhostBSD-pkg-bootstrap-man
GhostBSD-ppp
GhostBSD-ppp-man
GhostBSD-quotacheck
GhostBSD-quotacheck-man
GhostBSD-rc
GhostBSD-rc-man
GhostBSD-rcmds
GhostBSD-rcmds-man
GhostBSD-rdma
GhostBSD-rdma-man
GhostBSD-rescue
GhostBSD-resolvconf
GhostBSD-resolvconf-man
GhostBSD-runtime
GhostBSD-runtime-lib32
GhostBSD-runtime-man
GhostBSD-smbutils
GhostBSD-smbutils-lib32
GhostBSD-smbutils-man
GhostBSD-ssh
GhostBSD-ssh-lib32
GhostBSD-ssh-man
GhostBSD-syscons
GhostBSD-syslogd
GhostBSD-syslogd-man
GhostBSD-tcpd
GhostBSD-tcpd-lib32
GhostBSD-tcpd-man
GhostBSD-ufs
GhostBSD-ufs-lib32
GhostBSD-ufs-man
GhostBSD-unbound
GhostBSD-unbound-lib32
GhostBSD-unbound-man
GhostBSD-utilities
GhostBSD-utilities-lib32
GhostBSD-utilities-man
GhostBSD-vi
GhostBSD-vi-man
GhostBSD-vt-data
GhostBSD-wpa
GhostBSD-wpa-man
GhostBSD-yp
GhostBSD-yp-man
GhostBSD-zfs
GhostBSD-zfs-lib32
GhostBSD-zfs-man
GhostBSD-zoneinfo
5 changes: 5 additions & 0 deletions pkg/GhostBSD.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ GhostBSD: {
url: "http://pkg.ghostbsd.org/stable/${ABI}/latest",
enabled: yes
}

GhostBSD_base: {
url: "http://pkg.ghostbsd.org/stable/${ABI}/base",
enabled: yes
}
5 changes: 5 additions & 0 deletions pkg/GhostBSD_Unstable.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ GhostBSD_Unstable: {
url: "http://pkg.ghostbsd.org/unstable/${ABI}/latest",
enabled: yes
}

GhostBSD_Unstable_base: {
url: "http://pkg.ghostbsd.org/unstable/${ABI}/base",
enabled: yes
}
Loading