OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 # 6 #
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=iproute2 10 PKG_NAME:=iproute2
Line 11... Line 11...
11 PKG_VERSION:=4.20.0 11 PKG_VERSION:=4.16.0
12 PKG_RELEASE:=1 12 PKG_RELEASE:=4
13   13  
14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 15 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
16 PKG_HASH:=c8adaa6a40f888476b23acb283cfa30c0dd55f07b5aa20663ed5ba2ef1f6fda8 16 PKG_HASH:=0c5c24020fd7349fe25728c5edee9fb6a1bc8a38f08e23be5c57a6301e55ee0a
17 PKG_BUILD_PARALLEL:=1 17 PKG_BUILD_PARALLEL:=1
Line 18... Line 18...
18 PKG_BUILD_DEPENDS:=iptables 18 PKG_BUILD_DEPENDS:=iptables
Line 19... Line 19...
19 PKG_LICENSE:=GPL-2.0 19 PKG_LICENSE:=GPL-2.0
20 PKG_CPE_ID:=cpe:/a:iproute2_project:iproute2 20 PKG_CPE_ID:=cpe:/a:iproute2_project:iproute2
21   -  
Line 22... Line 21...
22 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 21  
23   22 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
24 include $(INCLUDE_DIR)/kernel.mk 23  
25 include $(INCLUDE_DIR)/package.mk 24 include $(INCLUDE_DIR)/kernel.mk
Line 36... Line 35...
36 define Package/ip-tiny 35 define Package/ip-tiny
37 $(call Package/iproute2/Default) 36 $(call Package/iproute2/Default)
38 TITLE:=Routing control utility (Minimal) 37 TITLE:=Routing control utility (Minimal)
39 VARIANT:=tiny 38 VARIANT:=tiny
40 PROVIDES:=ip 39 PROVIDES:=ip
41 ALTERNATIVES:=200:/sbin/ip:/usr/libexec/ip-tiny 40 ALTERNATIVES:=200:/sbin/ip:/sbin/ip-tiny
42 DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl 41 DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
43 endef 42 endef
Line 44... Line 43...
44   43  
45 define Package/ip-full 44 define Package/ip-full
46 $(call Package/iproute2/Default) 45 $(call Package/iproute2/Default)
47 TITLE:=Routing control utility (Full) 46 TITLE:=Routing control utility (Full)
48 VARIANT:=full 47 VARIANT:=full
49 PROVIDES:=ip 48 PROVIDES:=ip
50 ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full 49 ALTERNATIVES:=300:/sbin/ip:/sbin/ip-full
51 DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl 50 DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
Line 52... Line 51...
52 endef 51 endef
53   52  
54 define Package/tc 53 define Package/tc
55 $(call Package/iproute2/Default) 54 $(call Package/iproute2/Default)
56 TITLE:=Traffic control utility 55 TITLE:=Traffic control utility
Line 57... Line 56...
57 DEPENDS:=+kmod-sched-core +libxtables +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl 56 DEPENDS:=+kmod-sched-core +(PACKAGE_devlink||PACKAGE_rdma):libmnl
58 endef 57 endef
59   58  
Line 104... Line 103...
104 ifdef CONFIG_PACKAGE_rdma 103 ifdef CONFIG_PACKAGE_rdma
105 HAVE_MNL:=y 104 HAVE_MNL:=y
106 endif 105 endif
Line 107... Line 106...
107   106  
-   107 define Build/Configure
-   108 $(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
-   109 $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
-   110 $(PKG_BUILD_DIR)/Makefile
-   111 $(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
108 define Build/Configure 112 $(PKG_BUILD_DIR)/Makefile
109 echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \ 113 echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
110 > $(PKG_BUILD_DIR)/include/SNAPSHOT.h 114 > $(PKG_BUILD_DIR)/include/SNAPSHOT.h
Line 111... Line 115...
111 endef 115 endef
112   -  
113 TARGET_CFLAGS += -ffunction-sections -fdata-sections -  
Line 114... Line 116...
114 TARGET_LDFLAGS += -Wl,--gc-sections 116  
-   117 TARGET_CFLAGS += -ffunction-sections -fdata-sections
115 TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny 118  
116   119 MAKE_FLAGS += \
-   120 EXTRA_CCOPTS="-I$(STAGING_DIR)/usr/include/libnl-tiny" \
117 MAKE_FLAGS += \ 121 KERNEL_INCLUDE="$(LINUX_DIR)/include" \
118 KERNEL_INCLUDE="$(LINUX_DIR)/user_headers/include" \ 122 SHARED_LIBS="" \
119 SHARED_LIBS="" \ 123 LDFLAGS="$(TARGET_LDFLAGS) -Wl,--gc-sections" \
120 IP_CONFIG_TINY=$(IP_CONFIG_TINY) \ -  
121 HAVE_MNL=$(HAVE_MNL) \ 124 IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
Line 122... Line 125...
122 IPT_LIB_DIR=/usr/lib/iptables \ 125 HAVE_MNL=$(HAVE_MNL) \
123 XT_LIB_DIR=/usr/lib/iptables \ 126 IPT_LIB_DIR=/usr/lib/iptables \
124 FPIC="$(FPIC)" 127 FPIC="$(FPIC)"
Line 125... Line 128...
125   128  
126 define Build/Compile 129 define Build/Compile
127 +$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) 130 +$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
128 endef 131 endef
129   132  
130 define Build/InstallDev 133 define Build/InstallDev
Line 131... Line 134...
131 $(INSTALL_DIR) $(1)/usr/include 134 $(INSTALL_DIR) $(1)/usr/include
132 $(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink}.h $(1)/usr/include/ 135 $(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink,ll_map}.h $(1)/usr/include/
133 $(INSTALL_DIR) $(1)/usr/lib 136 $(INSTALL_DIR) $(1)/usr/lib
134 $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/ 137 $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/
Line 135... Line 138...
135 endef 138 endef
136   139  
137 define Package/ip-tiny/install 140 define Package/ip-tiny/install
138 $(INSTALL_DIR) $(1)/usr/libexec 141 $(INSTALL_DIR) $(1)/sbin
Line 139... Line 142...
139 $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/libexec/ip-tiny 142 $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/sbin/ip-tiny
140 endef 143 endef
141   144