From nobody Wed Oct 22 08:25:04 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 4cs2KF09vwz6DtwR; Wed, 22 Oct 2025 08:25:05 +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 4cs2KD6mBcz3MrX; Wed, 22 Oct 2025 08:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121505; 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=6cQQOrUY+eihlwBl6pFzDQTx7Dt6WNTjCj6+GPwU6hQ=; b=BMySUqYzEzswMcSXbwGPRqv3JYu7Q059TiBEjPYn18PS2lbKFFThx7E1JlPSxoR4wtvk4W agNNkaWiwT1HRr2N/0I+1e7sAj+vOE0LUF9UyFnnOgH2dDgNsEdqz1lC73rREk+Oy5ivM1 Ch+PEs0JmncI29EyLWYeupSGOutQUa6/9ABATB1SS/a51h3Al4Ftrm2Oao5/64cTzjqCZ5 FOaO2HR4V9gIUMDKXZXecRN4JXzWJ/uxmbFGCCO5WSL9CNasAzzD9ULA4j1god7lImEpFS 8xutKcYAbV8whGeWPfQi8o86UcOA6gOFbS01wqS9rqmTX98huJ8OOBqoRJoChw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121504; 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=6cQQOrUY+eihlwBl6pFzDQTx7Dt6WNTjCj6+GPwU6hQ=; b=EtAdcinMVDCC7sy2r7wZPkod36iC1bpjpf45S6QuO+ZEE4pWYjVQ4LSRZZiOvOFXIgM41O fAFORWZJJUZDEUgtz6VnGqD7NYNzLn1QrDW1fIaJqA+XHQG21vonmw6SVLhSg2MjBxl3g2 b5MK5Ry4KodOehKV7fDNx5bYIRbaHeWTgurp9p/zLDU1YFogDki2jM/QEx6gJ5HSEu1bKX oqOMpL5hXW2WD5Rogl0KVZewDJbrHDP5CY9jTud8MyqYtw9H0cm7VQbZ7lhKqsNov9plG8 gbCQoSU5+2O1w4TNj6m6cniXnr/1RECQ6mY7IRSc9eKfuWTXzKPJki/30sdqfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761121504; a=rsa-sha256; cv=none; b=qMXbtzWiZqJzR9cLyam+E2hhATPEKGXBLtYT7tLA9/Rq+thUeTIjRZ+3EI5nRkRqWYCTyB 3eshAy2MKYzLGxl5rtYx7e6TMpjFuzZCvW5WW2vKAqkDxq++h5F1tYnbsdy+9NB5aiBQh5 aoLPpZJ6Fxtb8zh2NSm6Y01FXBedGrHqvJKsb95ooEX3Nsr0m9EY/SgCdd0nkYj5eBHAPY QwUkyhXn/FuS2nv6jRtL0ZrYNZKR6Xy8+RIzg0OVG5ZUhMEYmEV+7/vtPisIJTFn+S5NmK hX2WKC1z4VNwu3b07ymQKNXSSJ6jh/lhz0NbmT4DMmW40DULeDq/HnmjyyN2Aw== 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 4cs2KD6N7Xz5kG; Wed, 22 Oct 2025 08:25:04 +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 59M8P4Qp088326; Wed, 22 Oct 2025 08:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M8P4dC088323; Wed, 22 Oct 2025 08:25:04 GMT (envelope-from git) Date: Wed, 22 Oct 2025 08:25:04 GMT Message-Id: <202510220825.59M8P4dC088323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: b6cde3ca5dbf - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d Auto-Submitted: auto-generated The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d commit b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d Author: Dave Cottlehuber AuthorDate: 2025-10-20 09:35:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-22 08:17:48 +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 (cherry picked from commit 81d807a90611a4980cae843b404d99c27edc1893) --- 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 \