From 4ec6960aec264172ac22f89c31ec4b43234bb264 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 15 Dec 2016 22:46:47 +0100 Subject: [PATCH] scripts: move to buildtools There is already a directory buildtools for pmdinfogen used by the build system. The scripts used in makefiles are moved here. Signed-off-by: Thomas Monjalon Tested-by: Ferruh Yigit --- MAINTAINERS | 10 +++++----- {scripts => buildtools}/auto-config-h.sh | 0 {scripts => buildtools}/depdirs-rule.sh | 0 {scripts => buildtools}/gen-build-mk.sh | 0 {scripts => buildtools}/gen-config-h.sh | 0 {scripts => buildtools}/relpath.sh | 0 doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- drivers/net/mlx4/Makefile | 2 +- drivers/net/mlx5/Makefile | 2 +- mk/internal/rte.depdirs-post.mk | 2 +- mk/internal/rte.install-post.mk | 2 +- mk/rte.sdkbuild.mk | 2 +- mk/rte.sdkconfig.mk | 8 ++++---- mk/rte.sdkinstall.mk | 4 ++-- pkg/dpdk.spec | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) rename {scripts => buildtools}/auto-config-h.sh (100%) rename {scripts => buildtools}/depdirs-rule.sh (100%) rename {scripts => buildtools}/gen-build-mk.sh (100%) rename {scripts => buildtools}/gen-config-h.sh (100%) rename {scripts => buildtools}/relpath.sh (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ebc97b8d25..2e3d7211de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -56,11 +56,11 @@ F: Makefile F: config/ F: mk/ F: pkg/ -F: scripts/auto-config-h.sh -F: scripts/depdirs-rule.sh -F: scripts/gen-build-mk.sh -F: scripts/gen-config-h.sh -F: scripts/relpath.sh +F: buildtools/auto-config-h.sh +F: buildtools/depdirs-rule.sh +F: buildtools/gen-build-mk.sh +F: buildtools/gen-config-h.sh +F: buildtools/relpath.sh F: doc/build-sdk-quick.txt F: doc/guides/prog_guide/build_app.rst F: doc/guides/prog_guide/dev_kit_* diff --git a/scripts/auto-config-h.sh b/buildtools/auto-config-h.sh similarity index 100% rename from scripts/auto-config-h.sh rename to buildtools/auto-config-h.sh diff --git a/scripts/depdirs-rule.sh b/buildtools/depdirs-rule.sh similarity index 100% rename from scripts/depdirs-rule.sh rename to buildtools/depdirs-rule.sh diff --git a/scripts/gen-build-mk.sh b/buildtools/gen-build-mk.sh similarity index 100% rename from scripts/gen-build-mk.sh rename to buildtools/gen-build-mk.sh diff --git a/scripts/gen-config-h.sh b/buildtools/gen-config-h.sh similarity index 100% rename from scripts/gen-config-h.sh rename to buildtools/gen-config-h.sh diff --git a/scripts/relpath.sh b/buildtools/relpath.sh similarity index 100% rename from scripts/relpath.sh rename to buildtools/relpath.sh diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index 24a9f879df..8bd9b6a1ce 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -119,7 +119,7 @@ The DPDK is composed of several directories: * examples: Source code of DPDK applications -* config, tools, scripts, mk: Framework-related makefiles, scripts and configuration +* config, buildtools, mk: Framework-related makefiles, scripts and configuration Installation of the DPDK Target Environments -------------------------------------------- diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index efed953e73..68c5902314 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -102,7 +102,7 @@ endif mlx4_autoconf.h.new: FORCE -mlx4_autoconf.h.new: $(RTE_SDK)/scripts/auto-config-h.sh +mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q $(RM) -f -- '$@' $Q sh -- '$<' '$@' \ RSS_SUPPORT \ diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index cf87f0b1af..18d7c00b90 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -104,7 +104,7 @@ endif mlx5_autoconf.h.new: FORCE -mlx5_autoconf.h.new: $(RTE_SDK)/scripts/auto-config-h.sh +mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q $(RM) -f -- '$@' $Q sh -- '$<' '$@' \ HAVE_VERBS_IBV_EXP_CQ_COMPRESSED_CQE \ diff --git a/mk/internal/rte.depdirs-post.mk b/mk/internal/rte.depdirs-post.mk index fc6904dd88..102a369df7 100644 --- a/mk/internal/rte.depdirs-post.mk +++ b/mk/internal/rte.depdirs-post.mk @@ -32,7 +32,7 @@ .PHONY: depdirs depdirs: @for d in $(DEPDIRS-y); do \ - $(RTE_SDK)/scripts/depdirs-rule.sh $(S) $$d ; \ + $(RTE_SDK)/buildtools/depdirs-rule.sh $(S) $$d ; \ done .PHONY: depgraph diff --git a/mk/internal/rte.install-post.mk b/mk/internal/rte.install-post.mk index 77addee23f..b99e2b2f77 100644 --- a/mk/internal/rte.install-post.mk +++ b/mk/internal/rte.install-post.mk @@ -59,7 +59,7 @@ define symlink_rule $(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) @echo " SYMLINK-FILE $(addprefix $(1)/,$(notdir $(2)))" @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)ln -nsf `$(RTE_SDK)/scripts/relpath.sh $$(<) $(RTE_OUTPUT)/$(1)` \ + $(Q)ln -nsf `$(RTE_SDK)/buildtools/relpath.sh $$(<) $(RTE_OUTPUT)/$(1)` \ $(RTE_OUTPUT)/$(1) endef diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk index 23fcf1e1e3..db6b98326a 100644 --- a/mk/rte.sdkbuild.mk +++ b/mk/rte.sdkbuild.mk @@ -67,7 +67,7 @@ clean: $(CLEANDIRS) $(RTE_OUTPUT)/lib \ $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod @[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include - @$(RTE_SDK)/scripts/gen-config-h.sh $(RTE_OUTPUT)/.config \ + @$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ > $(RTE_OUTPUT)/include/rte_config.h $(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean @echo Clean complete diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index 5c94edf834..97581c9076 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -107,12 +107,12 @@ endif # generate a Makefile for this build directory # use a relative path so it will continue to work even if we move the directory -SDK_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_SRCDIR)) \ +SDK_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_SRCDIR)) \ $(abspath $(RTE_OUTPUT))) -OUTPUT_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_OUTPUT)) \ +OUTPUT_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_OUTPUT)) \ $(abspath $(RTE_SRCDIR))) $(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT) - $(Q)$(RTE_SDK)/scripts/gen-build-mk.sh $(SDK_RELPATH) $(OUTPUT_RELPATH) \ + $(Q)$(RTE_SDK)/buildtools/gen-build-mk.sh $(SDK_RELPATH) $(OUTPUT_RELPATH) \ > $(RTE_OUTPUT)/Makefile # clean installed files, and generate a new config header file @@ -122,7 +122,7 @@ $(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config $(RTE_OUTPUT)/lib \ $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build $(Q)mkdir -p $(RTE_OUTPUT)/include - $(Q)$(RTE_SDK)/scripts/gen-config-h.sh $(RTE_OUTPUT)/.config \ + $(Q)$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ > $(RTE_OUTPUT)/include/rte_config.h # generate the rte_config.h diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 7b0d8b5211..896bc14605 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -77,7 +77,7 @@ rte_mkdir = test -d $1 || mkdir -p $1 # Create the relative symbolic link $2 -> $1 # May be replaced with --relative option of ln from coreutils-8.16 -rte_symlink = ln -snf $$($(RTE_SDK)/scripts/relpath.sh $1 $(dir $2)) $2 +rte_symlink = ln -snf $$($(RTE_SDK)/buildtools/relpath.sh $1 $(dir $2)) $2 .PHONY: pre_install pre_install: @@ -156,7 +156,7 @@ install-sdk: --keep-newer-files $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) + $(Q)cp -a $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) $(Q)cp -a $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app diff --git a/pkg/dpdk.spec b/pkg/dpdk.spec index ba2a476267..d12509a593 100644 --- a/pkg/dpdk.spec +++ b/pkg/dpdk.spec @@ -103,7 +103,7 @@ make install O=%{target} DESTDIR=%{buildroot} \ %files devel %{_includedir}/dpdk %{_datadir}/dpdk/mk -%{_datadir}/dpdk/scripts +%{_datadir}/dpdk/buildtools %{_datadir}/dpdk/%{target} %{_datadir}/dpdk/examples -- 2.20.1