From nobody Mon Oct 20 09:37:43 2025 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 4cqr1z5F1wz6DXVM; Mon, 20 Oct 2025 09:37:43 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqr1z4T15z3hTJ; Mon, 20 Oct 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760953063; 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=XtkijOCDWQ1mtQOIzranbNhOxTh+kmqE8MUzLc62kMY=; b=rJQJRulyuyL6jlz0yE2PU8jN6lBpN/5R26pZuNjwoi16OSNBzcyyYDx47m1K9u886FTQ2D KNhzKOJtweYVYYO0fX6il40w9XnR3TQBxSkf1wsQSc3Pul0RzqQ71Xi1TgNsijSSRRWmbx WUI4JmA/tb4jHYX04r6XxJ2VxF1hWIo03EYfC037NnKXfb86q6Edn23F75BqhCJqO3dU9T LCKKolkwe+5s7G4prpQXL8rpSWmvbwnSn6qyhSZL2W5TqRts8MVTXJrgafCEPAGJI3SMWN zFA54pPvaPr+/04zVbhddXHDAKWqBne7H6PWJ288NcrHsbDa3yOaDBo8ITeWRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760953063; 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=XtkijOCDWQ1mtQOIzranbNhOxTh+kmqE8MUzLc62kMY=; b=j95Yr41zddRLdjuxrnHgnza6Yu52ArROmvEKDDRsxBbTNYXxKPM3IBINoyWSZvTKF5UcOd RP2nWl8KBoq5eBdP6RPZ1JhRqvXvjI6OP7ykss9LZe2r/0QRylbbkvV/RzdApFpFLPYk8C P3+PRFLwgVER3lzlUD0GNZLOON7SJcprAL/e6Q3nswHIEcRuXc0OTkM4Md6CwV9DCcxNi5 Yr08UeHqjPdt92vdwVdrnPD1C8TuQTyfo6GErVvu5R5VjI0JzuI82XBLMfJJyGwh7qZ3NR pvkM38BkwuL4kQuLwLUNtzuZykALhtN6j4R3if1D5i7KO3Aelng0ECAprwUa2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760953063; a=rsa-sha256; cv=none; b=yU1MxAYOzlNG4mIIYV6NXUINtWi7NleJixGwWMUzj7tTVfbXz0+14b6QTh7jIsYkLG5cxk aqdu0EsCeoLUq2P4hD9LQok5NfMph3D0QEfqc+cNcUx8idL5lsZcvEvH3H4hcImyGK5QH+ BhiXdtj0Etl9hGjUk/LoiwAxe4Nt41/LiTsRSfBWYWEBDZSGAOiyWyw5RW9uBVN4j59mvm o7SWB5JZDYbW6kU1E3R17J9A3FdJlI9C4NUFhw4FtyHY0nBkbyXZXKz0cINH7+h3PvQCCy Amrdb8b4Z6VsCcFR/KRyqyPF4ygS5yx3zL+LbXHB4XIPHSZxA+3m2k4vlIiW6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cqr1z3nD0z16Bt; Mon, 20 Oct 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K9bhYx084862; Mon, 20 Oct 2025 09:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K9bhuh084859; Mon, 20 Oct 2025 09:37:43 GMT (envelope-from git) Date: Mon, 20 Oct 2025 09:37:43 GMT Message-Id: <202510200937.59K9bhuh084859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 81d807a90611 - main - release: split up Oracle Cloudware tools 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81d807a90611a4980cae843b404d99c27edc1893 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=81d807a90611a4980cae843b404d99c27edc1893 commit 81d807a90611a4980cae843b404d99c27edc1893 Author: Dave Cottlehuber AuthorDate: 2025-10-20 09:35:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-20 09:37:01 +0000 release: split up Oracle Cloudware tools Sometimes one or the other but not both tools are present; this ensures that all cases are correctly handled. Reported by: cperciva Approved by: cperciva (re) Sponsored by: SkunkWerks, GmbH Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D53186 MFC after: 2 days --- release/Makefile.oracle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/release/Makefile.oracle b/release/Makefile.oracle index 3573f29b96c1..6d792cc9fd30 100644 --- a/release/Makefile.oracle +++ b/release/Makefile.oracle @@ -24,21 +24,28 @@ # Syncing to all sites should take 2-3 hours after this final step. ORACLE_BASENAME= ${OSRELEASE}-${BUILDDATE}${GITREV:C/^(.+)/-\1/} -ORACLE_PORTS_LIST= ftp/curl emulators/qemu@tools CLEANFILES+= cw-oracle-portinstall cw-oracle-portinstall: .PHONY -.if !exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img) -. if !exists(${PORTSDIR}/Makefile) -. if !exists(/usr/local/sbin/pkg-static) +.if (!exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)) && !exists(${PORTSDIR}/Makefile) +. if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf -. endif - env ASSUME_ALWAYS_YES=yes pkg install -y ${ORACLE_PORTS_LIST} +. endif +.endif +.if !exists(/usr/local/bin/curl) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl . else env UNAME_r=${UNAME_r} make -C \ ${PORTSDIR}/ftp/curl \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean +. endif +.endif +.if !exists(/usr/local/bin/qemu-img) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu@tools +. else env UNAME_r=${UNAME_r} FLAVOR=tools make -C \ ${PORTSDIR}/emulators/qemu \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \