[dpdk-dev,04/11] mk: remove traces of hostapp build directory
Commit Message
The recipe rte.hostapp.mk does not build in hostapp/ anymore.
Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility")
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
doc/guides/freebsd_gsg/build_dpdk.rst | 2 +-
doc/guides/linux_gsg/build_dpdk.rst | 2 +-
mk/rte.sdkbuild.mk | 5 ++---
mk/rte.sdkconfig.mk | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
Comments
On Thu, Jul 07, 2016 at 05:36:23PM +0200, Thomas Monjalon wrote:
> The recipe rte.hostapp.mk does not build in hostapp/ anymore.
>
> Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility")
>
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> ---
> doc/guides/freebsd_gsg/build_dpdk.rst | 2 +-
> doc/guides/linux_gsg/build_dpdk.rst | 2 +-
> mk/rte.sdkbuild.mk | 5 ++---
> mk/rte.sdkconfig.mk | 2 +-
> 4 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst
> index 1d92c08..93c4366 100644
> --- a/doc/guides/freebsd_gsg/build_dpdk.rst
> +++ b/doc/guides/freebsd_gsg/build_dpdk.rst
> @@ -183,7 +183,7 @@ contains the kernel modules to install:
>
> ls x86_64-native-bsdapp-gcc
>
> - app build hostapp include kmod lib Makefile
> + app build include kmod lib Makefile
>
>
> .. _loading_contigmem:
> diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst
> index 198c0b6..fb2c481 100644
> --- a/doc/guides/linux_gsg/build_dpdk.rst
> +++ b/doc/guides/linux_gsg/build_dpdk.rst
> @@ -152,7 +152,7 @@ A kmod directory is also present that contains kernel modules which may be load
>
> ls x86_64-native-linuxapp-gcc
>
> - app build hostapp include kmod lib Makefile
> + app build include kmod lib Makefile
>
> Loading Modules to Enable Userspace IO for DPDK
> -----------------------------------------------
> diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk
> index 354f006..23fcf1e 100644
> --- a/mk/rte.sdkbuild.mk
> +++ b/mk/rte.sdkbuild.mk
> @@ -64,9 +64,8 @@ build: $(ROOTDIRS-y)
> .PHONY: clean
> clean: $(CLEANDIRS)
> @rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
> - $(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
> - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod \
> - $(RTE_OUTPUT)/buildtools
> + $(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_OUTPUT)/include/rte_config.h
> diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
> index a3acfe6..068d787 100644
> --- a/mk/rte.sdkconfig.mk
> +++ b/mk/rte.sdkconfig.mk
> @@ -108,7 +108,7 @@ $(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT)
> # if NODOTCONF variable is defined, don't try to rebuild .config
> $(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config
> $(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
> - $(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
> + $(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 \
> --
> 2.7.0
>
>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
@@ -183,7 +183,7 @@ contains the kernel modules to install:
ls x86_64-native-bsdapp-gcc
- app build hostapp include kmod lib Makefile
+ app build include kmod lib Makefile
.. _loading_contigmem:
@@ -152,7 +152,7 @@ A kmod directory is also present that contains kernel modules which may be load
ls x86_64-native-linuxapp-gcc
- app build hostapp include kmod lib Makefile
+ app build include kmod lib Makefile
Loading Modules to Enable Userspace IO for DPDK
-----------------------------------------------
@@ -64,9 +64,8 @@ build: $(ROOTDIRS-y)
.PHONY: clean
clean: $(CLEANDIRS)
@rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
- $(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
- $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod \
- $(RTE_OUTPUT)/buildtools
+ $(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_OUTPUT)/include/rte_config.h
@@ -108,7 +108,7 @@ $(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT)
# if NODOTCONF variable is defined, don't try to rebuild .config
$(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config
$(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
- $(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
+ $(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 \