From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8CC1DA051C for ; Tue, 11 Feb 2020 12:22:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 82C062B9C; Tue, 11 Feb 2020 12:22:51 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by dpdk.org (Postfix) with ESMTP id 09EE02B9C for ; Tue, 11 Feb 2020 12:22:50 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id b17so3067910wmb.0 for ; Tue, 11 Feb 2020 03:22:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bwDt3iIBgX5vXrl2pHVFnH3n2qZ6v8map7rr6gRBHHw=; b=Mgnjkvm+VMbF5QD2rvGejlLM7msO+HaCMu5mob+40Qz/8913rDxi+f34ieUzHg6boT EIGscyp7nDTN6qHXXb6Oq8esdQtQJVOZm3qYqSaCUuMIDfSUksN1/wnK0euzKSE78ooI yeTjEGx7tyIRHGkXC/hosqWb+NrR5Y2iDfalpYN/S14YOOtqgLK1DK9NEaMugSsWfypz Yzt0cuodnfntZ+NyqiSR0Zp8FxcrhqcUc15G7RcWyJRjLW2Pe0rn40uym3ycrmV2BUoI 2txFhSn/qvyuDY9disbPYtnAGsEzv9SUHWWMxO2vI2drSUIdhiJ/ThYp9bUn8/K1WfFc H5rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bwDt3iIBgX5vXrl2pHVFnH3n2qZ6v8map7rr6gRBHHw=; b=jyCmQnEQJslYjaooXXZL2AS4f1fvDLmOgsMVbtFP5yFJDIVwLWkAD3H1Ml2s1BpN8k RKCmz904kRUpZ2o4ziaFYUMbXrmugiD6VjCOVuqk6pfjGdkOTRpaO8j6UQ7UKULKiaFM VzBvJnXPWfecOgNMK4ltQTXSx2JXAd0rMytO8ajjWGKow0Ye0N6m85WZillwINuFpFKg EVo2lB4EC8b4rRT3b5Sc5g9BNdBtRzeodL0hTY1/mTOXH0cAerhWbu/CaV40ajE14Gkc TLid8ODY9E36SGUA3B59Rg+5vXDxZU5kssvXuu1NYAhnvbvKbNiSZP7pECF+lucALbJC +ltQ== X-Gm-Message-State: APjAAAVfqBVr2QYrqDxSUmbX2OKTHYIu7xIMLP9KApZ2mXqakiQfyOj/ Dgif9T8VmejiJhfap3NiJBE= X-Google-Smtp-Source: APXvYqyXfgo0prNP2RJnIIG414Dz6z+MCe9unV3Gsfe/t26cfNvoZcc3MNw9X5QXmH+1LPqoPwooGA== X-Received: by 2002:a1c:a1c3:: with SMTP id k186mr5098659wme.179.1581420169786; Tue, 11 Feb 2020 03:22:49 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a6sm4973681wrm.69.2020.02.11.03.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:22:49 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Aaron Conole , Luca Boccassi , dpdk stable Date: Tue, 11 Feb 2020 11:19:18 +0000 Message-Id: <20200211112216.3929-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix warning with meson' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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/13/20. 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. Thanks. Luca Boccassi --- >From efa577f3eb9b7d0cf5d9b1a41a5880bead2e8add Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 10 Jan 2020 21:52:02 +0000 Subject: [PATCH] doc: fix warning with meson [ upstream commit b1e1bd379afb89495b7d72a4edad89292c21d17a ] The install parameter to configure_file is new in 0.50 and generates a warning since it is newer than our minimum version of 0.47.1. The parameter, however, is unneeded as the documentation states: "When omitted it defaults to true when install_dir is set and not empty, false otherwise." Given that install_dir is not set for this file, install defaults to false so no need to explicitly specify it. Fixes: 720b14db3ae2 ("build: generate API documentation with meson") Signed-off-by: Bruce Richardson Acked-by: Aaron Conole Acked-by: Luca Boccassi --- doc/api/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index 1c48b7672e..23a7dfc759 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -38,8 +38,7 @@ if doxygen.found() doxy_conf = configure_file(input: 'doxy-api.conf.in', output: 'doxy-api.conf', - configuration: cdata, - install: false) + configuration: cdata) doxy_build = custom_target('doxygen', depends: example, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:39.439781108 +0000 +++ 0012-doc-fix-warning-with-meson.patch 2020-02-11 11:17:38.307999627 +0000 @@ -1,8 +1,10 @@ -From b1e1bd379afb89495b7d72a4edad89292c21d17a Mon Sep 17 00:00:00 2001 +From efa577f3eb9b7d0cf5d9b1a41a5880bead2e8add Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 10 Jan 2020 21:52:02 +0000 Subject: [PATCH] doc: fix warning with meson +[ upstream commit b1e1bd379afb89495b7d72a4edad89292c21d17a ] + The install parameter to configure_file is new in 0.50 and generates a warning since it is newer than our minimum version of 0.47.1. The parameter, however, is unneeded as the documentation states: @@ -14,7 +16,6 @@ so no need to explicitly specify it. Fixes: 720b14db3ae2 ("build: generate API documentation with meson") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Aaron Conole