From nobody Sun Oct 9 17:03:09 2022 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 4MlpJt1MQXz4f6JP; Sun, 9 Oct 2022 17:03:10 +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 4MlpJt0tgRz44Dv; Sun, 9 Oct 2022 17:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665334990; 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=IBUIldcgSROyL1JkyYRkla3v9h30nItqePNN40d9Cp0=; b=VJfBPHlHfRhGOBPYCw8hUJ1kaIvxc+3nceXMKP4LMOF3iKOF3kY6mi3s8fLwkkp3AR0fhy SffinWTzwFwRchbdbzJ6TyAbYUuA0++C85Mn0e3zR/NwIlxg9lr/08FA1s3yJq6sztTk3g 4TBqYil7JPCVHfmLz+C921uJprpjj0cqHYj9xEhPNPKWlRQw7MYZt4dRHXr4QOscZt1Zh7 n0M37b2Y3Wulh+nwXNz7TXWDvXw/jZKzWnpWO8c6f3o6pdqp004u0/Fjtm00KCgCsKHz7r PwNFJaOURVefanCv2N6cV3B9kCIbjIkAvY/9Wua83gomYx3CDVaC8W+TI5FSZw== 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 4MlpJs74JVzLbv; Sun, 9 Oct 2022 17:03:09 +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 299H39ei056752; Sun, 9 Oct 2022 17:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299H39JE056751; Sun, 9 Oct 2022 17:03:09 GMT (envelope-from git) Date: Sun, 9 Oct 2022 17:03:09 GMT Message-Id: <202210091703.299H39JE056751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a1c3ab7c09ae - stable/13 - riscv: move GEOM_PART_GPT option to DEFAULTS 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a1c3ab7c09ae23110f550b960cdbcc26bac5b0cb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665334990; 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=IBUIldcgSROyL1JkyYRkla3v9h30nItqePNN40d9Cp0=; b=s6fYOO572M5cd5EE3tgb+FAU4x2q0cDwDENYtIc7ZIH2FiDq/ouxeaMsVt0kXqsMr8eDKf nH9G3Lx9Lv6fXOZlVPz9VP44R5X9nzkZUND+N1pA+ATO4yd1JRL1CMSWFAEJ94AQB2WxDs HfaFjljDS4rYRJxg84C0P0KdLWwT5wK4Y8+HP9KLseepDTXhw6f4+uuuX22ebJS6h5s17d 2fIdQsl5b15+X81AVie3yyfsxGb5bS42YwrA9x5yTNZnZoSG1zkVAnD5ovmhsOAlhlDD61 eAIqvspuhG2SGeka8esgAHHgukD8eshzxSj5b49D9sciOzeITRry9dyoR1r5iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665334990; a=rsa-sha256; cv=none; b=j6gt4eNMz62wFJ7fIEg9MXOBKDC/P3Fj/V5DFG3VfFnrQvsEKfiZL3kaPtSe5AhjNYGBmb yGUGpq3185l8hZoQ8LhrZAmHoVEO5LtrxP45VpXEkR/H2DlO36WrXGune/0Tyx9yB2dmt7 D5sTl1dWC2biyIhknXsmWBJ4SQcZs2R+wtXEqbWgLJx3x8f3OwMI4Hs4uD1ERID1D+Q+yK wen1tT5z5jOufPIvAH0BtAl6haa6vQs/ReOg3bdyma1Xaw6aasQtBKliz52Nfhkv70kJpe 9Wnhh0Tj9P8fxKP1s7/ZX4iwYfkfdjg5cvFr8MitkzonbaCzK4IvbSPI+2UdGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a1c3ab7c09ae23110f550b960cdbcc26bac5b0cb commit a1c3ab7c09ae23110f550b960cdbcc26bac5b0cb Author: Mitchell Horne AuthorDate: 2022-06-14 17:19:46 +0000 Commit: Mitchell Horne CommitDate: 2022-10-09 17:02:31 +0000 riscv: move GEOM_PART_GPT option to DEFAULTS This is consistent with other architectures. (cherry picked from commit 3a91cecea412cc6c73d10f7594a3b6f472748b9d) --- sys/riscv/conf/DEFAULTS | 1 + sys/riscv/conf/GENERIC | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/conf/DEFAULTS b/sys/riscv/conf/DEFAULTS index 94c6bf283c45..082e52247b3d 100644 --- a/sys/riscv/conf/DEFAULTS +++ b/sys/riscv/conf/DEFAULTS @@ -11,5 +11,6 @@ device mem # Memory and kernel memory devices # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_MBR +options GEOM_PART_GPT options NEW_PCIB diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 12d48986184a..6cce48b884c0 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -49,7 +49,6 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options TMPFS # Efficient memory filesystem -options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD12 # Compatible with FreeBSD12