From nobody Mon Dec 12 14:41:34 2022 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 4NW47y5MD4z4kXP0; Mon, 12 Dec 2022 14:41:34 +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 4NW47y4pgbz4M17; Mon, 12 Dec 2022 14:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670856094; 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=R2/VGH04tjbDxCblWbtQpn5/74xL+wBqe51+oPO+iLs=; b=tRaLPjE8BvEGuOUWaIiudleS6ncueBjiHA4qUQMxFXqTTw5ONGaQ29Njjx8XcP45bBMnk6 86yzYlttSNmzsAMOeD0LLUsLUjCDbYla2n4BV2n2MU/LvLod9JAHH7lAb91I+awsn43mNc GphnM/N//47YEVkurJc5Chd8YNuqUugYdNtpFBdK65edRlCz9EesKnXXU860R0ZjSfV7Dv s3fPGnKcEdfU+3nvcQuQ6Ufbo8RWB4zwcrjEbRu2ALtCV2QpWqTTf/T4ihb1sDM1KDCL5t wx453Ne7N9KJJH3C24Y9b/M8BU6ITEr+wzrIRg+13x0Eg9JQ09OVzhQZrbY/TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670856094; 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=R2/VGH04tjbDxCblWbtQpn5/74xL+wBqe51+oPO+iLs=; b=q04iu6DvC+soFiSTLlzvicZzMKG9wybkPsSkfgTT0vrCqPKfz3rhbx3N90PSt7h7BYxvtm 3nB7IwxUVlufeOLvZ2iu7/nbU2jOUWNpgQfGVMt2odFv/jqpZmOZ5ka6rBhq2HBJYMsyZv zfjG1JzEMbi2flgoO8zHSGiJO3/uNeubuVnSicdeuIrU2E4bcyw7iPph78FozVuq5lO3uM APzZh3AtKZJBOyrbjT5C0eTNLsqt1fGW/mccdyM5FNn9SesDraLYURANLvDtaDXFW72Ml3 4ra5FKPvQjGuPLy1KkixPiukCbcsg9NFYdnU3227dDtJcNPY+iIRRGdWmJKXBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670856094; a=rsa-sha256; cv=none; b=nMt/95aM7mUSxyOwVMy5doJS1vBFUAemU44t5eSeQqjCRVjXnIxY//F++FrDuu7M9R/NbB X03VTweI5wMcpEUG5dWBFKy7eXySZ6GOCJyzheDLS+ChlU31nszFxp+3IxjB9yHuSV6ZCb U8+j4zHZOG7ykT6se9Vr/k+10oAaNjik0BvXGEw+7mgiByv36EWJ/NY3OGYdJxQ9/S+4qO VMtsoqtJE4NneK8LXGanbCVQNsCnDh1Km9LHjZgXu/Wn2MDMXxKLEPxZhhtR0ypR5Q8QaF kQB8u5W8chhUhPGBnxJAVboAA3CCTGEJ7vQZZFsmCcy2LuG+AaCKGyRX0VC62Q== 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 4NW47y3vnlzdSL; Mon, 12 Dec 2022 14:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BCEfYJS084765; Mon, 12 Dec 2022 14:41:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BCEfYZ7084764; Mon, 12 Dec 2022 14:41:34 GMT (envelope-from git) Date: Mon, 12 Dec 2022 14:41:34 GMT Message-Id: <202212121441.2BCEfYZ7084764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 85dd85323614 - main - Revert "uname: switch machine to HW_MACHINE_ARCH" 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85dd853236149dd029d5c065efce0e802f9c1e9a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=85dd853236149dd029d5c065efce0e802f9c1e9a commit 85dd853236149dd029d5c065efce0e802f9c1e9a Author: Piotr Kubaj AuthorDate: 2022-12-12 14:39:12 +0000 Commit: Piotr Kubaj CommitDate: 2022-12-12 14:42:05 +0000 Revert "uname: switch machine to HW_MACHINE_ARCH" Reverting because of issue in Makefile.inc1 during native builds: make[1]: “.../freebsd/Makefile.inc1" line 163: Unknown target aarch64:aarch64. Since I only tested this patch with make universe on amd64, this issue wasn't caught. This reverts commit 83bf6ab568293e325f437342cdb87a626353e27c. --- lib/libc/gen/__xuname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c index bd328d4f880f..fba5eaeebc88 100644 --- a/lib/libc/gen/__xuname.c +++ b/lib/libc/gen/__xuname.c @@ -127,11 +127,11 @@ __xuname(int namesize, void *namebuf) } q += namesize; - if ((p = getenv("UNAME_p"))) + if ((p = getenv("UNAME_m"))) strlcpy(q, p, namesize); else { mib[0] = CTL_HW; - mib[1] = HW_MACHINE_ARCH; + mib[1] = HW_MACHINE; len = namesize; oerrno = errno; if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {