From owner-dev-commits-src-all@freebsd.org Thu Sep 16 17:59:26 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE6F367E693; Thu, 16 Sep 2021 17:59:26 +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 4H9Pwt5Hc1z3KmH; Thu, 16 Sep 2021 17:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 95EF026094; Thu, 16 Sep 2021 17:59:26 +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 18GHxQGC046519; Thu, 16 Sep 2021 17:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18GHxQLx046518; Thu, 16 Sep 2021 17:59:26 GMT (envelope-from git) Date: Thu, 16 Sep 2021 17:59:26 GMT Message-Id: <202109161759.18GHxQLx046518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7cf62c68c0f4 - main - nanobsd: Provide empty routines for new embedded scheme MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cf62c68c0f48c44e3fcb098d0406f417c1f488b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2021 17:59:26 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7cf62c68c0f48c44e3fcb098d0406f417c1f488b commit 7cf62c68c0f48c44e3fcb098d0406f417c1f488b Author: Warner Losh AuthorDate: 2021-09-16 16:18:32 +0000 Commit: Warner Losh CommitDate: 2021-09-16 17:54:18 +0000 nanobsd: Provide empty routines for new embedded scheme calculate_partitioning and create_code_slice are now required in nanobsd.sh. While things work with the ones provided by legacy.sh, it's fighting embedded/common's other actions. Instead, replace them with stubs. Sponsored by: Netflix --- tools/tools/nanobsd/embedded/common | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index f3be05ae857a..3b8faff5e252 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -647,6 +647,14 @@ esac NANO_SLICE_DATA= # Not included +# These don't make any sense to this strategy, so stub them out. +calculate_partitioning ( ) ( +) + +# These don't make any sense to this strategy, so stub them out. +create_code_slice ( ) ( +) + # Each major disk scheme has its own routine. Generally # this is for mbr, gpt, etc. These are generally are widely # shared, but some specialized formats won't be shared.