From nobody Sun Jun 02 14:07:59 2024 X-Original-To: dev-commits-src-main@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 4Vsdww1HZPz5Mqws; Sun, 02 Jun 2024 14:08:00 +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 4Vsdww0h08z43vH; Sun, 2 Jun 2024 14:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717337280; 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=vOtaoxcN+TkL6e/FFq2nZyBwkDTkFNM6yYOyJfUsvL0=; b=OgWWLb5RnKjard9/8/TzBgMh7zuVP6lF6H+qq5BobxAgq6qNZwAroPQDJhrGzjy2zluH+B QlzNizo/aOB8RSx6UEqX4fG2vXADSwN4oidGK3e3UZrhyE3SxbYIxY4SCref1Ozm6DY87n g0CJbiaJgmz+vaguTW+necItbn3Eb3Pep/aEZdct1azVJqK1TArTFx1dy6cypT5qdD/XsJ Ugpmq9ebF/iy0xq/hMZ/rlO4f+0YDFP9qqYVf83vHNfGXxTZqknmY+Kb2IR7qHvmOWOMt2 rRKLvOeX4LOG2pw1+9f5r+8WS/8yOD4b7cAthPsPMxG5xs11gMe5KYw/JecIHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717337280; a=rsa-sha256; cv=none; b=JXOUt/sNxNcpMJXHLpQPpygbd52VxFleJ5/X+xCy2WNP3eejPY+y3HzGeCQFk2xF5RVtVz m8NfUoZUjUoqQqxG+fXjHCc8MQvMykvoFDMqsuifM2+DPY3OsDRrbXzHsWq0ZriDnVouGl SEkZvTNMgP5CaRttSyNDCDYib4xSIHpIW2YpujbgTHrT9vgfFJn+uo78LE7p6EkAzuQ9x/ rZXQHPMcrS7RFtnTw5rRYALay9PPQApcseLRtRrFzFT6iAO2g5UBP466qqqJ76i8M7yt5c 6VMlOUNWuaMJNu8IiCc3+4uTsuIsGI0+TkEkO7VYAnZmDyY6BdZ7v6Y5/j8ZWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717337280; 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=vOtaoxcN+TkL6e/FFq2nZyBwkDTkFNM6yYOyJfUsvL0=; b=sd4UKsmCcfuy2PUCTkjpNLivfegFkZWFjM+kHw8k5OaSqSYzBpb+RR4iEEvHxPdPqnLmS4 UPb38xx9a/v4ynPZ6htROX/KcNZ9KJfU49hzwMJnisr4UZSePZEyAK5Pcs9fspVPM7rQSB QTA3yFncQLhxaJ+yy9ep5E7bPLGILX96cKgRiHCTJnpSLC+f6Zm1wSdDD1q8BI+lZPqsc6 mqCagQVzgcvGrL5DAQKOTbi3mjfiJgyNhPIqfnjpgtq8rbd3+rJpxgJaoYVCh9WGPihniB qJbCnslAp+1od3xaq0iLxVnMRaIulxlzWmVrZoNdqGrJia+nMNDR/NVb39IG1g== 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 4Vsdww09tDzvGv; Sun, 2 Jun 2024 14:08:00 +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 452E7xsN075685; Sun, 2 Jun 2024 14:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452E7x24075682; Sun, 2 Jun 2024 14:07:59 GMT (envelope-from git) Date: Sun, 2 Jun 2024 14:07:59 GMT Message-Id: <202406021407.452E7x24075682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e50fec56bfa2 - main - Revert "release/Makefile.vm: Use qemu-user-static-devel" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e50fec56bfa2c9673417513062de5969307fe8ed Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e50fec56bfa2c9673417513062de5969307fe8ed commit e50fec56bfa2c9673417513062de5969307fe8ed Author: Colin Percival AuthorDate: 2024-06-02 14:07:03 +0000 Commit: Colin Percival CommitDate: 2024-06-02 14:07:52 +0000 Revert "release/Makefile.vm: Use qemu-user-static-devel" This breaks the weekly snapshot builds. We'll try again once Warner has some time to debug the qemu-user-static-devel port. This reverts commit a04ecddfc721427fd97fd1fcc27492ebd19ad183. --- release/Makefile.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index b5c1470a6eac..548b4c1cca3b 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -75,16 +75,16 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo emulator-portinstall: .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) -.if exists(${PORTSDIR}/emulators/qemu-user-static-devel/Makefile) +.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH \ - make -C ${PORTSDIR}/emulators/qemu-user-static-devel \ + make -C ${PORTSDIR}/emulators/qemu-user-static \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y .endif - env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static-devel + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif touch ${.TARGET}