OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 7... Line 7...
7   7  
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
Line 9... Line 9...
9 include $(INCLUDE_DIR)/kernel.mk 9 include $(INCLUDE_DIR)/kernel.mk
-   10  
10   11 PKG_NAME:=ppp
Line 11... Line 12...
11 PKG_NAME:=ppp 12 PKG_VERSION:=2.4.7
12 PKG_RELEASE:=1 13 PKG_RELEASE:=12
13   -  
14 PKG_SOURCE_PROTO:=git -  
15 PKG_SOURCE_URL:=https://github.com/paulusmack/ppp 14  
16 PKG_SOURCE_DATE:=2018-06-23 15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
17 PKG_SOURCE_VERSION:=5c765a67fd25f9d84e71ed61ace37c8c97f6be15 16 PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/
18 PKG_MIRROR_HASH:=a79e62d0569e3d6a3207f2a693532d34629fb5b3b9d8c1d9b9786ebd1d1de70f 17 PKG_HASH:=02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30
Line 19... Line -...
19 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> -  
20 PKG_LICENSE:=BSD-4-Clause -  
21 PKG_CPE_ID:=cpe:/a:samba:ppp -  
22   18 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
Line 23... Line 19...
23 PKG_RELEASE_VERSION:=2.4.7 19 PKG_LICENSE:=BSD-4-Clause
Line 24... Line 20...
24 PKG_VERSION:=$(PKG_RELEASE_VERSION).git-$(PKG_SOURCE_DATE) 20 PKG_CPE_ID:=cpe:/a:samba:ppp
Line 191... Line 187...
191 # doesn't exits 187 # doesn't exits
192 -$(CP) $(LINUX_DIR)/include/linux/compiler_types.h \ 188 -$(CP) $(LINUX_DIR)/include/linux/compiler_types.h \
193 $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/ 189 $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
194 endef 190 endef
Line 195... Line 191...
195   191  
196 TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto 192 TARGET_CFLAGS += -ffunction-sections -fdata-sections
Line 197... Line 193...
197 TARGET_LDFLAGS += -Wl,--gc-sections -flto -fuse-linker-plugin 193 TARGET_LDFLAGS += -Wl,--gc-sections
198   194  
199 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \ 195 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
Line 217... Line 213...
217   213  
218 define Package/ppp/script_install 214 define Package/ppp/script_install
Line 219... Line 215...
219 endef 215 endef
220   216  
221 define Package/ppp/install 217 define Package/ppp/install
222 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) 218 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
223 $(INSTALL_DIR) $(1)/usr/sbin 219 $(INSTALL_DIR) $(1)/usr/sbin
224 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppd $(1)/usr/sbin/ 220 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppd $(1)/usr/sbin/
225 $(INSTALL_DIR) $(1)/etc/ppp 221 $(INSTALL_DIR) $(1)/etc/ppp
Line 234... Line 230...
234 $(INSTALL_BIN) ./files/lib/netifd/ppp-down $(1)/lib/netifd/ 230 $(INSTALL_BIN) ./files/lib/netifd/ppp-down $(1)/lib/netifd/
235 endef 231 endef
236 Package/ppp-multilink/install=$(Package/ppp/install) 232 Package/ppp-multilink/install=$(Package/ppp/install)
Line 237... Line 233...
237   233  
238 define Package/ppp-mod-pppoa/install 234 define Package/ppp-mod-pppoa/install
239 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) 235 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
240 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pppoatm.so \ 236 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppoatm.so \
241 $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ 237 $(1)/usr/lib/pppd/$(PKG_VERSION)/
Line 242... Line 238...
242 endef 238 endef
243   239  
244 define Package/ppp-mod-pppoe/install 240 define Package/ppp-mod-pppoe/install
245 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) 241 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
246 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/rp-pppoe.so \ 242 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \
Line 247... Line 243...
247 $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ 243 $(1)/usr/lib/pppd/$(PKG_VERSION)/
248 endef 244 endef
249   245  
250 define Package/ppp-mod-radius/install 246 define Package/ppp-mod-radius/install
251 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) 247 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
252 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/radius.so \ 248 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/radius.so \
253 $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ 249 $(1)/usr/lib/pppd/$(PKG_VERSION)/
254 $(INSTALL_DIR) $(1)/etc/ppp 250 $(INSTALL_DIR) $(1)/etc/ppp
255 $(INSTALL_DATA) ./files/etc/ppp/radius.conf $(1)/etc/ppp/ 251 $(INSTALL_DATA) ./files/etc/ppp/radius.conf $(1)/etc/ppp/
256 $(INSTALL_DIR) $(1)/etc/ppp/radius 252 $(INSTALL_DIR) $(1)/etc/ppp/radius
257 $(INSTALL_DATA) ./files/etc/ppp/radius/dictionary* \ 253 $(INSTALL_DATA) ./files/etc/ppp/radius/dictionary* \
258 $(1)/etc/ppp/radius/ 254 $(1)/etc/ppp/radius/
Line 259... Line 255...
259 $(INSTALL_CONF) ./files/etc/ppp/radius/servers \ 255 $(INSTALL_CONF) ./files/etc/ppp/radius/servers \
260 $(1)/etc/ppp/radius/ 256 $(1)/etc/ppp/radius/
261 endef 257 endef
262   258  
263 define Package/ppp-mod-pppol2tp/install 259 define Package/ppp-mod-pppol2tp/install
Line 264... Line 260...
264 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) 260 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
265 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pppol2tp.so \ 261 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppol2tp.so \
266 $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ 262 $(1)/usr/lib/pppd/$(PKG_VERSION)/
267 endef 263 endef
268   264  
269 define Package/ppp-mod-pptp/install 265 define Package/ppp-mod-pptp/install
270 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) 266 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
Line 271... Line 267...
271 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pptp.so \ 267 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pptp.so \
272 $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ 268 $(1)/usr/lib/pppd/$(PKG_VERSION)/
273 $(INSTALL_DIR) $(1)/etc/ppp 269 $(INSTALL_DIR) $(1)/etc/ppp
274 $(INSTALL_DATA) ./files/etc/ppp/options.pptp $(1)/etc/ppp/ 270 $(INSTALL_DATA) ./files/etc/ppp/options.pptp $(1)/etc/ppp/
275 endef 271 endef
Line 276... Line 272...
276   272  
277 define Package/ppp-mod-passwordfd/install 273 define Package/ppp-mod-passwordfd/install
278 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) 274 $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)