Skip to content

Commit

Permalink
Merge tag 'v4.9.0'
Browse files Browse the repository at this point in the history
v4.9.0

Signed-off-by: Christoph Paasch <[email protected]>
  • Loading branch information
cpaasch committed Nov 2, 2017
2 parents 01718f4 + ae0969c commit fcddcf7
Show file tree
Hide file tree
Showing 331 changed files with 24,867 additions and 6,493 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Config
# cscope
cscope.*
ncscope.*
tags
TAGS

# git files that we don't want to ignore even it they are dot-files
Expand Down Expand Up @@ -44,3 +45,4 @@ doc/*.ps
doc/*.dvi
doc/*.html
doc/*.pdf
doc/*.out
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
ifndef VERBOSE
MAKEFLAGS += --no-print-directory
endif

PREFIX?=/usr
LIBDIR?=$(PREFIX)/lib
SBINDIR?=/sbin
Expand All @@ -7,6 +11,7 @@ DOCDIR?=$(DATADIR)/doc/iproute2
MANDIR?=$(DATADIR)/man
ARPDDIR?=/var/lib/arpd
KERNEL_INCLUDE?=/usr/include
BASH_COMPDIR?=$(DATADIR)/bash-completion/completions

# Path to db_185.h include
DBM_INCLUDE:=$(DESTDIR)/usr/include
Expand All @@ -29,8 +34,8 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
#options for mpls
ADDLIB+=mpls_ntop.o mpls_pton.o

CC = gcc
HOSTCC = gcc
CC := gcc
HOSTCC ?= $(CC)
DEFINES += -D_GNU_SOURCE
# Turn on transparent support for LFS
DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
Expand All @@ -41,15 +46,15 @@ WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
YACCFLAGS = -d -t -v

SUBDIRS=lib ip tc bridge misc netem genl tipc man
SUBDIRS=lib ip tc bridge misc netem genl tipc devlink man

LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
LDLIBS += $(LIBNETLINK)

all: Config
@set -e; \
for i in $(SUBDIRS); \
do $(MAKE) $(MFLAGS) -C $$i; done
do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done

Config:
sh configure $(KERNEL_INCLUDE)
Expand All @@ -66,6 +71,8 @@ install: all
$(DESTDIR)$(DOCDIR)/examples/diffserv
@for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
install -m 0755 -d $(DESTDIR)$(BASH_COMPDIR)
install -m 0644 bash-completion/tc $(DESTDIR)$(BASH_COMPDIR)

snapshot:
echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
Expand Down
Loading

0 comments on commit fcddcf7

Please sign in to comment.