From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 51A00A034E for ; Mon, 21 Feb 2022 16:37:17 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4995840DF6; Mon, 21 Feb 2022 16:37:17 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 876ED40DF6 for ; Mon, 21 Feb 2022 16:37:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3t87lVagEnqeax28VmTNod3GfUAAIHijBjooi81t5LI=; b=EM2kyqUfVUbfrnds5O1YSBvAD7SSKbblJZP8paZ/T4qgS1ZiZLx8kKYql9nNj43ZsMg9aS 3lFJEPtx5VdjeWLCbHYBMlxD7gZZUfHOHY3AwjVUW+bHogcwMdZdH0H8BYGc7fwtsfJj6i nc7GscWcVb2CubGpD9d0UuSjn5sO9gI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-604-tqeHSUOMMJW0BZtqQYNs9A-1; Mon, 21 Feb 2022 10:37:12 -0500 X-MC-Unique: tqeHSUOMMJW0BZtqQYNs9A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04EE381424C; Mon, 21 Feb 2022 15:37:11 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34BB47E133; Mon, 21 Feb 2022 15:37:09 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: dpdk stable Subject: patch 'doc: remove dependency on findutils on FreeBSD' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:14 +0000 Message-Id: <20220221153625.152324-5-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c30f1ec97d4023ff71671615b13975846dba5edd Thanks. Kevin --- >From c30f1ec97d4023ff71671615b13975846dba5edd Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 22 Dec 2021 15:18:55 +0000 Subject: [PATCH] doc: remove dependency on findutils on FreeBSD [ upstream commit fee17a1d290434f1b9f109d8a4bc575d9e61bb13 ] Standard "find" on BSD does not support the "-printf" so gfind from findutils package was used to enable full doc builds. We can remove this extra dependency by using "sed" and "tr" to adjust the output from regular find instead. Fixes: 8260f4f98cfe ("mk: use script to generate examples.dox") Fixes: 499fe9dfcfc7 ("doc: add dependency on examples for API doxygen") Fixes: 897e55c8d27f ("doc: fix Doxygen examples build on FreeBSD") Signed-off-by: Bruce Richardson --- doc/api/generate_examples.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/doc/api/generate_examples.sh b/doc/api/generate_examples.sh index 3e08236596..48574563ca 100755 --- a/doc/api/generate_examples.sh +++ b/doc/api/generate_examples.sh @@ -7,20 +7,14 @@ API_EXAMPLES=$2 FIND=find -if [ "$(uname)" = "FreeBSD" ] ; then -# on FreeBSD, we need GNU find for "-printf" flag - FIND=gfind - if ! which -s $FIND ; then - echo "Error: need '$FIND' on FreeBSD. Install 'findutils' pkg" - exit 1 - fi -fi # generate a .d file including both C files and also build files, so we can # detect both file changes and file additions/deletions -echo "$API_EXAMPLES: $($FIND ${EXAMPLES_DIR} -type f \( -name '*.c' -o -name 'meson.build' \) -printf '%p ' )" > ${API_EXAMPLES}.d +echo "$API_EXAMPLES: $($FIND ${EXAMPLES_DIR} -type f \( -name '*.c' -o -name 'meson.build' \) | tr '\n' ' ' )" > ${API_EXAMPLES}.d exec > "${API_EXAMPLES}" printf '/**\n' printf '@page examples DPDK Example Programs\n\n' -$FIND "${EXAMPLES_DIR}" -type f -name '*.c' -printf '@example examples/%P\n' | LC_ALL=C sort +$FIND "${EXAMPLES_DIR}" -type f -name '*.c' | + sed "s|${EXAMPLES_DIR}|@example examples|" | + LC_ALL=C sort printf '*/\n' -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:44.814197711 +0000 +++ 0005-doc-remove-dependency-on-findutils-on-FreeBSD.patch 2022-02-21 15:22:44.034703997 +0000 @@ -1 +1 @@ -From fee17a1d290434f1b9f109d8a4bc575d9e61bb13 Mon Sep 17 00:00:00 2001 +From c30f1ec97d4023ff71671615b13975846dba5edd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fee17a1d290434f1b9f109d8a4bc575d9e61bb13 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org