aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.ec213
-rw-r--r--release/packages/Makefile.package22
-rw-r--r--release/tools/azure.conf2
-rw-r--r--release/tools/ec2.conf4
-rw-r--r--release/tools/gce.conf7
-rw-r--r--release/tools/vagrant.conf3
-rw-r--r--release/tools/vmimage.subr6
7 files changed, 47 insertions, 10 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 171de4ee2fa0..b29f54715fb3 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -18,9 +18,18 @@ PUBLICSNAP= --publicsnap
EC2SNSREL= ${REVISION}-${BRANCH}
EC2SNSVERS= ${GITBRANCH}@${GITREV}
.endif
+.if defined(SSMPREFIX) && !empty(SSMPREFIX)
+SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/ufs/${REVISION}/${BRANCH}
+.endif
.if ${TARGET_ARCH} != "amd64"
EC2ARCH= --${TARGET_ARCH:S/aarch64/arm64/}
.endif
+.if !defined(AMIBOOTMETHOD)
+AMIBOOTMETHOD= UEFI
+.endif
+.if ${AMIBOOTMETHOD} == "UEFI" && ${TARGET_ARCH} == "amd64"
+BOOTMODEOPT= --uefi
+.endif
CLEANFILES+= ec2ami
@@ -62,9 +71,9 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
@false
.endif
/usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \
- ${EC2ARCH} --sriov --ena \
+ ${EC2ARCH} ${SSMOPTS} ${BOOTMODEOPT} --sriov --ena \
${.OBJDIR}/ec2.raw \
- "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
+ "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD}" \
"${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \
${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \
${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS}
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index eef58af542e4..f41a31c8fb3b 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -30,22 +30,34 @@ clang_COMMENT= Clang Utilities
clang_DESC= Clang Utilities
clibs_COMMENT= Core C Libraries
clibs_DESC= Core C Libraries
+cxgbe-tools_COMMENT= Chelsio cxbge Utilities
+cxgbe-tools_DESC= Chelsio cxbge Utilities
dma_COMMENT= DMA Mail Agent Utilities
dma_DESC= DMA Mail Agent Utilities
docs_COMMENT= Documentation
docs_DESC= Documentation
dtrace_COMMENT= Dtrace Utilities
dtrace_DESC= Dtrace Utilities
+dwatch_COMMENT= Dwatch Utilities
+dwatch_DESC= Dwatch Utilities
ee_COMMENT= Easy Editor Utilities
ee_DESC= Easy Editor Utilities
+efi-tools_COMMENT= UEFI Utilities
+efi-tools_DESC= UEFI Utilities
+ftp_COMMENT= FTP Utilities
+ftp_DESC= FTP Utilities
gdb_COMMENT= GDB Utilities
gdb_DESC= GDB Utilities
+ggate_COMMENT= GEOM Gate Utilities
+ggate_DESC= GEOM Gate Utilities
groff_COMMENT= Groff Utilities
groff_DESC= Groff Utilities
hast_COMMENT= Highly Available Storage daemon
hast_DESC= Highly Available Storage daemon
hostapd_COMMENT= 802.11 Access Point Daemon an Utilities
hostapd_DESC= 802.11 Access Point Daemon an Utilities
+hyperv-tools_COMMENT= Microsoft HyperV Utilities
+hyperv-tools_DESC= Microsoft HyperV Utilities
jail_COMMENT= Jail Utilities
jail_DESC= Jail Utilities
jail-debug_DESCR= Debugging Symbols
@@ -55,10 +67,14 @@ jail-lib32_DESCR= 32-bit Libraries
jail-lib32-debug_DESCR=32-bit Debugging Symbols
jail-lib32-development_DESCR=32-bit Development Files
jail-lib32-profile_DESCR=32-bit Profiling Libraries
+kerberos_COMMENT= Kerberos Utilities
+kerberos_DESC= Kerberos Utilities
kernel_COMMENT= FreeBSD Kernel
kernel_DESC= FreeBSD Kernel
manuals_COMMENT= Manual Pages
manuals_DESC= Manual Pages
+mlx-tools_COMMENT= Mellanox Utilities
+mlx-tools_DESC= Mellanox Utilities
nfs_COMMENT= NFS Utilities
nfs_DESC= NFS Utilities
openssl_COMMENT= OpenSSL Library and Utility
@@ -67,6 +83,8 @@ rc_COMMENT= RC Scripts
rc_DESC= RC Scripts
rcmds_COMMENT= Remote Command Utilities
rcmds_DESC= Remote Command Utilities
+rdma_COMMENT= RDMA Utilities
+rdma_DESC= RDMA Utilities
rescue_COMMENT= Rescue Utilities
rescue_DESC= Rescue Utilities
runtime_COMMENT= FreeBSD Base System
@@ -86,6 +104,8 @@ svn_COMMENT= Subversion Version Control System
svn_DESC= Subversion Version Control System
syscons_COMMENT= Syscons Console
syscons_DESC= Syscons Console
+telnet_COMMENT= Telnet and telnetd
+telnet_DESC= Telnet and telnetd
tests_COMMENT= Test Suite
tests_DESC= Test Suite
unbound_COMMENT= Unbound DNS Resolver
@@ -94,5 +114,7 @@ utilities_COMMENT= Non-vital programs and librairies
utilities_DESC= Non-vital programs and librairies
vi_COMMENT= Vi Editor
vi_DESC= Vi Editor
+vt_COMMENT= VT fonts and keyboard files
+vt_DESC= VT fonts and keyboard files
wpa_COMMENT= 802.11 Supplicant
wpa_DESC= 802.11 Supplicant
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 60076984b1bd..c88651a07745 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -6,7 +6,7 @@
# Set to a list of packages to install.
# Example:
#export VM_EXTRA_PACKAGES="www/apache24"
-export VM_EXTRA_PACKAGES="sysutils/azure-agent"
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} sysutils/azure-agent"
# Set to a list of third-party software to enable in rc.conf(5).
# Example:
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 888a446659a5..2bf47b01077d 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -6,7 +6,9 @@
# Packages to install into the image we're creating. This is a deliberately
# minimalist set, providing only the packages necessary to bootstrap further
# package installation as specified via EC2 user-data.
-export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client ebsnvme-id"
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \
+ firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client \
+ ebsnvme-id"
# Include the amazon-ssm-agent package in amd64 images, since some users want
# to be able to use it on systems which are not connected to the Internet.
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
index 113784a7643e..745477f0bc8e 100644
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -7,9 +7,10 @@
export VMSIZE=20g
# Set to a list of packages to install.
-export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
- google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \
- lang/python lang/python2 lang/python3"
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \
+ firstboot-pkgs \ google-cloud-sdk panicmail sudo \
+ sysutils/py-google-compute-engine lang/python lang/python2 \
+ lang/python3"
# Set to a list of third-party software to enable in rc.conf(5).
export VM_RC_LIST="ntpd sshd growfs \
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
index 05e7052d46c4..ebf69338b7d7 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -8,7 +8,8 @@ export VMSIZE=8g
# Packages to install into the image we're creating. This is a deliberately
# minimalist set, providing only the packages necessary to bootstrap.
-export VM_EXTRA_PACKAGES="shells/bash firstboot-freebsd-update firstboot-pkgs"
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} shells/bash \
+ firstboot-freebsd-update firstboot-pkgs"
# Set to a list of third-party software to enable in rc.conf(5).
export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs"
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 6e0c1ea633e2..c2b2e21200f1 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -131,8 +131,10 @@ vm_extra_install_packages() {
mount -t devfs devfs ${DESTDIR}/dev
chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
/usr/sbin/pkg bootstrap -y
- chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
- /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES}
+ for p in ${VM_EXTRA_PACKAGES}; do
+ chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
+ /usr/sbin/pkg install -y ${p}
+ done
umount_loop ${DESTDIR}/dev
return 0