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 660A6A0032 for ; Fri, 18 Feb 2022 13:39:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6146040E28; Fri, 18 Feb 2022 13:39:44 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 3FF0D40E28 for ; Fri, 18 Feb 2022 13:39:43 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id i14so14341926wrc.10 for ; Fri, 18 Feb 2022 04:39:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=38OrbMR5Oi+TaizujPlY5zkaetoTfLMBQQpk2DFlXFU=; b=QOH7AH9Ej5/YmprC+oh89/xUmL7Mwv/nLG4yfqirpVXA8iBjlM8DIa+cr+/rKtprYV t+v8vYuDx7Ulf5v1NcCm3T8xOYQSWx1Dc0HA9nau+/ecZcRCO33G4e6VOfXC/hqUfiNr OMpdnh1vNsWSxyohYm5HLMrv1n5VPlBLw79yg+r+JlN7KtShLDYEIp07xn2y/BNS+A4A rPA0VAzIgeS8DZQDl0CRRIuugR3+bfSm2jLR1q4aW2VBrt3Q92n4u26tp7wewzcT57yF Cvzt+Jc4qWYOG9h3Pnrj666GLXIBlZaQgpgpAEt45IB1Pt+xsg5tKhxTwn13pS1nTgDQ 5aaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=38OrbMR5Oi+TaizujPlY5zkaetoTfLMBQQpk2DFlXFU=; b=lPhKP8IY0/doyPFKxydaS4tL3LyDk3+BZ2lDSEVfd0fw095GLXzUJyd7YV0360j1ZQ mVH+lHI7qUYvMofkaP5zNf3w93yjw8pL16U6Vl3zMEowSrQeCWRVRsvFtJFq+BoeBSOL a3d7ry+TYz8sltzc1zmMOM6oOG5oC0F2ckPIE3TTFr0laKY8KG/uQdD1vdjk9zD8JtxX LWEe5Zg4L2OqvavFZg6RXvoRAtkNrtEXZb7p48plcu+wCXEb98L34WqDNckc8YZ8o7DA yNjB0Rpw3py4kZfKuoJGNb3kKHX6n7lfanWwXHrE6dpWqXv5ChPEy2B7rYF9mGznDXDn HzUg== X-Gm-Message-State: AOAM5324TM6d0EsKG3DTbBtsR1ljLp3IUDHVpdjKMPw9zkgLi3GfObGK Qqh0gCr2c0yKzX6vkRgviEY= X-Google-Smtp-Source: ABdhPJyZuyCtHXf/QHl3LSqPgKQXCQtxmoZFy3EClLE4h3CE2Rt4ii06hUzkoR1d+x9gfhc74QVpcg== X-Received: by 2002:a5d:4e87:0:b0:1e3:45bd:f74 with SMTP id e7-20020a5d4e87000000b001e345bd0f74mr5740167wru.357.1645187982953; Fri, 18 Feb 2022 04:39:42 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id t16sm4595252wmq.43.2022.02.18.04.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:39:42 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'doc: remove dependency on findutils on FreeBSD' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:37:33 +0000 Message-Id: <20220218123931.1749595-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7c66f7f67964d422899e4cb914265a0bae14667e Thanks. Luca Boccassi --- >From 7c66f7f67964d422899e4cb914265a0bae14667e 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 @@ -6,21 +6,15 @@ EXAMPLES_DIR=$1 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:38.395484117 +0000 +++ 0004-doc-remove-dependency-on-findutils-on-FreeBSD.patch 2022-02-18 12:37:37.498787632 +0000 @@ -1 +1 @@ -From fee17a1d290434f1b9f109d8a4bc575d9e61bb13 Mon Sep 17 00:00:00 2001 +From 7c66f7f67964d422899e4cb914265a0bae14667e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fee17a1d290434f1b9f109d8a4bc575d9e61bb13 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org