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 EA784A0C41 for ; Tue, 30 Nov 2021 17:44:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D214B410F7; Tue, 30 Nov 2021 17:44:04 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id C7BD041190 for ; Tue, 30 Nov 2021 17:44:01 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 9A98B3FFE1 for ; Tue, 30 Nov 2021 16:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290641; bh=+HgD7urGQrfkaV2Hj5N6/hwooMd4U9fsUlM2xatZ4GA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E9iVhyPdIE0+Ig+0GlDXVhv7k1k5EXUz29tr3hEzkjPIQzo9f6zLITcOzf9WLAyGO T49YEj5KP8IK0M7uc9iR+kTJEyPdMHPPxMtPN3D7ZxsUSbBlvpEWlV/SZX+cjtgstX eAQR+g+M87xA3A4Lw2orfm0YZXckmv4rr+dDE6jrUgCBHwcCw/21Sy+dc345SQJugd Fe437hdbjcGsSMidB8I3Vv1vNg92Ccd8WuNhh5BT1m/8EG1LvwNBDzm9hQRaKhneRl aFlELKAibrSvB81w+DvR6wjal9354bABUX/AKZsuqp35jF+0QJmvNJAO0ErBQWB6t/ fs8os7YimRrjw== Received: by mail-ed1-f70.google.com with SMTP id m17-20020aa7d351000000b003e7c0bc8523so17460794edr.1 for ; Tue, 30 Nov 2021 08:44:01 -0800 (PST) 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=+HgD7urGQrfkaV2Hj5N6/hwooMd4U9fsUlM2xatZ4GA=; b=CADs6RK/1ojKRqC/8lMSIe0s2gpAZ/rDeZpHVS3XWalXVcPrirIWiEa1cfT42/iFQJ hRTd/nrC2OmbHD1ArQWAMrLNB+QZ4mg2deppWTgUZm9+bSr2HT7AZiXtQ79NqEfch5// /xKjlbtKUSuLxw8I80x/EsIFoHTFd93XP7XLZ/n1DmyicJuJI7jeZ6y4aaKF/Ue8P07F HYXYphfB5Xp+Hd148jlwaj/nnb7Xz5ZfLOri3Kk8st7otOSyHjrBzfWYWCXj/M8N2Jcb b3r7nM6Fhz9ddJRyRu4ebCo0qYgZ6Zcp1zlh0spysAILoUhQMfvRILkRlDyEuD0ghnMd 7Ckg== X-Gm-Message-State: AOAM531p5Wn30ogf6AeC2i9oegil5XqsySQ49v4Kz60+iHBNO/xnYJSd sOCqkSOZjl7XiKc/1bt1U68g616zLSJJV7La7+P+rOiGFJhySWF/l71qLHG05gv3R+aP94zddVg b38QOcbfabkUg4fpli+YYeEAH X-Received: by 2002:a50:eb98:: with SMTP id y24mr44531edr.339.1638290640996; Tue, 30 Nov 2021 08:44:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzOtUEU3PvZ1ZvAKqqGoiBHduy+IC1shZPIWu+iJIrFGFE995siy0LBgFv4hm25HyltkF4atg== X-Received: by 2002:a50:eb98:: with SMTP id y24mr44501edr.339.1638290640846; Tue, 30 Nov 2021 08:44:00 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id f16sm12779083edd.37.2021.11.30.08.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:44:00 -0800 (PST) From: christian.ehrhardt@canonical.com To: Timothy Redaelli Cc: Luca Boccassi , David Marchand , dpdk stable Subject: patch 'doc: strip build artefacts for examples file list' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:58 +0100 Message-Id: <20211130163605.2460997-154-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/bfee2c85d61bfdac606d32d834a818eb80b2f15b Thanks. Christian Ehrhardt --- >From bfee2c85d61bfdac606d32d834a818eb80b2f15b Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 23 Nov 2021 15:48:42 +0100 Subject: [PATCH] doc: strip build artefacts for examples file list [ upstream commit 92eb2c3465439dad4d7aa4f073df517de1817ed9 ] examples.dox is built inside builddir/doc/api and so doxygen generates some dir_HASH.html that includes the builddir name and this may prevent DPDK documentation to be correctly generated in some distributions, for example CentOS Stream 9 and RHEL9, since the builddir includes the architecture. This commit adds builddir/doc/api (the path where examples.dox is generated) to STRIP_FROM_PATH, so the generated documentation doesn't change if builddir changes. Fixes: a6090630f4e5 ("doc: automate examples file list for API") Signed-off-by: Timothy Redaelli Acked-by: Luca Boccassi Tested-by: David Marchand --- doc/api/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index c72b880e10..e5e2f1acb2 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -37,7 +37,7 @@ cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) cdata.set('HTML_OUTPUT', 'api') cdata.set('TOPDIR', meson.source_root()) -cdata.set('STRIP_FROM_PATH', meson.source_root()) +cdata.set('STRIP_FROM_PATH', ' '.join([meson.source_root(), join_paths(meson.build_root(), 'doc', 'api')])) doxy_conf = configure_file(input: 'doxy-api.conf.in', output: 'doxy-api.conf', -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:14.795523249 +0100 +++ 0154-doc-strip-build-artefacts-for-examples-file-list.patch 2021-11-30 16:50:06.130876025 +0100 @@ -1 +1 @@ -From 92eb2c3465439dad4d7aa4f073df517de1817ed9 Mon Sep 17 00:00:00 2001 +From bfee2c85d61bfdac606d32d834a818eb80b2f15b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 92eb2c3465439dad4d7aa4f073df517de1817ed9 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index d34c383694..7e2b429ac8 100644 +index c72b880e10..e5e2f1acb2 100644 @@ -30 +31 @@ -@@ -36,7 +36,7 @@ cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples +@@ -37,7 +37,7 @@ cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples @@ -32 +33 @@ - cdata.set('HTML_OUTPUT', 'html') + cdata.set('HTML_OUTPUT', 'api') @@ -36,3 +37,3 @@ - cdata.set('WARN_AS_ERROR', 'NO') - if get_option('werror') - cdata.set('WARN_AS_ERROR', 'YES') + + doxy_conf = configure_file(input: 'doxy-api.conf.in', + output: 'doxy-api.conf',