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  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=dropbear 10 PKG_NAME:=dropbear
Line 11... Line 11...
11 PKG_VERSION:=2017.75 11 PKG_VERSION:=2017.75
12 PKG_RELEASE:=9 12 PKG_RELEASE:=5
13   13  
14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
Line 47... Line 47...
47 $(call Package/dropbear/Default) 47 $(call Package/dropbear/Default)
48 SECTION:=net 48 SECTION:=net
49 CATEGORY:=Base system 49 CATEGORY:=Base system
50 TITLE:=Small SSH2 client/server 50 TITLE:=Small SSH2 client/server
51 DEPENDS:= +DROPBEAR_ZLIB:zlib 51 DEPENDS:= +DROPBEAR_ZLIB:zlib
52 ALTERNATIVES:=\ -  
53 100:/usr/bin/ssh:/usr/sbin/dropbear \ -  
54 100:/usr/bin/scp:/usr/sbin/dropbear \ -  
55   -  
56 endef 52 endef
Line 57... Line 53...
57   53  
58 define Package/dropbear/description 54 define Package/dropbear/description
59 A small SSH2 server/client designed for small memory environments. 55 A small SSH2 server/client designed for small memory environments.
Line 60... Line 56...
60 endef 56 endef
61   57  
62 define Package/dropbear/conffiles 58 define Package/dropbear/conffiles
63 /etc/dropbear/dropbear_rsa_host_key 59 /etc/dropbear/dropbear_rsa_host_key
Line 64... Line 60...
64 /etc/config/dropbear 60 /etc/config/dropbear
65 endef 61 endef
66   62  
Line 84... Line 80...
84 $(if $(CONFIG_DROPBEAR_PUTUTLINE),,--disable-pututline) \ 80 $(if $(CONFIG_DROPBEAR_PUTUTLINE),,--disable-pututline) \
85 --disable-pututxline \ 81 --disable-pututxline \
86 $(if $(CONFIG_DROPBEAR_ZLIB),,--disable-zlib) \ 82 $(if $(CONFIG_DROPBEAR_ZLIB),,--disable-zlib) \
87 --enable-bundled-libtom 83 --enable-bundled-libtom
Line 88... Line 84...
88   84  
89 TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections -flto 85 TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections
Line 90... Line 86...
90 TARGET_LDFLAGS += -Wl,--gc-sections -flto=jobserver 86 TARGET_LDFLAGS += -Wl,--gc-sections
91   87  
Line 92... Line 88...
92 define Build/Configure 88 define Build/Configure
Line 133... Line 129...
133   129  
134 define Package/dropbear/install 130 define Package/dropbear/install
135 $(INSTALL_DIR) $(1)/usr/sbin 131 $(INSTALL_DIR) $(1)/usr/sbin
136 $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear 132 $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear
-   133 $(INSTALL_DIR) $(1)/usr/bin
-   134 $(LN) ../sbin/dropbear $(1)/usr/bin/scp
137 $(INSTALL_DIR) $(1)/usr/bin 135 $(LN) ../sbin/dropbear $(1)/usr/bin/ssh
138 $(LN) ../sbin/dropbear $(1)/usr/bin/dbclient 136 $(LN) ../sbin/dropbear $(1)/usr/bin/dbclient
139 $(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey 137 $(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey
140 $(INSTALL_DIR) $(1)/etc/config 138 $(INSTALL_DIR) $(1)/etc/config
141 $(INSTALL_CONF) ./files/dropbear.config $(1)/etc/config/dropbear 139 $(INSTALL_DATA) ./files/dropbear.config $(1)/etc/config/dropbear
142 $(INSTALL_DIR) $(1)/etc/init.d 140 $(INSTALL_DIR) $(1)/etc/init.d
143 $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear 141 $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
144 $(INSTALL_DIR) $(1)/usr/lib/opkg/info 142 $(INSTALL_DIR) $(1)/usr/lib/opkg/info
145 $(INSTALL_DIR) $(1)/etc/dropbear 143 $(INSTALL_DIR) $(1)/etc/dropbear