From nobody Wed Oct 22 08:17:10 2025 X-Original-To: dev-commits-src-branches@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 4cs2870hffz6Dtkp; Wed, 22 Oct 2025 08:17:11 +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 4cs2866v7Tz3LZj; Wed, 22 Oct 2025 08:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121031; 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=8zYRIvAC/MftKel7VOAZD1NwPhQXfCGHBYQBBYjaRfg=; b=iqmDPZZRMhEPBtaO0F4aPR2X2oynSNFdH4jj/YGlVIHNx7pRt3U8+FRGfSa1mg+NEWCCWK R1vxW+FGywj7AwXgc0cpzlr+z6eQR0NG0BZBP99DAdp6W2553Ycd65znMecIpHeHUBFmBY EOVVhJBkI3HgKuf6p/6AkPZ35Xy7wUA6OAGSh+Y7rMUk7TodKymTU0qJiiLG0QYzppHp3m vGq7mza4Ve/MvvW/CtrK4Hwe56VstvjuAo9AuBhFxfAc6r6EvqG+4WDqMHoxZdsrQ2KiT5 RdDjDvRJbLiguo2iNjFxc4qYZb8w5eeoOYyPZQQIfHiP97UqpbttikHIqb9hvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121031; 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=8zYRIvAC/MftKel7VOAZD1NwPhQXfCGHBYQBBYjaRfg=; b=l3rVjQO51xGoBp2pxMTysL9SCT9XSCwvR3UeYkNgD9XvS2YIOtrcM+xWELP0hOTfJFmknA p8FGC5zdCksTJCF0Y4FCwctIOYyq70EYZ95ji7UuSk/EmtGDEn9QEAiIK2z7chiW5TB4wP +zUtX7CLeEq2jLtgcAXaq4Ph8ZY6ILjW6rWgJBA1MT2zw+O2HF5GUUfrnVIP4lPa1QDkVC HEc10aIjCJW2GIitO6iIcNtM6YmdjXIemSfs4FHsMKGQDnBoraltJYIQVHrjdhpPm3vIau Dh1Oh6XuXVHF46BqfaxJD37Xjkv/SE9CRptamxAuxr6/te+3Z7hTZ5/AeU5spQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761121031; a=rsa-sha256; cv=none; b=Qqx+b1X3cdWEaDgoTJEuLzSvInM//H8nb8RgRkLUiexL+eby18E3JvUE0tDEROmgtrVZdh MB5w5Dzru6hQincoCZNoes3lQZDx/PHYRObGIVEE9LiFwdOp/Hy6ugPAa0IjN8sfg+YeSz mcEIPSaANB63Hm3XpToA3urTN7NAX6ulkFr8C9vxsd4Q1t3pG5m7knpISj4eua/o8Q6fFY Vaxrddvtn9shngIhPGJoK/oBVWGC8h1Aimq0zZA7TY7JdePD68DUimkTu28TDm2XXmQvHg QTfonq0Go8LY99Es7wTs4o6CxkZSwkQyEhojHSCVAYyZAn23x+TqV6G5/In/nQ== 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 4cs28667kTz5QK; Wed, 22 Oct 2025 08:17:10 +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 59M8HA5S070211; Wed, 22 Oct 2025 08:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M8HA8k070208; Wed, 22 Oct 2025 08:17:10 GMT (envelope-from git) Date: Wed, 22 Oct 2025 08:17:10 GMT Message-Id: <202510220817.59M8HA8k070208@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: e27e5b6b0177 - releng/15.0 - release: split up Oracle Cloudware tools List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e27e5b6b017734f65b7be0b503eb6aeac235fbf2 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=e27e5b6b017734f65b7be0b503eb6aeac235fbf2 commit e27e5b6b017734f65b7be0b503eb6aeac235fbf2 Author: Dave Cottlehuber AuthorDate: 2025-10-20 09:35:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-22 08:17: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 (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 \