lkml.org 
[lkml]   [2016]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 028/126] tools/net: Use include/uapi with __EXPORTED_HEADERS__
    Date
    3.16.7-ckt22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kamal Mostafa <kamal@canonical.com>

    commit d7475de58575c904818efa369c82e88c6648ce2e upstream.

    Use the local uapi headers to keep in sync with "recently" added #define's
    (e.g. SKF_AD_VLAN_TPID). Refactored CFLAGS, and bpf_asm doesn't need -I.

    Fixes: 3f356385e8a4 ("filter: bpf_asm: add minimal bpf asm tool")
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    Acked-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    tools/net/Makefile | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/tools/net/Makefile b/tools/net/Makefile
    index ee577ea03ba5..ddf888010652 100644
    --- a/tools/net/Makefile
    +++ b/tools/net/Makefile
    @@ -4,6 +4,9 @@ CC = gcc
    LEX = flex
    YACC = bison

    +CFLAGS += -Wall -O2
    +CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
    +
    %.yacc.c: %.y
    $(YACC) -o $@ -d $<

    @@ -12,15 +15,13 @@ YACC = bison

    all : bpf_jit_disasm bpf_dbg bpf_asm

    -bpf_jit_disasm : CFLAGS = -Wall -O2 -DPACKAGE='bpf_jit_disasm'
    +bpf_jit_disasm : CFLAGS += -DPACKAGE='bpf_jit_disasm'
    bpf_jit_disasm : LDLIBS = -lopcodes -lbfd -ldl
    bpf_jit_disasm : bpf_jit_disasm.o

    -bpf_dbg : CFLAGS = -Wall -O2
    bpf_dbg : LDLIBS = -lreadline
    bpf_dbg : bpf_dbg.o

    -bpf_asm : CFLAGS = -Wall -O2 -I.
    bpf_asm : LDLIBS =
    bpf_asm : bpf_asm.o bpf_exp.yacc.o bpf_exp.lex.o
    bpf_exp.lex.o : bpf_exp.yacc.c

    \
     
     \ /
      Last update: 2016-01-06 12:21    [W:4.039 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site