From patchwork Mon Mar 21 17:49:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkatesh Vivekanandan X-Patchwork-Id: 64131 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1550897lbc; Mon, 21 Mar 2016 10:51:58 -0700 (PDT) X-Received: by 10.107.8.232 with SMTP id h101mr30231625ioi.93.1458582718245; Mon, 21 Mar 2016 10:51:58 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n6si11196263igk.95.2016.03.21.10.51.57; Mon, 21 Mar 2016 10:51:58 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6462061845; Mon, 21 Mar 2016 17:51:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E1A216185A; Mon, 21 Mar 2016 17:50:12 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A397D6193B; Mon, 21 Mar 2016 17:49:58 +0000 (UTC) Received: from mail-gw1-out.broadcom.com (mail-gw1-out.broadcom.com [216.31.210.62]) by lists.linaro.org (Postfix) with ESMTP id 6274161818 for ; Mon, 21 Mar 2016 17:49:54 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.24,372,1455004800"; d="scan'208";a="90912817" Received: from mail-irv-18.broadcom.com ([10.15.198.37]) by mail-gw1-out.broadcom.com with ESMTP; 21 Mar 2016 11:15:48 -0700 Received: from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com [10.11.16.103]) by mail-irv-18.broadcom.com (Postfix) with ESMTP id F15D782027; Mon, 21 Mar 2016 10:49:53 -0700 (PDT) Received: from apslabuser-PowerEdge-T610.ban.broadcom.com (unknown [10.131.60.56]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 7D8FB40FE6; Mon, 21 Mar 2016 10:49:27 -0700 (PDT) From: venkatesh.vivekanandan@linaro.org To: lng-odp@lists.linaro.org Date: Mon, 21 Mar 2016 23:19:50 +0530 Message-Id: <1458582590-21869-1-git-send-email-venkatesh.vivekanandan@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH v4 5/6] linux-generic: odp-ipfw: uipfw stub changes X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Venkatesh Vivekanandan Signed-off-by: Venkatesh Vivekanandan --- example/ipfw/Makefile.am | 68 +++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/example/ipfw/Makefile.am b/example/ipfw/Makefile.am index a37d00b..c1dcf34 100644 --- a/example/ipfw/Makefile.am +++ b/example/ipfw/Makefile.am @@ -1,6 +1,6 @@ -OBJDIR=objs +OBJDIR=objs/include_e # ipfw and uipfw are built in subdirs -INCDIRS = -I ./$(OBJDIR)/include_e -DEMULATE_SYSCTL +INCDIRS = -I ./$(OBJDIR) -DEMULATE_SYSCTL INCDIRS += -I ./sys -I ./extra/sys -I ./extra/sys/contrib/pf -I../../include # ODP specific start INCDIRS += -I$(top_srcdir)/test \ @@ -9,22 +9,33 @@ INCDIRS += -I$(top_srcdir)/test \ -I$(top_srcdir)/helper/include # ODP specific end +# directories ./objs ./objs/include_e ./objs/include_e/sys are already +# created by example/ipfw/ipfw/Makefile.am +EDIR = $(OBJDIR)/machine $(OBJDIR)/netinet $(OBJDIR)/net $(OBJDIR)/linux +EDIR += $(OBJDIR)/altq $(OBJDIR)/netpfil/pf $(OBJDIR)/netinet6 $(OBJDIR)/vm -OBJPATH = ./$(OBJDIR) - -# EFILES* are the dummy files created to avoid compilation errors. -# Please refer Makefile.kipfw available at -# https://github.com/luigirizzo/netmap-ipfw.git - -#EFILES_. = libutil.h -#EFILES_sys = condvar.h priv.h _lock.h cpuset.h -#EFILES_sys += lock.h ucred.h # taskqueue.h -#EFILES_sys += sockio.h -#EFILES_sys += cpuset.h -#EFILES_machine = in_cksum.h -#EFILES_netinet = in_pcb.h ip_carp.h pim.h sctp.h tcp_var.h -#EFILES_net = if_types.h bpf.h netisr.h vnet.h -#EFILES_linux = module.h +# entries to create empty files +EFILES = opt_inet.h opt_ipsec.h opt_ipdivert.h opt_inet6.h opt_ipfw.h +EFILES += opt_mpath.h opt_mbuf_stress_test.h opt_param.h +EFILES += sys/condvar.h sys/priv.h sys/_lock.h sys/cpuset.h sys/lock.h +EFILES += sys/ucred.h sys/proc.h sys/sockopt.h sys/sysctl.h sys/mutex.h +EFILES += sys/_mutex.h sys/_rwlock.h sys/rwlock.h sys/eventhandler.h +EFILES += sys/jail.h sys/ktr.h sys/rmlock.h sys/counter.h +EFILES += machine/in_cksum.h +EFILES += netinet/in_pcb.h netinet/ip_carp.h netinet/pim.h netinet/sctp.h +EFILES += netinet/tcp_var.h netinet/in_var.h netinet/ip_var.h +EFILES += netinet/udp_var.h +EFILES += net/if_types.h net/bpf.h net/netisr.h net/vnet.h +EFILES += net/if_var.h net/route.h net/if_clone.h +EFILES += linux/module.h +EFILES += altq/if_altq.h +EFILES += netpfil/pf/pf_mtag.h +EFILES += netinet6/ip6_var.h +EFILES += vm/vm.h vm/vm_extern.h + +include_e$(EXEEXT): + for i in $(EDIR); do mkdir -p $$i; done + for i in $(EFILES); do touch $(OBJDIR)/$$i; done E_CFLAGS = $(INCDIRS) E_CFLAGS += -include ./extra/glue.h # headers @@ -77,33 +88,12 @@ IPFW_SRCS += extra/ipfw2_mod.c # bsd_compat.c IPFW_SRCS += extra/missing.c extra/session.c -# entries to create empty files -#EFILES_. += opt_inet.h opt_ipsec.h opt_ipdivert.h -#EFILES_. += opt_inet6.h opt_ipfw.h opt_mpath.h -#EFILES_. += opt_mbuf_stress_test.h opt_param.h -#EFILES_. += timeconv.h - -#EFILES_altq += if_altq.h - -#EFILES_net += if_var.h route.h if_clone.h -#EFILES_netpfil/pf += pf_mtag.h -#EFILES_netinet += in_var.h ip_var.h udp_var.h -#EFILES_netinet6 += ip6_var.h -#EFILES_sys += proc.h sockopt.h sysctl.h -# new -#EFILES_sys += mutex.h _mutex.h _rwlock.h rwlock.h -#EFILES_sys += eventhandler.h -#EFILES_sys += jail.h ktr.h rmlock.h -#EFILES_sys += counter.h - -#EFILES_vm += vm.h vm_extern.h - AM_CFLAGS = $(E_CFLAGS) AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH) AM_LDFLAGS += ../../lib/.libs/libodp.a ../../lib/.libs/libodphelper.a -lpthread -bin_PROGRAMS = odp_uipfw$(EXEEXT) +bin_PROGRAMS = include_e$(EXEEXT) odp_uipfw$(EXEEXT) odp_uipfw_LDFLAGS = $(AM_LDFLAGS) -static odp_uipfw_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example