diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-10-09 19:49:55 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-10-15 09:43:09 +0200 |
| commit | e1147bb48ffdbf652ff78ae2f856191c63f5f37b (patch) | |
| tree | bf3cec83cf4b4cf28cd528292e620a23aed29766 /rules | |
| parent | 7bdd4ab18c57525121cfa049713d68b4a1ef4214 (diff) | |
| download | ptxdist-e1147bb48ffdbf652ff78ae2f856191c63f5f37b.tar.gz ptxdist-e1147bb48ffdbf652ff78ae2f856191c63f5f37b.tar.xz | |
iproute2: version bump 3.18.0 -> 4.2.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/iproute2.in | 1 | ||||
| -rw-r--r-- | rules/iproute2.make | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/rules/iproute2.in b/rules/iproute2.in index 5c7112742..dadad038d 100644 --- a/rules/iproute2.in +++ b/rules/iproute2.in @@ -9,6 +9,7 @@ menuconfig IPROUTE2 select LIBC_RESOLV select LIBC_PTHREAD if IPROUTE2_ARPD select GCCLIBS_GCC_S if IPROUTE2_IP || IPROUTE2_TC + select LIBSELINUX if GLOBAL_SELINUX help Networking and traffic control tools diff --git a/rules/iproute2.make b/rules/iproute2.make index 0e7dd92ca..f7324b461 100644 --- a/rules/iproute2.make +++ b/rules/iproute2.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 # # Paths and names # -IPROUTE2_VERSION := 3.18.0 -IPROUTE2_MD5 := 6f6ad51a00007880460e103367b16057 +IPROUTE2_VERSION := 4.2.0 +IPROUTE2_MD5 := 51c54cc3245eff451154938fbc0f64f5 IPROUTE2 := iproute2-$(IPROUTE2_VERSION) IPROUTE2_SUFFIX := tar.xz IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX)) @@ -40,13 +40,18 @@ $(STATEDIR)/iproute2.prepare: @echo 'TC_CONFIG_ATM:=n' >> $(IPROUTE2_DIR)/Config @echo 'TC_CONFIG_XT:=n' >> $(IPROUTE2_DIR)/Config @echo 'IPT_LIB_DIR:=/usr/lib' >> $(IPROUTE2_DIR)/Config + @echo 'TC_CONFIG_ELF:=n' >> $(IPROUTE2_DIR)/Config +ifndef PTXCONF_GLOBAL_SELINUX + @echo 'HAVE_SELINUX:=n' >> $(IPROUTE2_DIR)/Config +endif + @echo 'HAVE_MNL:=n' >> $(IPROUTE2_DIR)/Config ifdef PTXCONF_IPROUTE2_ARPD @echo BUILD_ARPD=y >> $(IPROUTE2_DIR)/Config endif @$(call touch) IPROUTE2_MAKE_OPT := \ - ROOTDIR=$(SYSROOT) \ + DESTDIR=$(SYSROOT) \ LDFLAGS='-rdynamic' \ WFLAGS="-Wall" |