From nobody Fri May 31 00:34:57 2024 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 4Vr3zj64gXz5LlXc; Fri, 31 May 2024 00:34:57 +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 4Vr3zj5Wynz4l1b; Fri, 31 May 2024 00:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717115697; 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=044e7TfXmz+Cw9P8JVDHNpdgVmFkrSJ2c2XW7m/6mfI=; b=oeSq0iUr8exrSD7Ka7CSl+GcJhrRVTXmjxOnf1QPQfE91FoNzdyai5+xyd6Ux6G/5UAJpP H1JZqZ1x4h8yMbADI3jXzk9kbMtPPXpj7bTKHEJKZithp1C6R5753NfxUsOnYv5DLLW7kt Dkj+pEvfJ0gydUPo/fBdOSUur6AY4CV3ahrU/3QCXcZSc+mzuT/D6xju7HyL8wKgNnr056 06zwWxDdLbsFcJQarSkty0CKEVvyPGcija9C0Cdi8/AipcE/MUgydZsyyutnOJyzuY/RCZ rt+30Xa6GEOBWKpFsL30HeNhoK2d2TGFQaYwRl19x0CzuP5LfLSVygrYUZzMMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717115697; a=rsa-sha256; cv=none; b=wk1ENCR+P74SanveaxiZrzgMdCbvVPXTOF5aaW3cwqasJFUyfsxKaxSpMy1aDnCZzDpxU8 O9vYgFEHQgrlyRYqr2BDoaNcah7J9QaltMu30qc+NrNlkPoI3QcRevIPRFY9Fdm1HzC6rK 6B51i1SD85XNDJ9Hc6WZgHU8X0TOm3Wxc3uXLP9KmFfALxWYbbmNSx0Ml+w3T3ri/UStXa cTEVpkguC3e5hnS6C/HZ8cIk3G0X4TLd6v8nj1jdZdB5wcfhhqTHyEoRoDthiiaDQhftSa 0hh0QF6IehBfpUiMBWxmSMbH/IuPA9k1XVyF0F3aZYL3GX7AoSQ3Fy+NIaSynA== 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=1717115697; 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=044e7TfXmz+Cw9P8JVDHNpdgVmFkrSJ2c2XW7m/6mfI=; b=WUUhDIW2RznRgROuMHGpZDFd9DfrHiyIRnxwOp6UA7PKk0hUjKsF/6MF1afhja+zQ3hLHX VlDh/4dprbkLyIl3zLhZUUT4TDI6caq6+/pY1mUNnw1O/vIGZr/lbSCz5mYnKpIa7kZ8kq mM7SqQHhOc0fZ02jG/a9kIpZuvTcNJ42cPfEHg/83+u30S5hYckRh9ISAVCnYs/zl9fRs/ PhwS/COvATFp+S2jw4Mfq+nIUyIkdBVGrF85s4ltR6d/OoXyOrRwdtlVafzcAtA/GypPoV MYZ7AGuVEoENlZZyaWJ/SBpTXgKqTkEO4hGCKR3ul9DT67unIeTghP35WzcIsw== 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 4Vr3zj51N7z12mN; Fri, 31 May 2024 00:34:57 +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 44V0Yvhj043446; Fri, 31 May 2024 00:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V0Yvtj043443; Fri, 31 May 2024 00:34:57 GMT (envelope-from git) Date: Fri, 31 May 2024 00:34:57 GMT Message-Id: <202405310034.44V0Yvtj043443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 10e31f0946d8 - releng/14.1 - Update in preparation for 14.1-RELEASE 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 10e31f0946d820d53adc58b7d013b969e4a9a8ed Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10e31f0946d820d53adc58b7d013b969e4a9a8ed commit 10e31f0946d820d53adc58b7d013b969e4a9a8ed Author: Colin Percival AuthorDate: 2024-05-31 00:31:16 +0000 Commit: Colin Percival CommitDate: 2024-05-31 00:31:16 +0000 Update in preparation for 14.1-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- UPDATING | 3 +++ lib/csu/common/crtbrand.S | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 83b0d8b27cda..2d4a66d0d29c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240604: + 14.1-RELEASE. + 20240202: Loader now also read configuration files listed in local_loader_conf_files. Files listed here are the last ones read. And /boot/loader.conf.local was diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index b59e2fd8056b..65c0c3863bde 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -43,7 +43,7 @@ .4byte NT_FREEBSD_ABI_TAG 1: .asciz NOTE_FREEBSD_VENDOR 2: .p2align 2 -3: .4byte __FreeBSD_version +3: .4byte 1401000 4: .section .note.GNU-stack,"",%progbits diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 7ba6ed47b3b8..38d445be32a6 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.1" -BRANCH="RC1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi