On Mon, Nov 10, 2014 at 09:59:45AM +0000, Sujith Sankar (ssujith) wrote: > Neil, > > If I move the DPDK patch that accommodates ENIC PMD (that is the one that > patches lib/Makefile) to the last in the series, builds between commits > would succeed, wouldn?t it? Moving that to the last is anyway needed. > correct, yes. Neil
> Thanks, > -Sujith > > On 07/11/14 9:16 pm, "Sujith Sankar (ssujith)" <ssujith at cisco.com> wrote: > > >Hi Neil, > > > >Thanks for the comments. I shall work on the modifications that you have > >suggested and get back with V2. > > > >Regards, > >-Sujith > > > >On 07/11/14 5:04 pm, "Neil Horman" <nhorman at tuxdriver.com> wrote: > > > >>On Sat, Nov 08, 2014 at 01:35:43AM +0530, Sujith Sankar wrote: > >>> Signed-off-by: Sujith Sankar <ssujith at cisco.com> > >>> --- > >>> lib/librte_pmd_enic/Makefile | 66 > >>>++++++++++++++++++++++++++++++++++++++++++++ > >>> 1 file changed, 66 insertions(+) > >>> create mode 100644 lib/librte_pmd_enic/Makefile > >>> > >>> diff --git a/lib/librte_pmd_enic/Makefile > >>>b/lib/librte_pmd_enic/Makefile > >>> new file mode 100644 > >>> index 0000000..7605a8f > >>> --- /dev/null > >>> +++ b/lib/librte_pmd_enic/Makefile > >>> @@ -0,0 +1,66 @@ > >>> +# BSD LICENSE > >>> +# > >>> +# Copyright(c) 2010-2013 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. > >>> +# > >>> + > >>> +include $(RTE_SDK)/mk/rte.vars.mk > >>> + > >>> +# > >>> +# library name > >>> +# > >>> +LIB = librte_pmd_enic.a > >>> + > >>> +CFLAGS += -I$(RTE_SDK)/lib/librte_hash/ > >>> +CFLAGS += -O3 -Wno-deprecated > >>> + > >>> +VPATH += $(RTE_SDK)/lib/librte_pmd_enic/src > >>> + > >>> +# > >>> +# all source are stored in SRCS-y > >>> +# > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_cq.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_wq.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_dev.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_intr.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_rq.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_etherdev.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c > >>> +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_rss.c > >>> + > >>> + > >>> +# this lib depends upon: > >>> +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += lib/librte_eal > >>>lib/librte_ether > >>> +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += lib/librte_mempool > >>>lib/librte_mbuf > >>> +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += lib/librte_net > >>>lib/librte_malloc > >>> + > >>> +include $(RTE_SDK)/mk/rte.lib.mk > >>> + > >>> -- > >>> 1.9.1 > >>> > >>> > >> > >>Make this the last patch in your series, and merge it with the chunk from > >>the > >>last patch that adds the enic directory to the lib/Makefile, so that a > >>bisect > >>will build between these commits. > >> > >>Neil > >> > > > >
