summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-03-06 16:22:42 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-12 23:05:06 +0100
commit218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf (patch)
tree00b4b284261f43298e1ecf4249980bda614f4b20 /mk
parentae2f2fee247ad0f80f5a122fd174fa16cddd5438 (diff)
downloaddpdk-next-eventdev-218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf.zip
dpdk-next-eventdev-218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf.tar.gz
dpdk-next-eventdev-218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf.tar.xz
mk: use linux and freebsd in config names
Rather than using linuxapp and bsdapp everywhere, we can change things to use the, more readable, terms "linux" and "freebsd" in our build configs. Rather than renaming the configs we can just duplicate the existing ones with the new names using symlinks, and use the new names exclusively internally. ["make showconfigs" also only shows the new names to keep the list short] The result is that backward compatibility is kept fully but any new builds or development can be done using the newer names, i.e. both "make config T=x86_64-native-linuxapp-gcc" and "T=x86_64-native-linux-gcc" work. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'mk')
l---------mk/exec-env/bsdapp1
-rw-r--r--mk/exec-env/freebsd/rte.app.mk (renamed from mk/exec-env/bsdapp/rte.app.mk)0
-rw-r--r--mk/exec-env/freebsd/rte.vars.mk (renamed from mk/exec-env/bsdapp/rte.vars.mk)2
-rw-r--r--mk/exec-env/linux/rte.app.mk (renamed from mk/exec-env/linuxapp/rte.app.mk)0
-rw-r--r--mk/exec-env/linux/rte.vars.mk (renamed from mk/exec-env/linuxapp/rte.vars.mk)2
l---------mk/exec-env/linuxapp1
-rw-r--r--mk/rte.sdkconfig.mk9
-rw-r--r--mk/rte.sdkinstall.mk3
-rw-r--r--mk/rte.sdkroot.mk2
9 files changed, 13 insertions, 7 deletions
diff --git a/mk/exec-env/bsdapp b/mk/exec-env/bsdapp
new file mode 120000
index 0000000..69f5cba
--- /dev/null
+++ b/mk/exec-env/bsdapp
@@ -0,0 +1 @@
+freebsd/ \ No newline at end of file
diff --git a/mk/exec-env/bsdapp/rte.app.mk b/mk/exec-env/freebsd/rte.app.mk
index a2af726..a2af726 100644
--- a/mk/exec-env/bsdapp/rte.app.mk
+++ b/mk/exec-env/freebsd/rte.app.mk
diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk
index cec0884..c6be560 100644
--- a/mk/exec-env/bsdapp/rte.vars.mk
+++ b/mk/exec-env/freebsd/rte.vars.mk
@@ -9,7 +9,7 @@
# - define EXECENV_ASFLAGS variable (overridden by cmdline)
# - may override any previously defined variable
#
-# examples for RTE_EXEC_ENV: linuxapp, bsdapp
+# examples for RTE_EXEC_ENV: linux, freebsd
#
ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
EXECENV_CFLAGS = -pthread -fPIC
diff --git a/mk/exec-env/linuxapp/rte.app.mk b/mk/exec-env/linux/rte.app.mk
index a2af726..a2af726 100644
--- a/mk/exec-env/linuxapp/rte.app.mk
+++ b/mk/exec-env/linux/rte.app.mk
diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk
index 57ee821..d04d0e2 100644
--- a/mk/exec-env/linuxapp/rte.vars.mk
+++ b/mk/exec-env/linux/rte.vars.mk
@@ -9,7 +9,7 @@
# - define EXECENV_ASFLAGS variable (overridden by cmdline)
# - may override any previously defined variable
#
-# examples for RTE_EXEC_ENV: linuxapp, bsdapp
+# examples for RTE_EXEC_ENV: linux, freebsd
#
ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
EXECENV_CFLAGS = -pthread -fPIC
diff --git a/mk/exec-env/linuxapp b/mk/exec-env/linuxapp
new file mode 120000
index 0000000..ce5e2c7
--- /dev/null
+++ b/mk/exec-env/linuxapp
@@ -0,0 +1 @@
+linux/ \ No newline at end of file
diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index fa77331..c79bec1 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -21,9 +21,10 @@ showversionum:
$(RTE_SRCDIR)/lib/librte_eal/common/include/rte_version.h); \
printf '%02d%02d\n' "$$1" "$$2"
-INSTALL_CONFIGS := $(sort $(filter-out %~,\
+INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\
+ $(filter-out %app-gcc,$(filter-out %~,\
$(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\
- $(wildcard $(RTE_SRCDIR)/config/defconfig_*))))
+ $(wildcard $(RTE_SRCDIR)/config/defconfig_*)))))))
INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS))
.PHONY: showconfigs
@@ -53,9 +54,9 @@ defconfig:
)-$(shell \
uname | awk '{ \
if ($$0 == "Linux") { \
- print "linuxapp"} \
+ print "linux"} \
else { \
- print "bsdapp"} }' \
+ print "freebsd"} }' \
)-$(shell \
${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \
'{ \
diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 2d34b4e..5c4215c 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -24,6 +24,9 @@ export prefix ?=
kerneldir ?= $(prefix)/kmod
else
ifeq ($(RTE_EXEC_ENV),linuxapp)
+RTE_EXEC_ENV=linux
+endif
+ifeq ($(RTE_EXEC_ENV),linux)
kerneldir ?= /lib/modules/$(shell uname -r)/extra/dpdk
else
kerneldir ?= /boot/modules
diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
index d91583a..4043a9d 100644
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -28,7 +28,7 @@ export BUILDING_RTE_SDK
#
# We can specify the configuration template when doing the "make
-# config". For instance: make config T=x86_64-native-linuxapp-gcc
+# config". For instance: make config T=x86_64-native-linux-gcc
#
RTE_CONFIG_TEMPLATE :=
ifdef T