projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
branding: add LEDE branding
[openwrt/staging/mkresin.git]
/
package
/
network
/
utils
/
iproute2
/
Makefile
diff --git
a/package/network/utils/iproute2/Makefile
b/package/network/utils/iproute2/Makefile
index 308ec578e12292b80865f09565631d56be22ab1c..89fb2e62e537912c88240a996b909d5760f225c4 100644
(file)
--- a/
package/network/utils/iproute2/Makefile
+++ b/
package/network/utils/iproute2/Makefile
@@
-8,12
+8,12
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2
include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2
-PKG_VERSION:=4.
0
.0
+PKG_VERSION:=4.
4
.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/
-PKG_MD5SUM:=
3adc263ade4ee76c35032e8f50b54108
+PKG_MD5SUM:=
d762653ec3e1ab0d4a9689e169ca184f
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0
@@
-39,14
+39,6
@@
endef
Package/ip-full=$(call Package/iproute2/Default,full,Full)
Package/ip-full=$(call Package/iproute2/Default,full,Full)
-define Package/ip/conffiles
-/etc/iproute2/rt_tables
-endef
-
-define Package/ip-$(BUILD_VARIANT)/conffiles
-$(Package/ip/conffiles)
-endef
-
define Package/tc
$(call Package/iproute2/Default)
TITLE:=Traffic control utility
define Package/tc
$(call Package/iproute2/Default)
TITLE:=Traffic control utility
@@
-78,24
+70,18
@@
define Build/Configure
$(PKG_BUILD_DIR)/Makefile
$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
$(PKG_BUILD_DIR)/Makefile
$(PKG_BUILD_DIR)/Makefile
$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
$(PKG_BUILD_DIR)/Makefile
- echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-
openwrt
\";" \
+ echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-
lede
\";" \
> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
endef
> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
endef
-ifdef CONFIG_USE_GLIBC
- TARGET_CFLAGS += -DHAVE_SETNS
-endif
-ifdef CONFIG_USE_MUSL
- TARGET_CFLAGS += -DHAVE_SETNS
-endif
-
+TARGET_CFLAGS += -DHAVE_SETNS
TARGET_CFLAGS += -ffunction-sections -fdata-sections
MAKE_FLAGS += \
EXTRA_CCOPTS="$(TARGET_CFLAGS) -I../include -I$(STAGING_DIR)/usr/include/libnl-tiny" \
KERNEL_INCLUDE="$(LINUX_DIR)/include" \
SHARED_LIBS="" \
TARGET_CFLAGS += -ffunction-sections -fdata-sections
MAKE_FLAGS += \
EXTRA_CCOPTS="$(TARGET_CFLAGS) -I../include -I$(STAGING_DIR)/usr/include/libnl-tiny" \
KERNEL_INCLUDE="$(LINUX_DIR)/include" \
SHARED_LIBS="" \
- LDFLAGS="-Wl,--gc-sections" \
+ LDFLAGS="
$(TARGET_LDFLAGS)
-Wl,--gc-sections" \
IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
FPIC="$(FPIC)"
IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
FPIC="$(FPIC)"
@@
-111,14
+97,13
@@
define Build/InstallDev
endef
define Package/ip/install
endef
define Package/ip/install
- $(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_DIR) $(1)/etc/iproute2
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/iproute2/rt_tables $(1)/etc/iproute2
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/bin/
endef
endef
-define Package/ip-$(BUILD_VARIANT)/install
- $(Package/ip/install)
+define Package/ip-full/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/
endef
define Package/tc/install
endef
define Package/tc/install