From nobody Wed Jul 05 21:01:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QxBsb4Kc2z4lWhn; Wed, 5 Jul 2023 21:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxBsb3nwwz3pZs; Wed, 5 Jul 2023 21:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=au+44pWJJy4zQSrtWSKbzJ+XiIzhVKHEt6GMxmYfiIo=; b=IWsF6u6mOsvL07VuVpBTrvwU3ZmVIdETzKCv+Z5TRyH86xS1pO87Mf2e58kkhkOMgbaHhA pT5+OzCIx6QPxiX2Dq5PY//0ysWkak3trkr39n5F9N4qS/AOkKI08cP9R99zUguFd5IkCl opoZpOoTY+/GiFGAayPveCeMu8csVeUngPH7NV4uJrUAPso++zw2xUFo7aOk6OKUKQMvqG o1Qy91oqXH9VK43TvSybZpAwFvApuFpPDK4FQDgr5fq3UKh4i4qRkz2bRJeMD+DYhiSLuS hwyNu/2i900sOh1wPwbLwGHoCEgawECLZVBzOaUAgoqCz6Xu9QWJdGarkeCGDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=au+44pWJJy4zQSrtWSKbzJ+XiIzhVKHEt6GMxmYfiIo=; b=hK4KxYjNDOvMCtU7L05vMvHk+is7VaSG/1vdtyy04UpmRTHxe+EWD8cIB0mnXXufvYJXKC 7nxX62c2yBbolXsxoj03Dc2CQH+6pRNkRk18wECGsYI9TSww3PsXSpaGH+qBpMnBePHeHs Ef0JHwD+Vwua7goQa8szBFYgs6J5Yq8GcYCtAuesTgaSvqyrkQM3dr60neOmGtLR9+gi/3 BpXvOW5s7kiDIJ3AmxRJoF3Ih2vMipED3/vnKq3rwsjTKerLAgNWTJ+4PbxfULpUfsS/7l UUW//V5EALOqD+tpSItQpwJUckhB4ueRGLp4IPJESJD0whV1RY5VCUXpzY++Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688590883; a=rsa-sha256; cv=none; b=PQJuVh1P6rKjjtvdSNok92kR8BVPSpvVYn3PQPfLknQJEoqP1VJ3B9w051200OSBED9SBG Trt5Gcuj5BztcIMlvLnagzqo7PqFpxbpEGJzR5ywY4Tibrey8zZffpIvO3lGbETDbawS5I Dv23iUHBeAhtqLBzmUWi35UhPxBB2VJvtzcp13aKLVrqvPUzfI0wW1Ed19CCtOrjcykm+R 697MhDQBE/H845DXrm23b5hXf8FQy+0wgzjP2AUpNSw+eA2uDNK4pW0tO8HeVeF1pBdERh RwRDLH1fb55Snwu45kNdM7pDSvT8vyfwnNxXZp79YLmLJqYVh1UPEHRClmsx0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QxBsb2tHXzVLQ; Wed, 5 Jul 2023 21:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365L1Nfu060543; Wed, 5 Jul 2023 21:01:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365L1NBW060542; Wed, 5 Jul 2023 21:01:23 GMT (envelope-from git) Date: Wed, 5 Jul 2023 21:01:23 GMT Message-Id: <202307052101.365L1NBW060542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: d63909d243cb - stable/13 - release: allow VM_EXTRA_PACKAGES to be specified in the environment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d63909d243cb07904b8df2248ee27b99f1bf458a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=d63909d243cb07904b8df2248ee27b99f1bf458a commit d63909d243cb07904b8df2248ee27b99f1bf458a Author: Brad Davis AuthorDate: 2021-08-09 16:31:51 +0000 Commit: Glen Barber CommitDate: 2023-07-05 20:59:47 +0000 release: allow VM_EXTRA_PACKAGES to be specified in the environment This is useful for adding extra packages to the build of an AMI. For example: env VM_EXTRA_PACKAGES="zsh" make -C release ec2ami (cherry picked from commit 83952a5baa337cc257858feb4886d947ba1a60e3) --- release/tools/azure.conf | 2 +- release/tools/ec2.conf | 4 +++- release/tools/gce.conf | 7 ++++--- release/tools/vagrant.conf | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) 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 d44fe9ff2f27..a07e6b65f519 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 0dd00f020110..1acd789a88e6 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"