From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 03 Jan 2025 17:57:44 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tTkzY-00GHV7-0s for lore@lore.pengutronix.de; Fri, 03 Jan 2025 17:57:44 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tTkzY-00040P-E6; Fri, 03 Jan 2025 17:57:44 +0100 Received: from mail.cab.de ([46.232.229.101]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tTkzK-00040G-0l for ptxdist@pengutronix.de; Fri, 03 Jan 2025 17:57:30 +0100 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.cab.de 4YPqWF3ScVzMvQtR DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cab.de; s=default; t=1735923449; bh=PAdfBO5wUtMvOOo3KOa3cA201iOQEJhiEbx0qvA5fyk=; h=From:To:CC:Subject:Date:From; b=VzEKJLobDixlYTBCrszAFpbrH5ouuQGplBJXf+uMeIA5EJSNJjhkBVlkuUJW+062S fPH1vcB37T/QAUwg8UEDcNnGqW3WQl1LNYKiv6zucRNuN23qd38GSyKJ2c8sfypJDi cLmhZMVf9FRwHzwB44gEwHiwL5HftzujbHy1ZtjM= X-cab-MailScanner-Watermark: 1736528248.47613@Ai6DryGmzPwv5mxWay8a7w X-cab-MailScanner-From: m.heidelberg@cab.de X-cab-MailScanner: Found to be clean X-cab-MailScanner-ID: 4YPqWB3G2zzMvQwP X-cab-MailScanner-Information: Please contact it@cab.de for more information Received: from Adranos.cab.de ([10.10.1.54] [10.10.1.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (no client certificate requested) by hephaistos.cab.de (MailScanner Milter) with SMTP id 4YPqWB3G2zzMvQwP for ; Fri, 3 Jan 2025 17:57:26 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.cab.de 4YPqWB3G2zzMvQwP Received: from KAN23-025.cab.de (10.10.3.178) by Adranos.cab.de (10.10.1.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Fri, 3 Jan 2025 17:57:25 +0100 From: Markus Heidelberg To: Date: Fri, 3 Jan 2025 17:57:05 +0100 Message-ID: <20250103165706.160770-1-m.heidelberg@cab.de> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.10.3.178] X-ClientProxiedBy: Adranos.cab.de (10.10.1.54) To Adranos.cab.de (10.10.1.54) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] Fix some typos, grammar and duplicated words X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Markus Heidelberg Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Markus Heidelberg --- config/setup/Kconfig | 6 +++--- doc/dev_dir_hierarchy.rst | 2 +- doc/dev_licenses.rst | 2 +- scripts/lib/ptxd_make_nested.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/setup/Kconfig b/config/setup/Kconfig index 4c51e865b..53177e727 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -440,7 +440,7 @@ choice bool prompt "podman" help - Use podman ad container provider. '--userns=keep-id' will be + Use podman as container provider. '--userns=keep-id' will be used to map calling user into the container. endchoice @@ -455,7 +455,7 @@ config SETUP_CONTAINER_ARGS string prompt "extra args" help - Additional arguments for the container manager. The will be inserted + Additional arguments for the container manager. They will be inserted directly before the container image in the docker/podman command-line. config SETUP_CONTAINER_DEVELOP @@ -463,7 +463,7 @@ config SETUP_CONTAINER_DEVELOP prompt "developer mode" help In developer mode, additional directories will be mounted into the - container, such at the user global ptxdistrc and sources symlinked in + container, such as the user global ptxdistrc and sources symlinked in local_src/. endif diff --git a/doc/dev_dir_hierarchy.rst b/doc/dev_dir_hierarchy.rst index bd1ad40d0..6d1c7e968 100644 --- a/doc/dev_dir_hierarchy.rst +++ b/doc/dev_dir_hierarchy.rst @@ -51,7 +51,7 @@ Patches are looked for at several locations: 1. the ``patches/`` folder in your BSP (``${PTXDIST_WORKSPACE}/patches``) -2. the folder ``patches/`` folder relative to your selected platformconfig +2. the ``patches/`` folder relative to your selected platformconfig file (``${PTXDIST_PLATFORMCONFIGDIR}/patches``). If your platformconfig file is at ``configs/|ptxdistPlatformConfigDir|/platformconfig``, this patch folder will be ``configs/|ptxdistPlatformConfigDir|/patches/``. diff --git a/doc/dev_licenses.rst b/doc/dev_licenses.rst index 6aed9daac..b0814e782 100644 --- a/doc/dev_licenses.rst +++ b/doc/dev_licenses.rst @@ -221,7 +221,7 @@ For the example above, lines 1 to 16 of main.cc would be:: Always include the copyright statement ("Copyright YYYY (C) Some Person") for the calculation of the checksum, even if it means that the checksum changes on package updates when new years are added to the string. -While it is not is needed for most licenses to be valid, some licenses require +While it is not needed for most licenses to be valid, some licenses require that it must not be removed (e.g. see GPLv2, section 1), and it is proper etiquette to give attribution to the maintainers in the license report document. diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh index 5062d2a5f..54535377f 100644 --- a/scripts/lib/ptxd_make_nested.sh +++ b/scripts/lib/ptxd_make_nested.sh @@ -79,7 +79,7 @@ ptxd_make_nested_ptxdist() { ptxd_verbose "executing:" "${args[@]}" - # run ptxdist but don't log it. It has it's on logfile + # run ptxdist but don't log it. It has its own logfile ( if [ -n "${PTXDIST_FD_STDOUT}" ]; then exec 1> >(sed "s/^/${pkg_label}: /" >&${PTXDIST_FD_STDOUT}) -- 2.43.0