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 39EC5A04DB for ; Tue, 17 Nov 2020 12:14:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C1804C90; Tue, 17 Nov 2020 12:14:28 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by dpdk.org (Postfix) with ESMTP id E6F6AF3E for ; Tue, 17 Nov 2020 12:14:26 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id j7so22754529wrp.3 for ; Tue, 17 Nov 2020 03:14:26 -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=Id4qXKe0IJ/gq8q6fFcjgF7Lm+19c1LmgiHyzLg8Dec=; b=OZn+VuQ7yuh9uhO15dAdSE4s24KcZnZhmdd2vw0c4aRrYbw1s4OGSyvjxwlkDvAXBu AaD9HeWjuD18W9VvdtSLYl7c2J2TW6ho9+k8G+2kwfweidpQ67yOV7vlxcN030NWGYSf e5m+m2VfGPZQig/Z3NZxLFFkE0T3WNU79GL6a2Umu+rPKQqO73hJjQPJsd08sq9xhcON 5/5Jmv05VTp1f8taTDPtaAvLAI//XJhbfzqa7AX/crhqDoBrJ6fBp4HC0QpXBikKIdsn XM0szrbIPUAatCZzcIMKyTMW4N8TTp5XvCwJDpAD4MPhgLMRSxiWQMg6Ojopzk9BHEmH PA4A== 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=Id4qXKe0IJ/gq8q6fFcjgF7Lm+19c1LmgiHyzLg8Dec=; b=RE5i8cAzGba2ioy2bYbk2lP6ZyBZe5mT+YzBs2Rh8usZzO8+CR0zszqqxkuKS1oW6e AyCO1bvilIDoZpX2+A5Hu6uJCv+d5xbceP9fwJUFK3IOsATGg636ar0o3o+xuVdJU37m 4Ego3rpb9vjtJUJNcITklNiTpxt2D16gHzHEqBCyJrSo2tvu9fOgFV3HnoDdIvQh2zbf Cf7ZmH2IzdP9PpEpvW/22Xenl533bmy8BE3/L/hDsLo9TC5ibKv6JVovuxbl4S5JASR6 FP2fglTSWrgO0KwLZFk78Bd8RDERbJ3QqV47xWGVbJ5F+XYozsH1i1yIoPyPU64uVdpd xoGA== X-Gm-Message-State: AOAM533mZ9fR0jYO2K4DRtqLguO/EnlDB+prFINOdbY69Z6Gs4ANmZMz vBmq5usZie+VLWHfNen+eJg2k3+cdSEpog== X-Google-Smtp-Source: ABdhPJzBLiSxzzgkZUam/C9/EMpo9qdT+UyLWnKMk6kCwrTsXOFVSx8yrtqSlzQWyFbnV8oDDH6mew== X-Received: by 2002:adf:9b95:: with SMTP id d21mr23809396wrc.335.1605611665641; Tue, 17 Nov 2020 03:14:25 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a14sm2957630wmj.40.2020.11.17.03.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:14:24 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: dpdk stable Date: Tue, 17 Nov 2020 11:13:36 +0000 Message-Id: <20201117111416.1961049-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'devtools: fix x86-default build test install env' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/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. 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/936f6422d6812938de88b5084140b34e0b6bb314 Thanks. Luca Boccassi --- >From 936f6422d6812938de88b5084140b34e0b6bb314 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 12 Nov 2020 14:38:43 +0100 Subject: [PATCH] devtools: fix x86-default build test install env [ upstream commit 252e92eec4f3ba97884bf9424a607a07729c7c33 ] The x86-default environment was loaded after installing this target. I did not see any problem with it, yet we should load corresponding environment before installing a target. Fixes: bd253daa7717 ("devtools: fix test of ninja install") Signed-off-by: David Marchand --- devtools/test-meson-builds.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 0971fe59c4..8678a3d824 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -135,14 +135,12 @@ done # Test installation of the x86-default target, to be used for checking # the sample apps build using the pkg-config file for cflags and libs +load_env cc build_path=$(readlink -f $builds_dir/build-x86-default) export DESTDIR=$build_path/install-root $ninja_cmd -C $build_path install - -load_env cc pc_file=$(find $DESTDIR -name libdpdk.pc) export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH - # if pkg-config defines the necessary flags, test building some examples if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then export PKGCONF="pkg-config --define-prefix" -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.090520100 +0000 +++ 0002-devtools-fix-x86-default-build-test-install-env.patch 2020-11-17 11:13:12.857115320 +0000 @@ -1 +1 @@ -From 252e92eec4f3ba97884bf9424a607a07729c7c33 Mon Sep 17 00:00:00 2001 +From 936f6422d6812938de88b5084140b34e0b6bb314 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 252e92eec4f3ba97884bf9424a607a07729c7c33 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index f1ef8eaeb6..af750b3f3a 100755 +index 0971fe59c4..8678a3d824 100755 @@ -22 +23 @@ -@@ -255,17 +255,15 @@ done +@@ -135,14 +135,12 @@ done @@ -28,5 +29,2 @@ - export DESTDIR=$build_path/install - # No need to reinstall if ABI checks are enabled - if [ -z "$DPDK_ABI_REF_VERSION" ]; then - install_target $build_path $DESTDIR - fi + export DESTDIR=$build_path/install-root + $ninja_cmd -C $build_path install