[dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11
Kevin Traynor
ktraynor at redhat.com
Tue Oct 6 14:07:37 CEST 2020
Hi,
FYI, your patch has been queued to LTS release 18.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 10/12/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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4a2be43591df63d55d9665389ff41fcba19db85a
Thanks.
Kevin.
---
>From 4a2be43591df63d55d9665389ff41fcba19db85a Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Fri, 27 Mar 2020 02:15:33 +0100
Subject: [PATCH] eal: remove useless makefiles
[ upstream commit 4448a202b61e1a373c647aa4638093d092b3f5de ]
When moving files to the directory kernel/,
the file BSDmakefile.meson was left in eal/.
Also the intermediate makefiles in linuxapp/ and bsdapp/ became useless.
Fixes: acaa9ee991b5 ("move kernel modules directories")
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
MAINTAINERS | 1 -
lib/librte_eal/Makefile | 4 +--
lib/librte_eal/bsdapp/BSDmakefile.meson | 43 -------------------------
lib/librte_eal/bsdapp/Makefile | 8 -----
lib/librte_eal/linuxapp/Makefile | 11 -------
5 files changed, 2 insertions(+), 65 deletions(-)
delete mode 100644 lib/librte_eal/bsdapp/BSDmakefile.meson
delete mode 100644 lib/librte_eal/bsdapp/Makefile
delete mode 100644 lib/librte_eal/linuxapp/Makefile
diff --git a/MAINTAINERS b/MAINTAINERS
index 16c04e8a13..a32d6c3921 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -115,5 +115,4 @@ Meson build
M: Bruce Richardson <bruce.richardson at intel.com>
F: meson.build
-F: lib/librte_eal/bsdapp/BSDmakefile.meson
F: meson_options.txt
F: config/rte_config.h
diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile
index ccd45cb840..fd56a69ba3 100644
--- a/lib/librte_eal/Makefile
+++ b/lib/librte_eal/Makefile
@@ -5,7 +5,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
DIRS-y += common
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp
+DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp/eal
DEPDIRS-linuxapp := common
-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp
+DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp/eal
DEPDIRS-bsdapp := common
diff --git a/lib/librte_eal/bsdapp/BSDmakefile.meson b/lib/librte_eal/bsdapp/BSDmakefile.meson
deleted file mode 100644
index 42f5b2b9d8..0000000000
--- a/lib/librte_eal/bsdapp/BSDmakefile.meson
+++ /dev/null
@@ -1,43 +0,0 @@
-# BSD LICENSE
-#
-# Copyright(c) 2017 Intel Corporation. All rights reserved.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Intel Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-# makefile for building kernel modules using meson
-# takes parameters from the environment
-
-# source file is passed via KMOD_SRC as full path, we only use final
-# component of it, as VPATH is used to find actual file, so as to
-# have the .o files placed in the build, not source directory
-VPATH = ${KMOD_SRC:H}
-SRCS = ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h
-CFLAGS += $(KMOD_CFLAGS)
-
-.include <bsd.kmod.mk>
diff --git a/lib/librte_eal/bsdapp/Makefile b/lib/librte_eal/bsdapp/Makefile
deleted file mode 100644
index 5b06b216aa..0000000000
--- a/lib/librte_eal/bsdapp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_eal/linuxapp/Makefile b/lib/librte_eal/linuxapp/Makefile
deleted file mode 100644
index a0fffa98e8..0000000000
--- a/lib/librte_eal/linuxapp/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal
-DEPDIRS-kni := eal
-
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.subdir.mk
--
2.26.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-10-06 13:03:27.058293583 +0100
+++ 0001-eal-remove-useless-makefiles.patch 2020-10-06 13:03:26.980072558 +0100
@@ -1 +1 @@
-From 4448a202b61e1a373c647aa4638093d092b3f5de Mon Sep 17 00:00:00 2001
+From 4a2be43591df63d55d9665389ff41fcba19db85a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4448a202b61e1a373c647aa4638093d092b3f5de ]
+
@@ -9 +11 @@
-Also the intermediate makefiles in linux/ and freebsd/ became useless.
+Also the intermediate makefiles in linuxapp/ and bsdapp/ became useless.
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -18,9 +19,9 @@
- MAINTAINERS | 1 -
- lib/librte_eal/Makefile | 4 ++--
- lib/librte_eal/freebsd/BSDmakefile.meson | 14 --------------
- lib/librte_eal/freebsd/Makefile | 8 --------
- lib/librte_eal/linux/Makefile | 11 -----------
- 5 files changed, 2 insertions(+), 36 deletions(-)
- delete mode 100644 lib/librte_eal/freebsd/BSDmakefile.meson
- delete mode 100644 lib/librte_eal/freebsd/Makefile
- delete mode 100644 lib/librte_eal/linux/Makefile
+ MAINTAINERS | 1 -
+ lib/librte_eal/Makefile | 4 +--
+ lib/librte_eal/bsdapp/BSDmakefile.meson | 43 -------------------------
+ lib/librte_eal/bsdapp/Makefile | 8 -----
+ lib/librte_eal/linuxapp/Makefile | 11 -------
+ 5 files changed, 2 insertions(+), 65 deletions(-)
+ delete mode 100644 lib/librte_eal/bsdapp/BSDmakefile.meson
+ delete mode 100644 lib/librte_eal/bsdapp/Makefile
+ delete mode 100644 lib/librte_eal/linuxapp/Makefile
@@ -29 +30 @@
-index db235c2ccf..a3f1a53c4e 100644
+index 16c04e8a13..a32d6c3921 100644
@@ -32 +33 @@
-@@ -127,5 +127,4 @@ Meson build
+@@ -115,5 +115,4 @@ Meson build
@@ -35 +36 @@
--F: lib/librte_eal/freebsd/BSDmakefile.meson
+-F: lib/librte_eal/bsdapp/BSDmakefile.meson
@@ -39 +40 @@
-index 86434f5b31..9c383d42bd 100644
+index ccd45cb840..fd56a69ba3 100644
@@ -45,6 +46,6 @@
--DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux
-+DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux/eal
- DEPDIRS-linux := common
--DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd
-+DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd/eal
- DEPDIRS-freebsd := common
+-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp
++DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp/eal
+ DEPDIRS-linuxapp := common
+-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp
++DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp/eal
+ DEPDIRS-bsdapp := common
@@ -52 +53 @@
-diff --git a/lib/librte_eal/freebsd/BSDmakefile.meson b/lib/librte_eal/freebsd/BSDmakefile.meson
+diff --git a/lib/librte_eal/bsdapp/BSDmakefile.meson b/lib/librte_eal/bsdapp/BSDmakefile.meson
@@ -54,2 +55,2 @@
-index 53c4e79c61..0000000000
---- a/lib/librte_eal/freebsd/BSDmakefile.meson
+index 42f5b2b9d8..0000000000
+--- a/lib/librte_eal/bsdapp/BSDmakefile.meson
@@ -57,3 +58,32 @@
-@@ -1,14 +0,0 @@
--# SPDX-License-Identifier: BSD-3-Clause
--# Copyright(c) 2017 Intel Corporation.
+@@ -1,43 +0,0 @@
+-# BSD LICENSE
+-#
+-# Copyright(c) 2017 Intel Corporation. All rights reserved.
+-# All rights reserved.
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# * Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# * Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in
+-# the documentation and/or other materials provided with the
+-# distribution.
+-# * Neither the name of Intel Corporation nor the names of its
+-# contributors may be used to endorse or promote products derived
+-# from this software without specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#
@@ -72 +102 @@
-diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile
+diff --git a/lib/librte_eal/bsdapp/Makefile b/lib/librte_eal/bsdapp/Makefile
@@ -74,2 +104,2 @@
-index fc42058b6b..0000000000
---- a/lib/librte_eal/freebsd/Makefile
+index 5b06b216aa..0000000000
+--- a/lib/librte_eal/bsdapp/Makefile
@@ -83 +113 @@
--DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal
+-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal
@@ -86 +116 @@
-diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile
+diff --git a/lib/librte_eal/linuxapp/Makefile b/lib/librte_eal/linuxapp/Makefile
@@ -88,2 +118,2 @@
-index 4c68bd61b8..0000000000
---- a/lib/librte_eal/linux/Makefile
+index a0fffa98e8..0000000000
+--- a/lib/librte_eal/linuxapp/Makefile
@@ -97 +127 @@
--DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal
+-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal
More information about the stable
mailing list