From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 113281B48B for ; Fri, 4 Jan 2019 14:26:10 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 68B366380D; Fri, 4 Jan 2019 13:26:09 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1A3B5C1A1; Fri, 4 Jan 2019 13:26:05 +0000 (UTC) From: Kevin Traynor To: Timothy Redaelli Cc: Luca Boccassi , dpdk stable Date: Fri, 4 Jan 2019 13:23:44 +0000 Message-Id: <20190104132455.15170-2-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 04 Jan 2019 13:26:09 +0000 (UTC) Subject: [dpdk-stable] patch 'mk: do not install meson.build in usertools' has been queued to LTS release 18.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: , X-List-Received-Date: Fri, 04 Jan 2019 13:26:10 -0000 Hi, FYI, your patch has been queued to LTS release 18.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 01/11/19. 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. Kevin Traynor --- >>From cf96e8c18c0ae6560b910a56c095f1e1d92cf55c Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 27 Nov 2018 20:35:32 +0100 Subject: [PATCH] mk: do not install meson.build in usertools [ upstream commit d80a21eb720b009da224c8a97879a00360b3066b ] In commit 7dd34c71de2a ("usertools: install with meson") meson.build was added in usertools directory and so it's copied to $(datadir)/usertools with "make install". This patch avoids to copy meson.build when installing usertools with "make install". Fixes: 7dd34c71de2a ("usertools: install with meson") Signed-off-by: Timothy Redaelli Acked-by: Luca Boccassi --- mk/rte.sdkinstall.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 8296e6dbd..2d34b4e5a 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -100,6 +100,7 @@ install-runtime: --exclude app/testacl --exclude app/testpipeline app | \ tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/usertools $(DESTDIR)$(datadir) + $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools) + $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build usertools | \ + tar -xf - -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS) $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:07.511732554 +0000 +++ 0002-mk-do-not-install-meson.build-in-usertools.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,8 +1,10 @@ -From d80a21eb720b009da224c8a97879a00360b3066b Mon Sep 17 00:00:00 2001 +From cf96e8c18c0ae6560b910a56c095f1e1d92cf55c Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 27 Nov 2018 20:35:32 +0100 Subject: [PATCH] mk: do not install meson.build in usertools +[ upstream commit d80a21eb720b009da224c8a97879a00360b3066b ] + In commit 7dd34c71de2a ("usertools: install with meson") meson.build was added in usertools directory and so it's copied to $(datadir)/usertools with "make install". @@ -11,7 +13,6 @@ "make install". Fixes: 7dd34c71de2a ("usertools: install with meson") -Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Acked-by: Luca Boccassi