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 5B6B8A04DB for ; Tue, 17 Nov 2020 12:14:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 524925916; Tue, 17 Nov 2020 12:14:48 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id E9CB14C90 for ; Tue, 17 Nov 2020 12:14:43 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id l1so22748023wrb.9 for ; Tue, 17 Nov 2020 03:14:43 -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=PW1k7XWPi934qriXv7ikfJ7Pqboeo41ld0MywdilMRQ=; b=ZyQElgAy4PXGIAKUMScfLU88fT2AaY5Xd4iRYjqFj0slhAa6eHWEk0NB/IaE+uB2fT 7JdmKIGWYuxjeHHxYklnPTYLMOsYCnXsA/Uh+LUvr2TU3dkRfqXEYioFmYuf4nMu+MVn KHw8biCwJFU/bLk71r4vvEse7kJoZQlKZtgfnmrEGzX+kCJM9Q4QPVwA/bOGQy0m7kz7 WIlBy9dNbIR/Rm+1T9BeuF8uLXnKCH6lYEElowq6UVG0BLN0+ZolUN1Y0xveinpSvy6I I1FmdZucAdvlzg8kiZNPVlVXrJ0aEFFSX7y3vRWwLJsY4jPY3p1MF1+6yp+2jH/TqxLl ktzQ== 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=PW1k7XWPi934qriXv7ikfJ7Pqboeo41ld0MywdilMRQ=; b=tlIc8AVZmQhsZXNpRc1FuA+PaDf/b4MFywKewQn+shrWxp5xuV4yFHnPaB27Ln9uPT 9wc0uIVLZkE5BcQmf67p0zxqw9rUzwSHQ1VHf8TxjllxuvcDEqSPy2zJi7FslKMlmnge boBhmgs6nsmrFFX1i/uT6Ct+KrvAUAJHncrBmQ4p1tHWA7YhEURnk9Gondtv/6rYGyAL NoG4tCF4Qh7VJR/NlROKz5Mu2eQZVH60M+1MaqvI/CtRo0vG47ltcr2xziiZCRAsDWI4 SRw2XFA001+CjzlQ2Pr9wT7Eehc6t8gygVGHsWLBlTjMHm87UCmm4ni3ez6UZjS+qmLJ e7FA== X-Gm-Message-State: AOAM532dfsUqJBvDxZWrTP3LOXTE3z3ILLUye7/WQdr0senWXVTK/w35 wwte4DH4elOxcxjjfbCCD9Q= X-Google-Smtp-Source: ABdhPJy1BJFUz1nlwXW9bSJOl93XH/5tNzQD6NuflY3EF4FbS2B2S0S5U7lS+m0FXINmdW2f/r5QOg== X-Received: by 2002:a5d:6550:: with SMTP id z16mr24657101wrv.266.1605611683681; Tue, 17 Nov 2020 03:14:43 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o14sm22913440wrw.4.2020.11.17.03.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:14:42 -0800 (PST) From: luca.boccassi@gmail.com To: Nick Connolly Cc: Ranjit Menon , dpdk stable Date: Tue, 17 Nov 2020 11:13:42 +0000 Message-Id: <20201117111416.1961049-8-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 'build: fix install on Windows' 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/ae832279c15934966871ebfda706e73dbb69dbf1 Thanks. Luca Boccassi --- >From ae832279c15934966871ebfda706e73dbb69dbf1 Mon Sep 17 00:00:00 2001 From: Nick Connolly Date: Sat, 31 Oct 2020 06:56:50 +0000 Subject: [PATCH] build: fix install on Windows [ upstream commit 5c7d86948764f9cec832bf3c618e0cceb06ac512 ] Don't run symlink-drivers-solibs.sh as part of 'install' because Windows doesn't support shell scripts. Fixes: 82ba4416dd87 ("build: add module definition files for Windows") Signed-off-by: Nick Connolly Tested-by: Ranjit Menon Acked-by: Ranjit Menon --- config/meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/meson.build b/config/meson.build index 9afd05b95e..fca0461d67 100644 --- a/config/meson.build +++ b/config/meson.build @@ -54,9 +54,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # driver .so files often depend upon the bus drivers for their connect bus, # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need # to be in the library path, so symlink the drivers from the main lib directory. -meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', - get_option('libdir'), - pmd_subdir_opt) +if not is_windows + meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', + get_option('libdir'), + pmd_subdir_opt) +endif # set the machine type and cflags for it if meson.is_cross_build() -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.324166393 +0000 +++ 0008-build-fix-install-on-Windows.patch 2020-11-17 11:13:12.869115562 +0000 @@ -1 +1 @@ -From 5c7d86948764f9cec832bf3c618e0cceb06ac512 Mon Sep 17 00:00:00 2001 +From ae832279c15934966871ebfda706e73dbb69dbf1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5c7d86948764f9cec832bf3c618e0cceb06ac512 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 258b01d068..a29693b883 100644 +index 9afd05b95e..fca0461d67 100644 @@ -23 +24 @@ -@@ -57,9 +57,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) +@@ -54,9 +54,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)