From nobody Mon Dec 16 15:14:44 2024 X-Original-To: dev-commits-src-all@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 4YBk504xtHz5hYVJ; Mon, 16 Dec 2024 15:14:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBk503HMlz46NY; Mon, 16 Dec 2024 15:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362084; 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=JvKgObnlfgEeUNQxaZcmnz40YM6OrFDrc/ZtooIH1q8=; b=qaYBAkQTHL3xe89GekQaNvAjbuNR6OtpQVPfuuGJnZIdx0JY7zEGMdSvO7ZH14f8gH49ck DHftFUwQJ5P9As36MRTv67nppdnHHzuHjXvTXAeENqvNkog4PGk6dDrexOeMe96XXqgTok 6PLn2nzeWRE4E7WLPogcM5QEvq97pOn4bM+JJwIF0PH6p/Q9XOp553eqQObUTPIFg+V50N Q0nR69Uvl5cOmClyRbCs/5M/Wov9GwhVOWK7tsV4ZvgDoSNo0V324iYT3qHXeMHkR+yA4q QEqLOHTK8MRdY1Uk7xhLLFz5IoApfsXCn75qHv2qs6N+XSsfh/6zj+zAmqxMFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362084; 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=JvKgObnlfgEeUNQxaZcmnz40YM6OrFDrc/ZtooIH1q8=; b=vVpqVifJdZG0DaiY/i9Uz1voX7P+XJ4FQhY6TF+4C26OBW/0M7zawddr0azm1vcZqisLNe fwPQ+gzOH1ObEQjqOHOyLklFsZm4E5h8Hf8pkB5o9haLxxU4sn31euUvTusbJtvtk8Iah3 fzQ0r99E3pA5bg+Wv3lBdnuNNxufZBYoTuYMh/hoxr+j/f1vDP9VIZMOT4YA9BYSmXQPaT bVIkVOex1QlHtTtv3RI0pjKRLvtGw6f2lT9B/xCGE2wckvF8uQnZj01yxobWKFQ0/ETL45 irdYHlSNfBbaGW09kHWTeVs132J2TmPfSythVBwmeLBeV0QqF2fokNLlgKmKTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734362084; a=rsa-sha256; cv=none; b=yQhScau8xajh63K/d8fOSzV/yq/oCIRxdVfuSvL36OthxW+cHDVnAvDBx1ypjhDdk3JdXZ 8aBbwHCw9xA0gzuYexTYy8zbM2Fr78VkuaNSt3yTMboPibIVZqlPWKfBPVTB0q65JzGdPv XaYFZqUixDpddLMCiO/GvUSf3MTby5hAAyPAHuJlkyNgI8fV0GebBZmcfbMx/R2C2APg65 0O0dHyll//aZ9hrgTsuMuNYz3FahdxmHvOi/tlK8qexZyJM8K2DaowTymHgtqBp90aG+2R 2cJc7zwsQV+VvXRwEXJflYPJL3Upls2jn7pCm8SumsWBepME22C4VNNSPlRSwQ== 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 4YBk502vtBzy4j; Mon, 16 Dec 2024 15:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BGFEiTF011366; Mon, 16 Dec 2024 15:14:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGFEirM011363; Mon, 16 Dec 2024 15:14:44 GMT (envelope-from git) Date: Mon, 16 Dec 2024 15:14:44 GMT Message-Id: <202412161514.4BGFEirM011363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 8e8ccdf02e14 - stable/14 - nanobsd: Fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8e8ccdf02e140e06b9012fa21e14d4df058629e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8ccdf02e140e06b9012fa21e14d4df058629e9 commit 8e8ccdf02e140e06b9012fa21e14d4df058629e9 Author: Jose Luis Duran AuthorDate: 2024-11-15 04:54:09 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-16 15:12:23 +0000 nanobsd: Fix typos Fix a number of typos in the code or comments. Files under dhcpd, embedded, pcengines, and rescue were intentionally omitted. These directories will be reviewed at a later date. PR: 269884 Reviewed by: imp, zlei Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47587 (cherry picked from commit 12cbad923dbcccb3d6f71a77ad3241508f186048) --- tools/tools/nanobsd/Files/root/save_cfg | 2 +- tools/tools/nanobsd/defaults.sh | 10 +++++----- tools/tools/nanobsd/fill_pkg.sh | 2 +- tools/tools/nanobsd/mtree-dedup.awk | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/tools/nanobsd/Files/root/save_cfg b/tools/tools/nanobsd/Files/root/save_cfg index 1931e5c79923..24f812197a68 100644 --- a/tools/tools/nanobsd/Files/root/save_cfg +++ b/tools/tools/nanobsd/Files/root/save_cfg @@ -62,7 +62,7 @@ do # Add to cfg (y/n/i)? # y) -> save this file in /cfg # n) -> do not save this file in /cfg for current script invocation ONLY - # i) -> add file to ignore list (/cfg/.ignore hiereachy) and never save + # i) -> add file to ignore list (/cfg/.ignore hierarchy) and never save # try to add this file to /cfg. # # touch is used to add files to /cfg to keep the script flow straight and easy diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 587df09f0f3f..df9e7dc1ee48 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -497,10 +497,10 @@ run_late_customize ( ) ( # a user's cfg file would override this. # fixup_before_diskimage ( ) ( - # Run the deduplication script that takes the matalog journal and + # Run the deduplication script that takes the metalog journal and # combines multiple entries for the same file (see source for # details). We take the extra step of removing the size keywords. This - # script, and many of the user scripts, copies, appeneds and otherwise + # script, and many of the user scripts, copies, appends and otherwise # modifies files in the build, changing their sizes. These actions are # impossible to trap, so go ahead remove the size= keyword. For this # narrow use, it doesn't buy us any protection and just gets in the way. @@ -814,7 +814,7 @@ cust_pkgng ( ) ( CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}" ( - # Expand any glob characters in pacakge list + # Expand any glob characters in package list cd "${NANO_PACKAGE_DIR}" _PKGS=`find ${NANO_PACKAGE_LIST} -not -name "${_NANO_PKG_PACKAGE}" -print | sort | uniq` @@ -905,7 +905,7 @@ usage ( ) { # Setup and Export Internal variables # -export_var ( ) { # Don't wawnt a subshell +export_var ( ) { # Don't want a subshell var=$1 # Lookup value of the variable. eval val=\$$var @@ -914,7 +914,7 @@ export_var ( ) { # Don't wawnt a subshell } # Call this function to set defaults _after_ parsing options. -# dont want a subshell otherwise variable setting is thrown away. +# don't want a subshell otherwise variable setting is thrown away. set_defaults_and_export ( ) { : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT:+.${NANO_LAYOUT}}} : ${MAKEOBJDIRPREFIX:=${NANO_OBJ}} diff --git a/tools/tools/nanobsd/fill_pkg.sh b/tools/tools/nanobsd/fill_pkg.sh index 6734498350a9..17d163709f91 100644 --- a/tools/tools/nanobsd/fill_pkg.sh +++ b/tools/tools/nanobsd/fill_pkg.sh @@ -160,7 +160,7 @@ for i in `cat "$PL"` ; do if [ -f "$NANO_PKG_DUMP/$i.pkg" ] ; then $COPY "$NANO_PKG_DUMP/$i.pkg" "$NANO_PKG_DIR" else - echo "Package $i misssing in $NANO_PKG_DUMP" 1>&2 + echo "Package $i missing in $NANO_PKG_DUMP" 1>&2 exit 1 fi done diff --git a/tools/tools/nanobsd/mtree-dedup.awk b/tools/tools/nanobsd/mtree-dedup.awk index e30f3100b4da..8840047f5318 100755 --- a/tools/tools/nanobsd/mtree-dedup.awk +++ b/tools/tools/nanobsd/mtree-dedup.awk @@ -84,7 +84,7 @@ function mtree_from_kvs(path, kvs) return lv; } -# Parse the mtree line into path + KVs. Use a sentinal value +# Parse the mtree line into path + KVs. Use a sentinel value # for a bare keyword, which is extremely unlikely to be used # for real. function line2kv(kvs, str)