Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into experimental

Conflicts:
	fwmod
	make/libs/yaml/yaml.mk
	make/socat/socat.mk
	toolchain/Config.in
	toolchain/make/target/gcc/4.8.0/000-no_target_flags_as_BUILD_FLAGS.freetz.patch
	toolchain/make/target/gcc/4.8.0/005-no_docs.patch
	toolchain/make/target/gcc/4.8.0/010-make-j-fixes.pr42980_backport.install-multi.patch
	toolchain/make/target/gcc/4.8.0/010-make-j-fixes.pr42980_backport.multido.patch
	toolchain/make/target/gcc/4.8.0/010-use_bundled_mkstemps.patch
	toolchain/make/target/gcc/4.8.0/020-no_python.patch
	toolchain/make/target/gcc/4.8.0/100-uclibc-conf.patch
	toolchain/make/target/gcc/4.8.0/101-libgcc-exclude-rarely-used-functions.patch
	toolchain/make/target/gcc/4.8.0/110-overridable-CXXFLAGS_FOR_TARGET.patch
	toolchain/make/target/gcc/4.8.0/301-missing-execinfo_h.patch
	toolchain/make/target/gcc/4.8.0/302-c99-snprintf.patch
	toolchain/make/target/gcc/4.8.0/305-libmudflap-susv3-legacy.patch
	toolchain/make/target/gcc/4.8.0/800-libgcc-disable-mips16-float.patch
	toolchain/make/target/gcc/4.8.0/800-libgcc-dwarf.patch
	toolchain/make/target/gcc/4.8.0/820-libgcc_pic.patch
	toolchain/make/target/gcc/4.8.0/910-mbsd_multi.patch
	toolchain/make/target/gcc/4.8.1/000-no_target_flags_as_BUILD_FLAGS.freetz.patch
	toolchain/make/target/gcc/4.8.1/005-no_docs.patch
	toolchain/make/target/gcc/4.8.1/010-make-j-fixes.pr42980_backport.install-multi.patch
	toolchain/make/target/gcc/4.8.1/010-make-j-fixes.pr42980_backport.multido.patch
	toolchain/make/target/gcc/4.8.1/010-use_bundled_mkstemps.patch
	toolchain/make/target/gcc/4.8.1/020-no_python.patch
	toolchain/make/target/gcc/4.8.1/100-uclibc-conf.patch
	toolchain/make/target/gcc/4.8.1/101-libgcc-exclude-rarely-used-functions.patch
	toolchain/make/target/gcc/4.8.1/110-overridable-CXXFLAGS_FOR_TARGET.patch
	toolchain/make/target/gcc/4.8.1/301-missing-execinfo_h.patch
	toolchain/make/target/gcc/4.8.1/302-c99-snprintf.patch
	toolchain/make/target/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
	toolchain/make/target/gcc/4.8.1/800-libgcc-disable-mips16-float.patch
	toolchain/make/target/gcc/4.8.1/800-libgcc-dwarf.patch
	toolchain/make/target/gcc/4.8.1/820-libgcc_pic.patch
	toolchain/make/target/gcc/4.8.1/910-mbsd_multi.patch
	toolchain/make/target/gcc/gcc.mk
	toolchain/target/binutils/patches/2.23.2/010-use_bundled_mkstemps.patch
	toolchain/target/gcc/patches/4.7.3/101-libgcc-exclude-rarely-used-functions.patch
	toolchain/target/gcc/patches/4.8.0/000-no_target_flags_as_BUILD_FLAGS.freetz.patch
	toolchain/target/gcc/patches/4.8.0/005-no_docs.patch
	toolchain/target/gcc/patches/4.8.0/010-make-j-fixes.pr42980_backport.install-multi.patch
	toolchain/target/gcc/patches/4.8.0/010-make-j-fixes.pr42980_backport.multido.patch
	toolchain/target/gcc/patches/4.8.0/020-no_python.patch
	toolchain/target/gcc/patches/4.8.0/100-uclibc-conf.patch
	toolchain/target/gcc/patches/4.8.0/110-overridable-CXXFLAGS_FOR_TARGET.patch
	toolchain/target/gcc/patches/4.8.0/301-missing-execinfo_h.patch
	toolchain/target/gcc/patches/4.8.0/302-c99-snprintf.patch
	toolchain/target/gcc/patches/4.8.0/305-libmudflap-susv3-legacy.patch
	toolchain/target/gcc/patches/4.8.0/800-libgcc-disable-mips16-float.patch
	toolchain/target/gcc/patches/4.8.0/800-libgcc-dwarf.patch
	toolchain/target/gcc/patches/4.8.0/820-libgcc_pic.patch
	toolchain/target/gcc/patches/4.8.0/910-mbsd_multi.patch
  • Loading branch information...
commit ef422942cb085e3e5b5bf9ddef6de594b82ffcf0 2 parents 06dc259 + 67c1cfe
@olistudent authored
Showing with 3,595 additions and 864 deletions.
  1. +15 −2 CHANGELOG
  2. +82 −47 Config.in
  3. +196 −184 Config.in.has_avm → Config.in.avm
  4. +4 −0 FIRMWARES
  5. +1 −1  Makefile
  6. +12 −12 fwmod
  7. +3 −3 kernel/Config.in.modules
  8. +2 −2 kernel/external.in
  9. +4 −0 make/Config.in
  10. +2 −2 make/Makefile.in
  11. +1 −1  make/aiccu/Config.in
  12. +1 −1  make/aiccu/external.in
  13. +29 −0 make/asterisk/Config.in
  14. +151 −0 make/asterisk/asterisk.mk
  15. +2 −0  make/asterisk/external.files
  16. +8 −0 make/asterisk/external.in
  17. +11 −0 make/asterisk/patches/010-no_libresolv.patch
  18. +59 −0 make/asterisk/patches/020-glob.patch
  19. +14 −0 make/asterisk/patches/030-speex_check.patch
  20. +55 −0 make/asterisk/patches/040-external-pjlib.patch
  21. +11 −0 make/asterisk/patches/050-pjproject-2.0.1-to-2.1.0.patch
  22. +23 −0 make/asterisk/patches/060-no_res_nsearch_in_uclibc.patch
  23. +1 −1  make/autofs/external.in
  24. +2 −2 make/avahi/external.in
  25. +3 −3 make/avahi/external.in.libs
  26. +1 −1  make/bash/external.in
  27. +5 −5 make/bind/external.in
  28. +1 −1  make/bip/external.in
  29. +2 −2 make/bird/external.in
  30. +1 −1  make/bittwist/external.in
  31. +1 −1  make/bluez-utils/external.in
  32. +2 −2 make/busybox/Config.in
  33. +1 −1  make/busybox/Config.in.busybox
  34. +1 −1  make/busybox/generate.sh
  35. +1 −1  make/checkmaild/external.in
  36. +1 −1  make/cifsmount/external.in
  37. +1 −1  make/classpath/external.in
  38. +1 −1  make/collectd/external.in
  39. +1 −1  make/comgt/external.in
  40. +1 −1  make/cryptsetup/external.in
  41. +1 −1  make/ctorrent/external.in
  42. +1 −1  make/curl/external.in
  43. +1 −1  make/curl/external.in.libs
  44. +1 −1  make/davfs2/Config.in
  45. +1 −1  make/davfs2/external.in
  46. +4 −4 make/dbus/external.in
  47. +1 −1  make/dbus/external.in.libs
  48. +18 −0 make/dbus/patches/020-drop_backtrace_dependency.patch
  49. +1 −1  make/deco/external.in
  50. +1 −1  make/digitemp/external.in
  51. +1 −1  make/dns2tcp/external.in
  52. +2 −2 make/dosfstools/external.in
  53. +3 −3 make/dropbear/Config.in
  54. +1 −1  make/dropbear/external.in
  55. +1 −1  make/dtach/external.in
  56. +1 −1  make/dtmfbox/external.in
  57. +19 −19 make/e2fsprogs/external.in
  58. +11 −0 make/e2fsprogs/patches/220-drop_backtrace_dependency.patch
  59. +1 −1  make/emailrelay/external.in
  60. +2 −2 make/espeak/external.in
  61. +2 −0  make/external.in
  62. +2 −2 make/ffmpeg/external.in
  63. +8 −8 make/ffmpeg/external.in.libs
  64. +1 −1  make/fowsr/external.in
  65. +2 −4 make/fowsr/fowsr.mk
  66. +1 −1  make/fuse/external.in.libs
  67. +2 −2 make/gdb/external.in
  68. +1 −1  make/ghostscript-fonts/external.in
  69. +1 −1  make/git/Config.in
  70. +1 −1  make/git/external.in
  71. +2 −2 make/git/git.mk
  72. +2 −2 make/git/patches/010-missing_NO_INSTALL_HARDLINKS.patch
  73. +7 −7 make/git/patches/030-no_rpath.patch
  74. +1 −1  make/git/patches/050-dont-overwrite-patched-configure.patch
  75. +1 −1  make/gnu-make/external.in
  76. +2 −2 make/gnutls/external.in
  77. +3 −3 make/gnutls/external.in.libs
  78. +1 −1  make/gocr/external.in
  79. +1 −1  make/gw6/external.in
  80. +20 −0 make/gw6/patches/030-missing_includes.patch
  81. +1 −1  make/hd-idle/Config.in
  82. +1 −1  make/hplip/external.in
  83. +1 −1  make/html2text/external.in
  84. +1 −1  make/htop/external.in
  85. +1 −1  make/htpdate/Config.in
  86. +1 −1  make/httpry/external.in
  87. +1 −1  make/httptunnel/external.in
  88. +1 −1  make/ifstat/external.in
  89. +1 −1  make/iftop/external.in
  90. +1 −1  make/igmpproxy/external.in
  91. +1 −1  make/imagemagick/external.in
  92. +2 −2 make/inadyn-mt/Config.in
  93. +6 −0 make/inadyn-mt/files/root/etc/init.d/rc.inadyn-mt
  94. +12 −0 make/inadyn-mt/files/root/usr/lib/cgi-bin/inadyn-mt.cgi
  95. +4 −3 make/inadyn-mt/inadyn-mt.mk
  96. +569 −290 make/inadyn-mt/patches/200-multiservices.patch
  97. +62 −0 make/inadyn-mt/patches/201-md5-bigendian-fix.patch
  98. +146 −0 make/inadyn-mt/patches/202-dns.he.net-support.patch
  99. +7 −7 make/inetd/files/root/etc/init.d/modlibinetd
  100. +3 −3 make/inetd/inetd.mk
  101. +1 −1  make/inotify-tools/external.in
  102. +1 −1  make/iodine/external.in
  103. +2 −2 make/iptraf/external.in
  104. +1 −1  make/irssi/external.in
  105. +1 −1  make/jamvm/external.in
  106. +1 −1  make/knock/external.in
  107. +1 −1  make/ldd/external.in
  108. +1 −1  make/lftp/external.in
  109. +8 −1 make/libs/Config.in
  110. +1 −1  make/libs/apr-util/external.in
  111. +1 −1  make/libs/apr/external.in
  112. +1 −1  make/libs/attr/external.in
  113. +192 −0 make/libs/attr/patches/20-gzip_fix.attr.patch
  114. +1 −1  make/libs/bluez-libs/external.in
  115. +1 −1  make/libs/cyassl/external.in
  116. +1 −1  make/libs/db/external.in
  117. +20 −0 make/libs/db/patches/020-drop_backtrace_dependency.db.patch
  118. +1 −1  make/libs/devmapper/external.in
  119. +1 −1  make/libs/expat/external.in
  120. +5 −0 make/libs/external.in
  121. +1 −1  make/libs/flac/external.in
  122. +1 −1  make/libs/freetype/external.in
  123. +1 −1  make/libs/gd/external.in
  124. +1 −1  make/libs/gettext/external.in
  125. +5 −5 make/libs/glib2/external.in
  126. +1 −1  make/libs/gmp/external.in
  127. +1 −1  make/libs/jpeg/external.in
  128. +1 −1  make/libs/leptonica/external.in
  129. +1 −1  make/libs/libart_lgpl/external.in
  130. +1 −1  make/libs/libcapi/external.in
  131. +20 −0 make/libs/libcapi/patches/010-no_files_outside_of_build_dir.libcapi.patch
  132. +1 −1  make/libs/libconfig/external.in
  133. +1 −1  make/libs/libctlmgr/Config.in
  134. +1 −1  make/libs/libdaemon/external.in
  135. +1 −1  make/libs/libdnet/external.in
  136. +1 −1  make/libs/libelf/external.in
  137. +1 −1  make/libs/libevent/external.in
  138. +1 −1  make/libs/libexif/external.in
  139. +1 −1  make/libs/libffi/external.in
  140. +1 −1  make/libs/libftdi/external.in
  141. +1 −1  make/libs/libgcrypt/external.in
  142. +1 −1  make/libs/libgpg-error/external.in
  143. +8 −0 make/libs/libgsm/Config.in
  144. +3 −0  make/libs/libgsm/Makefile.in
  145. +1 −0  make/libs/libgsm/external.files
  146. +7 −0 make/libs/libgsm/external.in
  147. +45 −0 make/libs/libgsm/libgsm.mk
  148. +43 −0 make/libs/libgsm/patches/010-shared_lib.libgsm.patch
  149. +23 −0 make/libs/libgsm/patches/020-toast.libgsm.patch
  150. +26 −0 make/libs/libgsm/patches/030-missing_includes.libgsm.patch
  151. +24 −0 make/libs/libgsm/patches/102-cplusplus.debian.libgsm.patch
  152. +96 −0 make/libs/libgsm/patches/105-compiler_warnings.debian.libgsm.patch
  153. +1 −1  make/libs/libiconv/external.in
  154. +1 −1  make/libs/libid3tag/external.in
  155. +1 −1  make/libs/libmad/external.in
  156. +1 −1  make/libs/libnet/external.in
  157. +1 −1  make/libs/libogg/external.in
  158. +1 −1  make/libs/liboping/external.in
  159. +2 −2 make/libs/libosip2/external.in
  160. +1 −1  make/libs/libpcap/external.in
  161. +1 −1  make/libs/libpng/external.in
  162. +1 −1  make/libs/libstdcxx/external.in
  163. +1 −1  make/libs/libsynce/external.in
  164. +1 −1  make/libs/libtasn1/external.in
  165. +1 −1  make/libs/libtool/external.in
  166. +1 −1  make/libs/libusb/external.in
  167. +1 −1  make/libs/libusb1/external.in
  168. +3 −3 make/libs/libvorbis/external.in
  169. +1 −1  make/libs/libxml2/external.in
  170. +1 −1  make/libs/linux-atm/external.in
  171. +1 −1  make/libs/lzo/external.in
  172. +1 −1  make/libs/matrixssl/external.in
  173. +1 −1  make/libs/mpc/external.in
  174. +1 −1  make/libs/mpfr/external.in
  175. +4 −4 make/libs/ncurses/external.in
  176. +1 −1  make/libs/neon/external.in
  177. +1 −1  make/libs/openjpeg/external.in
  178. +1 −1  make/libs/openobex/external.in
  179. +2 −2 make/libs/pcre/external.files
  180. +4 −4 make/libs/pcre/external.in
  181. +1 −1  make/libs/pcre/patches/100-no_docs_no_man.pcre.patch
  182. +3 −3 make/libs/pcre/patches/110-unnecessary-tests.pcre.patch
  183. +4 −4 make/libs/pcre/pcre.mk
  184. +0 −5 make/libs/pjproject/Config.in
  185. +0 −3  make/libs/pjproject/Makefile.in
  186. +206 −0 make/libs/pjproject2/Config.in
  187. +3 −0  make/libs/pjproject2/Makefile.in
  188. +14 −0 make/libs/pjproject2/external.files
  189. +111 −0 make/libs/pjproject2/external.in
  190. +20 −0 make/libs/pjproject2/patches/010-proper_options_handling.pjproject2.patch
  191. +22 −0 make/libs/pjproject2/patches/020-no_arch_suffix_static_libs.pjproject2.patch
  192. +11 −0 make/libs/pjproject2/patches/030-proper_soname_workaround.pjproject2.patch
  193. +35 −0 make/libs/pjproject2/patches/040-extra_flags.pjproject2.patch
  194. +18 −0 make/libs/pjproject2/patches/050-silence_deprecated_warnings.pjproject2.patch
  195. +19 −0 make/libs/pjproject2/patches/060-dont_use_bzero.pjproject2.patch
  196. +114 −0 make/libs/pjproject2/pjproject2.mk
  197. +1 −1  make/libs/polarssl/external.in
  198. +1 −1  make/libs/popt/external.in
  199. +1 −1  make/libs/protobuf-c/external.in
  200. +2 −2 make/libs/readline/external.in
  201. +10 −0 make/libs/serf/Config.in
  202. +3 −0  make/libs/serf/Makefile.in
  203. +1 −0  make/libs/serf/external.files
  204. +7 −0 make/libs/serf/external.in
  205. +49 −0 make/libs/serf/serf.mk
  206. +15 −0 make/libs/speex/Config.in
  207. +3 −0  make/libs/speex/Makefile.in
  208. +2 −0  make/libs/speex/external.files
  209. +15 −0 make/libs/speex/external.in
  210. +32 −0 make/libs/speex/patches/010-header.debian.speex.patch
  211. +71 −0 make/libs/speex/patches/020-resample.debian.speex.patch
  212. +64 −0 make/libs/speex/speex.mk
  213. +8 −0 make/libs/srtp/Config.in
  214. +3 −0  make/libs/srtp/Makefile.in
  215. +1 −0  make/libs/srtp/external.files
  216. +7 −0 make/libs/srtp/external.in
  217. +28 −0 make/libs/srtp/patches/010-AR.srtp.patch
  218. +12 −0 make/libs/srtp/patches/020-install.srtp.patch
  219. +11 −0 make/libs/srtp/patches/030-no_tests.srtp.patch
  220. +56 −0 make/libs/srtp/patches/040-shared_lib.srtp.patch
  221. +45 −0 make/libs/srtp/srtp.mk
  222. +1 −1  make/libs/sysfsutils/external.in
  223. +1 −1  make/libs/taglib/external.in
  224. +1 −1  make/libs/uclibcxx/external.in
  225. +1 −1  make/libs/wxWidgets/external.in
  226. +1 −1  make/libs/yaml/external.in
  227. +7 −5 make/libs/yaml/yaml.mk
  228. +1 −1  make/libs/zlib/external.in
  229. +1 −1  make/lighttpd/external.in
  230. +1 −1  make/lsof/Config.in
  231. +1 −1  make/lsof/external.in
  232. +1 −1  make/ltrace/external.in
  233. +1 −1  make/lua/external.in
  234. +1 −1  make/lua/external.in.libs
  235. +1 −1  make/lynx/external.in
  236. +2 −0  make/lynx/lynx.mk
  237. +1 −1  make/madplay/external.in
  238. +1 −1  make/mc/external.in
  239. +1 −1  make/mdev/Config.in
  240. +1 −1  make/mediatomb/external.in
  241. +34 −0 make/mediatomb/patches/110-drop_backtrace_dependency.patch
  242. +1 −1  make/microperl/external.in
  243. +1 −1  make/mini-snmpd/external.in
  244. +1 −1  make/minicom/external.in
  245. +1 −1  make/minidlna/external.in
  246. +1 −1  make/mod/files/root/usr/bin/get_ip
  247. +4 −4 make/mod/mod.mk
  248. +1 −1  make/mtr/external.in
  249. +1 −1  make/nano/external.in
  250. +1 −1  make/nc6/external.in
  251. +5 −5 make/ncftp/external.in
  252. +1 −1  make/netatalk/external.in
  253. +11 −0 make/netatalk/patches/020-drop_backtrace_dependency.patch
  254. +1 −1  make/netcat/external.in
  255. +6 −6 make/netpbm/external.in
  256. +1 −1  make/netpbm/external.in.libs
  257. +1 −1  make/ngircd/external.in
  258. +1 −1  make/nmap/external.in
  259. +13 −13 make/ntfs/external.in
  260. +1 −1  make/ntfs/external.in.libs
  261. +1 −1  make/obexftp/external.in
  262. +1 −1  make/oidentd/external.in
  263. +1 −1  make/opendd/external.in
  264. +1 −1  make/openntpd/Config.in
  265. +7 −7 make/openssh/external.in
  266. +2 −2 make/openssh/openssh.mk
  267. +3 −0  make/openvpn-cgi/Config.in
  268. 0  make/{openvpn → openvpn-cgi}/files/.language
  269. +0 −1  make/{openvpn → openvpn-cgi}/files/README
  270. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/box_crt.def
  271. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/box_key.def
  272. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/ca_crt.def
  273. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/crl_pem.def
  274. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/dh_pem.def
  275. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/openvpn.cfg
  276. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/openvpn.inetd
  277. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/openvpn.save
  278. +0 −1  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/openvpn_conf
  279. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/openvpn_dynamic_conf
  280. 0  make/{openvpn → openvpn-cgi}/files/root/etc/default.openvpn/static_key.def
  281. +1 −1  make/{openvpn → openvpn-cgi}/files/root/etc/init.d/rc.openvpn
  282. 0  make/{openvpn → openvpn-cgi}/files/root/usr/lib/cgi-bin/openvpn.cgi
  283. 0  make/{openvpn → openvpn-cgi}/files/root/usr/lib/cgi-bin/openvpn/openvpn_clients.cgi
  284. +11 −0 make/openvpn-cgi/openvpn-cgi.mk
  285. +5 −0 make/openvpn-v2-cgi/Config.in
  286. +18 −0 make/openvpn-v2-cgi/files/.language
  287. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/box_crt.def
  288. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/box_key.def
  289. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/ca_crt.def
  290. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/crl_pem.def
  291. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/dh_pem.def
  292. +37 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/generate_virtual_pkg
  293. +12 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/openvpn.cfg
  294. +14 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/openvpn.inetd
  295. +10 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/openvpn.save
  296. +15 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/openvpn_conf
  297. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/script1.def
  298. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/script2.def
  299. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/script3.def
  300. +5 −0 make/openvpn-v2-cgi/files/root/etc/default.openvpn/static_key.def
Sorry, we could not display the entire diff because too many files (476) changed.
View
17 CHANGELOG
@@ -13,7 +13,14 @@ Latest changes:
- New patches (read online help for more info):
- New packages, libs, modules:
+ * asterisk 11.4.0
* E-MailRelay 1.8.2
+ * libgsm-1.0.13
+ * libsrtp-1.4.4+20100615
+ * PJProject 2.1.0-git
+ * serf 1.2.0
+ * ScanButton 0.2.3.cvs20090713
+ * speex 1.2rc1
- Updated tools and hooks:
@@ -25,18 +32,24 @@ Latest changes:
* dnsmasq 2.66
* dropbear 2013.58
* ffmpeg 1.2.1
- * git 1.8.2.3
+ * git 1.8.3
* gmp 5.1.2
+ * inadyn-mt 02.24.38
* libconfig 1.4.9
* libxml 2.9.1
* minidlna 1.1.0
* nano 2.2.6
* ngircd 20.2
+ * openssh 6.2p2
+ * openvpn 2.3.2
+ * pcre 8.33
* php 5.3.25/5.4.15
* Python 2.7.5
* samba 3.6.14
+ * sqlite 3.7.17
+ * subversion 1.7.10
* tmux 1.8
- * umurmur 0.2.11
+ * umurmur 0.2.12
* zlib 1.2.8
- Remove packages, libs, modules, tools:
View
129 Config.in
@@ -282,15 +282,15 @@ choice
config FREETZ_TYPE_LANG_DE
bool "de - deutsch"
- depends on FREETZ_HAS_AVM_LANG_DE
+ depends on FREETZ_AVM_HAS_LANG_DE
config FREETZ_TYPE_LANG_A_CH
bool "a-ch - deutsch"
- depends on FREETZ_HAS_AVM_LANG_A_CH
+ depends on FREETZ_AVM_HAS_LANG_A_CH
config FREETZ_TYPE_LANG_EN
bool "en - international"
- depends on FREETZ_HAS_AVM_LANG_EN
+ depends on FREETZ_AVM_HAS_LANG_EN
endchoice # "Firmware language" #
@@ -301,22 +301,22 @@ choice
config FREETZ_TYPE_FIRMWARE_04_XX
bool "FRITZ!OS 04.xx"
select FREETZ_AVM_VERSION_04_XX
- depends on FREETZ_HAS_AVM_FW4XX
+ depends on FREETZ_AVM_HAS_FW4XX
config FREETZ_TYPE_FIRMWARE_05_2X
bool "FRITZ!OS 05.2x"
select FREETZ_AVM_VERSION_05_2X
- depends on FREETZ_HAS_AVM_FW52X
+ depends on FREETZ_AVM_HAS_FW52X
config FREETZ_TYPE_FIRMWARE_05_5X
bool "FRITZ!OS 05.5x"
select FREETZ_AVM_VERSION_05_5X
- depends on FREETZ_HAS_AVM_FW55X
+ depends on FREETZ_AVM_HAS_FW55X
config FREETZ_TYPE_FIRMWARE_LABOR
bool "FRITZ! Labor"
select FREETZ_AVM_VERSION_05_5X
- depends on FREETZ_SHOW_ADVANCED && FREETZ_HAS_AVM_LABOR
+ depends on FREETZ_SHOW_ADVANCED && FREETZ_AVM_HAS_LABOR
help
Enable this to use an AVM Labor firmware as base for modding.
For more details see <http://www.avm.de/Labor/>.
@@ -327,7 +327,7 @@ choice
bool "EWE Edition"
select FREETZ_AVM_VERSION_05_2X if FREETZ_TYPE_7360_XL
select FREETZ_AVM_VERSION_05_5X if FREETZ_TYPE_7390
- depends on FREETZ_HAS_AVM_FWEWE
+ depends on FREETZ_AVM_HAS_FWEWE
help
http://www.ewe.de/privatkunden/service/hardware.php
http://download.ewe.de/avm/
@@ -390,14 +390,18 @@ choice
config FREETZ_TYPE_7570_IAD
bool "Alice IAD 7570"
- depends on FREETZ_TYPE_7570
+ depends on FREETZ_TYPE_7570 || (FREETZ_TYPE_7270 && FREETZ_TYPE_LANG_EN)
comment "Hint: Use replace kernel to get max filesystem size"
- depends on FREETZ_TYPE_7570_IAD && ! FREETZ_REPLACE_KERNEL
+ depends on \
+ ( \
+ FREETZ_TYPE_7570_IAD || \
+ (FREETZ_TYPE_7270 && FREETZ_TYPE_LANG_EN) \
+ ) && ! FREETZ_REPLACE_KERNEL
config FREETZ_TYPE_W920V_7570
bool "Speedport W920V"
- depends on FREETZ_TYPE_7570
+ depends on FREETZ_TYPE_7570 || (FREETZ_TYPE_7270 && FREETZ_TYPE_LANG_EN)
help
Enable this to compile a mod image for T-Com Speedport W920V based
on a 7570 image.
@@ -484,6 +488,13 @@ choice
Enable this to compile a mod image for FritzBox FON WLAN 7270 v2 based
on a 7270 v1 image.
+ config FREETZ_TYPE_7570_7270_MENUITEM
+ bool "7570"
+ depends on FREETZ_TYPE_7270 && FREETZ_TYPE_LANG_EN
+ help
+ Enable this to compile an alien image for FritzBox FON WLAN 7570 based
+ on a 7270 image.
+
config FREETZ_TYPE_7320_7330
bool "7320"
depends on FREETZ_TYPE_7330
@@ -512,9 +523,19 @@ choice
endchoice # "Alien hardware type" #
+config FREETZ_TYPE_7570_7270
+ bool
+ default y
+ depends on \
+ FREETZ_TYPE_7570_IAD || \
+ FREETZ_TYPE_W920V_7570 || \
+ FREETZ_TYPE_7570_7270_MENUITEM
+ help
+ helper for 7570 aliens
+
choice
prompt "Annex"
- depends on FREETZ_HAS_AVM_ANNEX_A_AND_B
+ depends on FREETZ_AVM_HAS_ANNEX_A_AND_B
default FREETZ_TYPE_ANNEX_B
config FREETZ_TYPE_ANNEX_A
@@ -530,7 +551,7 @@ comment "Original components --------------------"
comment "Hint: Select build toolchain if you want to enable IPv6 support"
depends on \
( \
- FREETZ_HAS_AVM_IPV6 || \
+ FREETZ_AVM_HAS_IPV6 || \
(FREETZ_SHOW_ADVANCED && FREETZ_REPLACE_KERNEL_AVAILABLE) \
) && \
(FREETZ_TARGET_UCLIBC_0_9_28 && FREETZ_DOWNLOAD_TOOLCHAIN && !FREETZ_DL_TOOLCHAIN_OVERRIDE)
@@ -539,12 +560,12 @@ config FREETZ_TARGET_IPV6_SUPPORT
bool "IPv6 support"
depends on \
( \
- FREETZ_HAS_AVM_IPV6 || \
+ FREETZ_AVM_HAS_IPV6 || \
(FREETZ_SHOW_ADVANCED && FREETZ_REPLACE_KERNEL_AVAILABLE) \
) && \
! (FREETZ_TARGET_UCLIBC_0_9_28 && FREETZ_DOWNLOAD_TOOLCHAIN && !FREETZ_DL_TOOLCHAIN_OVERRIDE)
- select FREETZ_REPLACE_KERNEL if ! (FREETZ_HAS_AVM_IPV6)
- select FREETZ_MODULE_ipv6 if ! (FREETZ_HAS_AVM_IPV6) && FREETZ_REPLACE_KERNEL
+ select FREETZ_REPLACE_KERNEL if ! (FREETZ_AVM_HAS_IPV6)
+ select FREETZ_MODULE_ipv6 if ! (FREETZ_AVM_HAS_IPV6) && FREETZ_REPLACE_KERNEL
select FREETZ_BUSYBOX__IPV6_UTILS
default n
help
@@ -1421,15 +1442,17 @@ menu "Override options"
default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7240" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7240 && FREETZ_TYPE_FIRMWARE_05_2X
default "@AVM/fritzbox.fon_wlan_7240/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7240 && FREETZ_TYPE_FIRMWARE_05_5X
default "@AVM/Beta/FRITZ!Box_7240" if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7240
- default "@AVM/fritzbox.fon_wlan_7270_v1/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V1 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_72702_72701 ) && FREETZ_TYPE_LANG_DE
- default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7270 v2/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
- default "@AVM/fritzbox.fon_wlan_7270_v2/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
- default "@AVM/Beta/FRITZ!Box_7270_v2" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE
- default "@AVM/fritzbox.fon_wlan_7270_v2/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_EN
- default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7270 v3/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
- default "@AVM/fritzbox.fon_wlan_7270_v3/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
- default "@AVM/Beta/FRITZ!Box_7270_v3" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE
- default "@AVM/fritzbox.fon_wlan_7270_v3/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_EN
+ default "@AVM/fritzbox.fon_wlan_7270_v1/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V1 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_72702_72701 ) && FREETZ_TYPE_LANG_DE
+ default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7270 v2/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "@AVM/fritzbox.fon_wlan_7270_v2/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
+ default "@AVM/Beta/FRITZ!Box_7270_v2" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE
+ default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7270 v2/english" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_2X
+ default "@AVM/fritzbox.fon_wlan_7270_v2/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_5X
+ default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7270 v3/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "@AVM/fritzbox.fon_wlan_7270_v3/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
+ default "@AVM/Beta/FRITZ!Box_7270_v3" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE
+ default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7270 v3/english" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_2X
+ default "@AVM/fritzbox.fon_wlan_7270_v3/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_5X
default "@AVM/Downgrade/FRITZ!Box 7312" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_2X
default "@AVM/fritzbox.7312/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_5X
default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7320" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7320 && FREETZ_TYPE_FIRMWARE_05_2X
@@ -1454,7 +1477,7 @@ menu "Override options"
default "@AVM/Downgrade/FRITZ!Box Fon WLAN 7390/english" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_EN
default "@AVM/fritzbox.fon_wlan_7390/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_DE
default "@AVM/fritzbox.fon_wlan_7390/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_EN
- default "@AVM/fritzbox.fon_wlan_7570/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7570
+ default "@AVM/fritzbox.fon_wlan_7570/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7570 && ! FREETZ_TYPE_7570_7270
default "@AVM/fritzbox.sl_wlan/firmware" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3020
default "@AVM/fritzbox.wlan_3030/firmware" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3030
default "@AVM/fritzbox.wlan_3130/firmware" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3130
@@ -1462,7 +1485,7 @@ menu "Override options"
default "@AVM/fritzbox.wlan_3170/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3170
default "@AVM/Downgrade/FRITZ!Box WLAN 3270" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3270_V2 && FREETZ_TYPE_FIRMWARE_05_2X
default "@AVM/fritzbox.wlan_3270/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3270_V2 && FREETZ_TYPE_FIRMWARE_05_5X
- default "@AVM/Downgrade/FRITZ!Box WLAN 3270/FRITZ!Box WLAN 3270 v3" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3270_V3 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_DE
+ default "@AVM/Downgrade/FRITZ!Box WLAN 3270 v3/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3270_V3 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_DE
default "@AVM/fritzbox.wlan_3270_v3/firmware/deutsch" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3270_V3 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_DE
default "@AVM/fritzbox.wlan_3270_v3/firmware/english" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3270_V3 && FREETZ_TYPE_LANG_EN
default "@AVM/Downgrade/FRITZ!Box WLAN 3370" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_2X
@@ -1512,14 +1535,16 @@ menu "Override options"
default "FRITZ.Box_Fon_WLAN_7240.73.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7240 && FREETZ_TYPE_FIRMWARE_05_5X
default "FRITZ.Box_7240_BETA.73.05.50-24717.image" if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7240
default "FRITZ.Box_Fon_WLAN_7270_v1.54.04.88.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7270_V1
- default "FRITZ.Box_Fon_WLAN_7270_v2.54.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
- default "FRITZ.Box_Fon_WLAN_7270_v2.54.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
- default "FRITZ.Box_7270_v2_BETA.74.05.50-24717.image" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE
- default "FRITZ.Box_Fon_WLAN_7270_16.en-de-es-it-fr.54.05.23.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && ! FREETZ_TYPE_LANG_DE
- default "FRITZ.Box_Fon_WLAN_7270_v3.74.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
- default "FRITZ.Box_Fon_WLAN_7270_v3.74.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
- default "FRITZ.Box_7270_v3_BETA.74.05.50-24717.image" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE
- default "FRITZ.Box_Fon_WLAN_7270_v3.en-de-es-it-fr.74.05.23.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && ! FREETZ_TYPE_LANG_DE
+ default "FRITZ.Box_Fon_WLAN_7270_v2.54.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "FRITZ.Box_Fon_WLAN_7270_v2.54.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
+ default "FRITZ.Box_7270_v2_BETA.74.05.50-24717.image" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE
+ default "FRITZ.Box_Fon_WLAN_7270_16.en-de-es-it-fr.54.05.23.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 || FREETZ_TYPE_7570_7270 ) && ! FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "FRITZ.Box_Fon_WLAN_7270_16.en-de-es-it-fr.54.05.51.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 || FREETZ_TYPE_7570_7270 ) && ! FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
+ default "FRITZ.Box_Fon_WLAN_7270_v3.74.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "FRITZ.Box_Fon_WLAN_7270_v3.74.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
+ default "FRITZ.Box_7270_v3_BETA.74.05.50-24717.image" if FREETZ_TYPE_FIRMWARE_LABOR && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE
+ default "FRITZ.Box_Fon_WLAN_7270_v3.en-de-es-it-fr.74.05.23.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270 ) && ! FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "FRITZ.Box_Fon_WLAN_7270_v3.en-de-es-it-fr.74.05.51.image" if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270 ) && ! FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
default "FRITZ.Box_7312.117.05.23.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_2X
default "FRITZ.Box_7312.117.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_5X
default "FRITZ.Box_Fon_WLAN_7320.100.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7320 && FREETZ_TYPE_FIRMWARE_05_2X
@@ -1602,12 +1627,14 @@ menu "Override options"
default "0f3432079ee4ed93ea18896f38b25e84" if FREETZ_TYPE_7240 && FREETZ_TYPE_FIRMWARE_05_2X
default "a02711ff1bd2918d821eecf18fde500e" if FREETZ_TYPE_7240 && FREETZ_TYPE_FIRMWARE_05_5X
default "516cde9ed5f928a581337ccf04b78c63" if FREETZ_TYPE_7270_V1
- default "cef5d5405e18bd995e97e0e00b33346f" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
- default "c8984b0564062e2cdca1b64ca8baecfc" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
- default "f0856b80f7d2ba510748608dac6419a6" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270) && FREETZ_TYPE_LANG_EN
- default "6ebca9c6011d54f678dac33b3d092346" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
- default "dcd88386ff42e9363337aaad9c624cdd" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
- default "0f2406d342e7ce0ce987296bca46cfe6" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270) && FREETZ_TYPE_LANG_EN
+ default "cef5d5405e18bd995e97e0e00b33346f" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "c8984b0564062e2cdca1b64ca8baecfc" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
+ default "f0856b80f7d2ba510748608dac6419a6" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_2X
+ default "ad5612eef0b8a0600d3694c9b2745a12" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_5X
+ default "6ebca9c6011d54f678dac33b3d092346" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
+ default "dcd88386ff42e9363337aaad9c624cdd" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_5X
+ default "0f2406d342e7ce0ce987296bca46cfe6" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_2X
+ default "9c41b236d8b938df09106d6a2c7bb2ba" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_5X
default "ebd51504a3eff88d05f8c69867124044" if FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_2X
default "526fedfd32fadd29dd43edc35e23e1b7" if FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_5X
default "142b80159404938ea0fb5b576fc27fec" if FREETZ_TYPE_7320 && FREETZ_TYPE_FIRMWARE_05_2X
@@ -1659,6 +1686,7 @@ menu "Override options"
FREETZ_TYPE_7240_7270 || \
FREETZ_TYPE_7320_7330 || \
FREETZ_TYPE_7340_7390 || \
+ FREETZ_TYPE_7570_7270 || \
FREETZ_TYPE_W500V_7150 || \
FREETZ_TYPE_W501V || \
FREETZ_TYPE_W701V_7170 || \
@@ -1673,11 +1701,12 @@ menu "Override options"
default "@AVM/fritzbox.fon_wlan_7240/firmware/deutsch" if FREETZ_TYPE_7240_7270
default "@AVM/fritzbox.fon_wlan_7320/firmware/deutsch" if FREETZ_TYPE_7320_7330
default "@AVM/fritzbox.fon_wlan_7340/firmware/english" if FREETZ_TYPE_7340_7390
+ default "@AVM/fritzbox.fon_wlan_7570/firmware/english" if FREETZ_TYPE_7570_7270
default "@TELEKOM/Sinus W 500 V" if FREETZ_TYPE_W500V_7150
default "@TELEKOM/Speedport/Speedport W 701 V" if FREETZ_TYPE_W701V_7170
default "@TELEKOM/Speedport/Speedport W 900V" if FREETZ_TYPE_W900V_7170
default "@AVM/fritzbox.fon_wlan_7270_v2/firmware/english" if FREETZ_TYPE_7270_V1
- default "@TELEKOM/Speedport/Speedport W 920V" if FREETZ_TYPE_W920V_7570
+ default "@TELEKOM/Speedport/Speedport W 920V" if (FREETZ_TYPE_7270_V1 && FREETZ_ADD_ANNEX_A_FIRMWARE)
config FREETZ_DL_SOURCE2
string "AVM alien web interface firmware source" if FREETZ_DL_OVERRIDE
@@ -1690,6 +1719,7 @@ menu "Override options"
FREETZ_TYPE_7240_7270 || \
FREETZ_TYPE_7320_7330 || \
FREETZ_TYPE_7340_7390 || \
+ FREETZ_TYPE_7570_7270 || \
FREETZ_TYPE_W500V_7150 || \
FREETZ_TYPE_W501V || \
FREETZ_TYPE_W701V_7170 || \
@@ -1703,8 +1733,9 @@ menu "Override options"
default "FRITZ.Box_Fon_WLAN_7141.40.04.76.image" if FREETZ_TYPE_7141_7170
default "FRITZ.Box_Fon_WLAN_7240.73.05.22.image" if FREETZ_TYPE_7240_7270
default "FRITZ.Box_Fon_WLAN_7320.100.05.22.image" if FREETZ_TYPE_7320_7330
- default "FRITZ.Box_Fon_WLAN_7270_v2.en-de-es-it-fr.54.04.90.image" if FREETZ_TYPE_7270_V1
+ default "FRITZ.Box_Fon_WLAN_7270_v2.en-de-es-it-fr.54.04.90.image" if FREETZ_TYPE_7240_7270
default "FRITZ.Box_Fon_WLAN_7340.en-de-es-it-fr.99.05.22.image" if FREETZ_TYPE_7340_7390
+ default "FRITZ.Box_Fon_WLAN_7570_vDSL.en-de-fr.75.04.91.image" if FREETZ_TYPE_7570_7270
default "Sinus_W_500V.27.04.27.image" if FREETZ_TYPE_W500V_7150
default "fritz.box_fon_wlan_7141.40.04.37.image" if FREETZ_TYPE_W501V
default "fw_Speedport_W701V_v33.04.57.image" if FREETZ_TYPE_W701V_7170
@@ -1722,6 +1753,7 @@ menu "Override options"
FREETZ_TYPE_7240_7270 || \
FREETZ_TYPE_7320_7330 || \
FREETZ_TYPE_7340_7390 || \
+ FREETZ_TYPE_7570_7270 || \
FREETZ_TYPE_W500V_7150 || \
FREETZ_TYPE_W501V || \
FREETZ_TYPE_W701V_7170 || \
@@ -1737,6 +1769,7 @@ menu "Override options"
default "142b80159404938ea0fb5b576fc27fec" if FREETZ_TYPE_7320_7330
default "d887def011101bdc6836d8a84b17b62e" if FREETZ_TYPE_7340_7390
default "716e136d91ab153f028d1a4e13390f71" if FREETZ_TYPE_7270_V1
+ default "caa18aa1888a6b4990fccaf386d1d86a" if FREETZ_TYPE_7570_7270
default "c49167da6dca42cdb34fbffbaf2c4097" if FREETZ_TYPE_W501V
default "e34713bd989c3e266a4650c133582510" if FREETZ_TYPE_W701V_7170
default "dd6f7461976c64b9808d2cf74ab4532f" if FREETZ_TYPE_W900V_7170
@@ -1759,7 +1792,7 @@ source Config.in.custom
### everything below is not visible
-source Config.in.has_avm
+source Config.in.avm
comment "Custom options -------------------------"
@@ -1779,7 +1812,7 @@ config FREETZ_INSTALL_BASE
select FREETZ_LIB_librt
select FREETZ_LIB_libubacktrace if FREETZ_TARGET_UCLIBC_REQUIRES_libubacktrace
select FREETZ_LIB_libuClibc
- select FREETZ_LIB_libctlmgr if FREETZ_HAS_AVM_USB_HOST
+ select FREETZ_LIB_libctlmgr if FREETZ_AVM_HAS_USB_HOST
default y
help
This is mandatory
@@ -2022,8 +2055,8 @@ config FREETZ_TYPE_PREFIX
default "7170" if FREETZ_TYPE_7170
default "7240" if FREETZ_TYPE_7240
default "7270_v1" if FREETZ_TYPE_7270_V1
- default "7270_v2" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270)
- default "7270_v3" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270)
+ default "7270_v2" if ((FREETZ_TYPE_7270_V2 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7270_7270 || FREETZ_TYPE_7570_7270)
+ default "7270_v3" if ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270)
default "7312" if FREETZ_TYPE_7312
default "7320" if FREETZ_TYPE_7320
default "7330" if FREETZ_TYPE_7330_XL
@@ -2062,3 +2095,5 @@ config FREETZ_TYPE_PREFIX_ALIEN_HARDWARE
default "7270v1_" if FREETZ_TYPE_7270_7270
default "7270v2_" if FREETZ_TYPE_72702_72701
default "7320_" if FREETZ_TYPE_7320_7330
+ default "7570_" if FREETZ_TYPE_7570_7270
+
View
380 Config.in.has_avm → Config.in.avm
@@ -1,4 +1,8 @@
+###
+### firmware definitions
+###
+
config FREETZ_REPLACE_KERNEL_AVAILABLE
bool
depends on \
@@ -9,7 +13,7 @@ config FREETZ_REPLACE_KERNEL_AVAILABLE
! FREETZ_TYPE_6810
default y
help
- Select this if current source code is available for you box.
+ Select this if source code exactly matching the firmware version used is available for your box.
config FREETZ_REPLACE_MODULE_AVAILABLE
bool
@@ -19,8 +23,8 @@ config FREETZ_REPLACE_MODULE_AVAILABLE
(FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_7390)
default y
help
- Select this if only old source code is available for you box.
- Hint: Loading of the build modules may work or not!
+ Select this if only source code from a previous firmware version is available for your box.
+ Note: Loading of the modules built by Freetz may work or may not!
config FREETZ_DOWNLOAD_TOOLCHAIN_AVAILABLE
bool
@@ -28,7 +32,7 @@ config FREETZ_DOWNLOAD_TOOLCHAIN_AVAILABLE
# default n if FREETZ_AVM_UCLIBC_0_9_33
# default y
-config FREETZ_HAS_AVM_LABOR
+config FREETZ_AVM_HAS_LABOR
bool "Has AVM Labor Firmware" if FREETZ_TYPE_CUSTOM
default y if \
( FREETZ_TYPE_LANG_DE && ( \
@@ -38,84 +42,9 @@ config FREETZ_HAS_AVM_LABOR
))
default n
help
- Select this if a labor firmware is available for you box.
-
-###
-### uClibc version used by AVM in the original firmware
-###
-
-config FREETZ_AVM_UCLIBC_0_9_28
- bool
- default y if \
- ! FREETZ_AVM_UCLIBC_0_9_29 && \
- ! FREETZ_AVM_UCLIBC_0_9_32 && \
- ! FREETZ_AVM_UCLIBC_0_9_33
- default n
-
-config FREETZ_AVM_UCLIBC_0_9_29
- bool
- default y if \
- FREETZ_TYPE_5124 || \
- FREETZ_TYPE_7112 || \
- FREETZ_TYPE_7113 && FREETZ_TYPE_LANG_EN || \
- (FREETZ_TYPE_7140 && (FREETZ_TYPE_LANG_EN || FREETZ_TYPE_LANG_A_CH)) || \
- FREETZ_TYPE_7141 || \
- FREETZ_TYPE_7150 || \
- FREETZ_TYPE_7170 || \
- FREETZ_TYPE_7270_V1 || \
- FREETZ_TYPE_7570
- default n
-
-config FREETZ_AVM_UCLIBC_0_9_32
- bool
- default y if \
- FREETZ_TYPE_3270 || \
- FREETZ_TYPE_3370 || \
- FREETZ_TYPE_3390 || \
- FREETZ_TYPE_6810 || \
- FREETZ_TYPE_6840 || \
- FREETZ_TYPE_7240 || \
- FREETZ_TYPE_7270_16 || \
- FREETZ_TYPE_7312 || \
- FREETZ_TYPE_7320 || \
- FREETZ_TYPE_7330 || \
- FREETZ_TYPE_7340 || \
- FREETZ_TYPE_7360 || \
- (FREETZ_TYPE_7390 && !FREETZ_TYPE_FIRMWARE_LABOR)
- default n
-
-config FREETZ_AVM_UCLIBC_0_9_33
- bool
- default y if \
- (FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_LABOR)
- default n
-
-config FREETZ_AVM_UCLIBC_NPTL_ENABLED
- bool
- default y if FREETZ_AVM_UCLIBC_0_9_33
- default n
-
-###
-### GCC version used by AVM to compile the kernel and all the binaries/libraries
-###
+ Select this if a labor firmware is available for your box.
-config FREETZ_AVM_GCC_3_4
- bool
- default y if FREETZ_KERNEL_VERSION_2_6_19_MAX
- default n
-
-config FREETZ_AVM_GCC_4_6
- bool
- default y if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_AVM_UCLIBC_0_9_33
- default n
-
-config FREETZ_AVM_GCC_4_7
- bool
- default y if FREETZ_KERNEL_VERSION_2_6_28_MIN && FREETZ_AVM_UCLIBC_0_9_33
- default n
-
-
-config FREETZ_HAS_AVM_FW55X
+config FREETZ_AVM_HAS_FW55X
bool "Has AVM Firmware 05.5x" if FREETZ_TYPE_CUSTOM
default y if \
( FREETZ_TYPE_LANG_DE && ( \
@@ -135,6 +64,7 @@ config FREETZ_HAS_AVM_FW55X
|| \
( FREETZ_TYPE_LANG_EN && ( \
FREETZ_TYPE_6840 || \
+ FREETZ_TYPE_7270_16 || \
FREETZ_TYPE_7330_XL || \
FREETZ_TYPE_7340 || \
FREETZ_TYPE_7360_XL || \
@@ -142,9 +72,9 @@ config FREETZ_HAS_AVM_FW55X
))
default n
help
- Select this if your box has firmware versions 05.5x.
+ Select this if a Fritz!OS-05.5x based firmware is available for your box.
-config FREETZ_HAS_AVM_FW52X
+config FREETZ_AVM_HAS_FW52X
bool "Has AVM Firmware 05.2x" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_3270 || \
@@ -161,18 +91,18 @@ config FREETZ_HAS_AVM_FW52X
FREETZ_TYPE_7390
default n
help
- Select this if your box has firmware versions 05.2x.
+ Select this if a Fritz!OS-05.2x based firmware is available for your box.
-config FREETZ_HAS_AVM_FW4XX
+config FREETZ_AVM_HAS_FW4XX
bool "Has AVM Firmware 04.xx" if FREETZ_TYPE_CUSTOM
default y if \
- ! FREETZ_HAS_AVM_FW52X && \
- ! FREETZ_HAS_AVM_FW55X
+ ! FREETZ_AVM_HAS_FW52X && \
+ ! FREETZ_AVM_HAS_FW55X
default n
help
- Select this if your box has firmware versions 05.2x.
+ Select this if a 04.xx-firmware is available for your box.
-config FREETZ_HAS_AVM_FWEWE
+config FREETZ_AVM_HAS_FWEWE
bool "Has EWE Edition Firmware" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_LANG_EN && ( \
@@ -181,9 +111,9 @@ config FREETZ_HAS_AVM_FWEWE
)
default n
help
- Select this if a EWE Edition firmware is available for you box.
+ Select this if a EWE Edition firmware is available for your box.
-config FREETZ_HAS_AVM_LANG_DE
+config FREETZ_AVM_HAS_LANG_DE
bool "Has AVM Firmware language de/deutsch" if FREETZ_TYPE_CUSTOM
default y if \
! ( \
@@ -196,7 +126,7 @@ config FREETZ_HAS_AVM_LANG_DE
help
Select this if a de/german firmware is available for your box.
-config FREETZ_HAS_AVM_LANG_A_CH
+config FREETZ_AVM_HAS_LANG_A_CH
bool "Has AVM Firmware language a-ch/deutsch" if FREETZ_TYPE_CUSTOM
depends on \
FREETZ_TYPE_5010 || \
@@ -206,7 +136,7 @@ config FREETZ_HAS_AVM_LANG_A_CH
help
Select this if a a-ch/german firmware is available for your box.
-config FREETZ_HAS_AVM_LANG_EN
+config FREETZ_AVM_HAS_LANG_EN
bool "Has AVM Firmware language en/international" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_FON || \
@@ -226,18 +156,101 @@ config FREETZ_HAS_AVM_LANG_EN
FREETZ_TYPE_3270_V3
default n
help
- Select this if a en/international firmware is available for your box.
+ Select this if an en/international firmware is available for your box.
-config FREETZ_HAS_AVM_PRINTK
+###
+### uClibc version used by AVM in the original firmware
+###
+
+
+config FREETZ_AVM_UCLIBC_0_9_28
+ bool
+ default y if \
+ ! FREETZ_AVM_UCLIBC_0_9_29 && \
+ ! FREETZ_AVM_UCLIBC_0_9_32 && \
+ ! FREETZ_AVM_UCLIBC_0_9_33
+ default n
+
+config FREETZ_AVM_UCLIBC_0_9_29
+ bool
+ default y if \
+ FREETZ_TYPE_5124 || \
+ FREETZ_TYPE_7112 || \
+ FREETZ_TYPE_7113 && FREETZ_TYPE_LANG_EN || \
+ (FREETZ_TYPE_7140 && (FREETZ_TYPE_LANG_EN || FREETZ_TYPE_LANG_A_CH)) || \
+ FREETZ_TYPE_7141 || \
+ FREETZ_TYPE_7150 || \
+ FREETZ_TYPE_7170 || \
+ FREETZ_TYPE_7270_V1 || \
+ FREETZ_TYPE_7570
+ default n
+
+config FREETZ_AVM_UCLIBC_0_9_32
+ bool
+ default y if \
+ FREETZ_TYPE_3270 || \
+ FREETZ_TYPE_3370 || \
+ FREETZ_TYPE_3390 || \
+ FREETZ_TYPE_6810 || \
+ FREETZ_TYPE_6840 || \
+ FREETZ_TYPE_7240 || \
+ FREETZ_TYPE_7270_16 || \
+ FREETZ_TYPE_7312 || \
+ FREETZ_TYPE_7320 || \
+ FREETZ_TYPE_7330 || \
+ FREETZ_TYPE_7340 || \
+ FREETZ_TYPE_7360 || \
+ (FREETZ_TYPE_7390 && !FREETZ_TYPE_FIRMWARE_LABOR)
+ default n
+
+config FREETZ_AVM_UCLIBC_0_9_33
+ bool
+ default y if \
+ (FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_LABOR)
+ default n
+
+config FREETZ_AVM_UCLIBC_NPTL_ENABLED
+ bool
+ default y if FREETZ_AVM_UCLIBC_0_9_33
+ default n
+
+
+###
+### GCC version used by AVM to compile the kernel and all the binaries/libraries
+###
+
+
+config FREETZ_AVM_GCC_3_4
+ bool
+ default y if FREETZ_KERNEL_VERSION_2_6_19_MAX
+ default n
+
+config FREETZ_AVM_GCC_4_6
+ bool
+ default y if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_AVM_UCLIBC_0_9_33
+ default n
+
+config FREETZ_AVM_GCC_4_7
+ bool
+ default y if FREETZ_KERNEL_VERSION_2_6_28_MIN && FREETZ_AVM_UCLIBC_0_9_33
+ default n
+
+
+###
+###
+###
+
+
+config FREETZ_AVM_HAS_PRINTK
bool "Has AVM printk support" if FREETZ_TYPE_CUSTOM
default y if \
! (FREETZ_TYPE_3170 && !FREETZ_REPLACE_KERNEL)
default n
help
- Select this if your box has printk support.
+ Select this if the original firmware has printk support.
-config FREETZ_HAS_AVM_PIGLET
+config FREETZ_AVM_HAS_PIGLET
bool "Has PIGLET file(s)" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_2170 || \
@@ -253,23 +266,21 @@ config FREETZ_HAS_AVM_PIGLET
FREETZ_TYPE_7141 || \
FREETZ_TYPE_7150 || \
FREETZ_TYPE_7170 || \
- FREETZ_TYPE_7270_V1 || \
- FREETZ_TYPE_7270_V2 || \
FREETZ_TYPE_7340
default n
help
- Select this if your original kernel has pty support.
+ Select this if the original firmware has separate piglet files for ISDN and POTS.
-config FREETZ_HAS_AVM_PTY_SUPPORT
+config FREETZ_AVM_HAS_PTY_SUPPORT
bool "Has PTY support" if FREETZ_TYPE_CUSTOM
default n if \
FREETZ_TYPE_5140 || \
FREETZ_TYPE_W501V
default y
help
- Select this if your original kernel has pty support.
+ Select this if the original kernel has pty support.
-config FREETZ_HAS_AVM_CDROM_ISO
+config FREETZ_AVM_HAS_CDROM_ISO
bool "Has AVM cdrom.iso" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_300IP || \
@@ -280,23 +291,22 @@ config FREETZ_HAS_AVM_CDROM_ISO
FREETZ_TYPE_3030
default n
help
- Select this if your original firmware has a cdrom.iso.
+ Select this if the original firmware contains cdrom.iso module.
-config FREETZ_HAS_AVM_AURA_USB
- bool "Has remote USB connection (AURA = AVM USB Remote-Architcture)" if FREETZ_TYPE_CUSTOM
- select FREETZ_REMOVE_AURA_USB if ! FREETZ_HAS_AVM_USB_HOST
+config FREETZ_AVM_HAS_AURA_USB
+ bool "Has remote USB connection (AURA = AVM USB Remote-Architecture)" if FREETZ_TYPE_CUSTOM
+ select FREETZ_REMOVE_AURA_USB if ! FREETZ_AVM_HAS_USB_HOST
default y if \
- FREETZ_HAS_AVM_USB_HOST || \
+ FREETZ_AVM_HAS_USB_HOST || \
FREETZ_TYPE_7112_7170 || \
FREETZ_TYPE_7113_7170 || \
FREETZ_TYPE_W701V_7170
default n
help
- Select this if your original firmware has an aura-usb-daemon (remote USB
- connection, USB-Fernanschluss)
+ Select this if the original firmware contains aura-usb daemon (remote USB connection, USB-Fernanschluss).
-config FREETZ_HAS_AVM_MINID
- bool "Has mini-daemon (minid)" if FREETZ_TYPE_CUSTOM
+config FREETZ_AVM_HAS_MINID
+ bool "Has mini daemon (minid)" if FREETZ_TYPE_CUSTOM
select FREETZ_REMOVE_MINID if \
FREETZ_TYPE_7113_7170 || \
FREETZ_TYPE_7112_7170 || \
@@ -308,9 +318,9 @@ config FREETZ_HAS_AVM_MINID
FREETZ_TYPE_7270_V1
default n
help
- Select this if your original firmware has a mini-daemon (minid)
+ Select this if the original firmware contains mini daemon (minid).
-config FREETZ_HAS_AVM_NTFS
+config FREETZ_AVM_HAS_NTFS
bool "Has AVM NTFS" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_AVM_VERSION_05_2X_MIN || \
@@ -318,9 +328,9 @@ config FREETZ_HAS_AVM_NTFS
FREETZ_TYPE_7570
default n
help
- Select this if your original firmware has ntfs support.
+ Select this if the original firmware has NTFS support.
-config FREETZ_HAS_AVM_IPV6
+config FREETZ_AVM_HAS_IPV6
bool "Has AVM IPv6" if FREETZ_TYPE_CUSTOM
select FREETZ_TARGET_IPV6_SUPPORT
default y if \
@@ -330,7 +340,7 @@ config FREETZ_HAS_AVM_IPV6
help
Select this if your original firmware has IPv6 support.
-config FREETZ_HAS_AVM_WEBDAV
+config FREETZ_AVM_HAS_WEBDAV
bool "Has AVM WebDAV" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_AVM_VERSION_05_2X_MIN || \
@@ -338,9 +348,9 @@ config FREETZ_HAS_AVM_WEBDAV
FREETZ_TYPE_7570
default n
help
- Select this if your original firmware has WebDAV support.
+ Select this if the original firmware has WebDAV support.
-config FREETZ_HAS_AVM_INETD
+config FREETZ_AVM_HAS_INETD
bool "Has AVM inetd" if FREETZ_TYPE_CUSTOM
select FREETZ_PACKAGE_INETD
default y if \
@@ -350,16 +360,16 @@ config FREETZ_HAS_AVM_INETD
FREETZ_TYPE_7570
default n
help
- Select this if your original firmware has inetd support.
+ Select this if the original firmware contains inetd daemon.
-config FREETZ_HAS_AVM_EXT3
+config FREETZ_AVM_HAS_EXT3
bool "Has AVM ext3 built into the kernel" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if your original firmware has ext3 support built into the kernel.
+ Select this if the original firmware has ext3 module built into the kernel.
-config FREETZ_HAS_AVM_ISOFS
+config FREETZ_AVM_HAS_ISOFS
bool "Has AVM isofs kernel module" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_5124 || \
@@ -369,9 +379,9 @@ config FREETZ_HAS_AVM_ISOFS
FREETZ_TYPE_7170
default n
help
- Select this if your original firmware contains isofs kernel module.
+ Select this if the original firmware contains isofs kernel module.
-config FREETZ_HAS_AVM_TR069
+config FREETZ_AVM_HAS_TR069
bool "Has AVM tr069" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_AVM_VERSION_05_2X_MIN || \
@@ -397,9 +407,9 @@ config FREETZ_HAS_AVM_TR069
FREETZ_TYPE_3020
default n
help
- Select this if your original firmware has tr069 support (libtr069, libtr064).
+ Select this if the original firmware has tr069 support (libtr069, libtr064).
-config FREETZ_HAS_AVM_TR069_FWUPDATE
+config FREETZ_AVM_HAS_TR069_FWUPDATE
bool "Has AVM tr069fwupdate" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_AVM_VERSION_05_2X_MIN || \
@@ -419,9 +429,9 @@ config FREETZ_HAS_AVM_TR069_FWUPDATE
FREETZ_TYPE_7570
default n
help
- Select this if your original firmware has tr069fwupdate (for MT-D).
+ Select this if the original firmware contains tr069fwupdate binary (for MT-D).
-config FREETZ_HAS_AVM_CHRONYD
+config FREETZ_AVM_HAS_CHRONYD
bool "Has chronyd" if FREETZ_TYPE_CUSTOM
select FREETZ_AVMDAEMON_DISABLE_NTP if ! FREETZ_REMOVE_CHRONYD
default y if \
@@ -429,9 +439,9 @@ config FREETZ_HAS_AVM_CHRONYD
FREETZ_TYPE_7570
default n
help
- Select this if you have a box with chronyd.
+ Select this if the original firmware contains chronyd daemon.
-config FREETZ_HAS_AVM_DECT
+config FREETZ_AVM_HAS_DECT
bool "Has DECT" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_6810 || \
@@ -449,10 +459,10 @@ config FREETZ_HAS_AVM_DECT
FREETZ_TYPE_W900V_7170
default n
help
- Select this if you have a box with DECT.
+ Select this if your box has DECT support.
-config FREETZ_HAS_AVM_OPENSSL_LIBS
- bool "Has libssl" if FREETZ_TYPE_CUSTOM
+config FREETZ_AVM_HAS_OPENSSL_LIBS
+ bool "Has OpenSSL libraries" if FREETZ_TYPE_CUSTOM
default n if \
FREETZ_TYPE_300IP || \
FREETZ_TYPE_5010 || \
@@ -465,23 +475,23 @@ config FREETZ_HAS_AVM_OPENSSL_LIBS
FREETZ_TYPE_3030
default y
help
- Select this if you have a box with AVM libcrypto and libssl.
+ Select this if the original firmware contains AVM version of OpenSSL libraries (libcrypto/libssl).
-config FREETZ_HAS_AVM_LSOF
+config FREETZ_AVM_HAS_LSOF
bool "Has lsof" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if you have a box with lsof binary.
+ Select this if the original firmware contains lsof binary.
-config FREETZ_HAS_AVM_SOCAT
+config FREETZ_AVM_HAS_SOCAT
bool "Has socat" if FREETZ_TYPE_CUSTOM
default y if FREETZ_TYPE_7390
default n
help
- Select this if you have a box with socat binary.
+ Select this if the original firmware contains socat binary.
-config FREETZ_HAS_AVM_NAS
+config FREETZ_AVM_HAS_NAS
bool "Has NAS" if FREETZ_TYPE_CUSTOM
select FREETZ_BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
default y if FREETZ_AVM_VERSION_05_2X_MIN
@@ -489,21 +499,21 @@ config FREETZ_HAS_AVM_NAS
help
Select this if you have a box with NAS support.
-config FREETZ_HAS_AVM_MYFRITZ
+config FREETZ_AVM_HAS_MYFRITZ
bool "Has AVM MyFritz" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if you have a firmware with MyFritz.
+ Select this if the original firmware contains MyFritz component.
-config FREETZ_HAS_AVM_FHEM
+config FREETZ_AVM_HAS_FHEM
bool "Has AVM FHEM" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if the firmware supports FHEM.
+ Select this if the original firmware supports FHEM.
-config FREETZ_HAS_AVM_PHONE
+config FREETZ_AVM_HAS_PHONE
bool "Has Phone" if FREETZ_TYPE_CUSTOM
default n if \
FREETZ_TYPE_2170 || \
@@ -517,15 +527,15 @@ config FREETZ_HAS_AVM_PHONE
help
Select this if you have a box with phone support.
-config FREETZ_HAS_AVM_STRACE
+config FREETZ_AVM_HAS_STRACE
bool "Has strace" if FREETZ_TYPE_CUSTOM
# default y if \
# FREETZ_TYPE_3370
default n
help
- Select this if you have a box with strace binary.
+ Select this if the original firmware contains strace binary.
-config FREETZ_HAS_AVM_TAM
+config FREETZ_AVM_HAS_TAM
bool "Has TAM" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_6810 || \
@@ -546,14 +556,14 @@ config FREETZ_HAS_AVM_TAM
help
Select this if you have a box with TAM (Telephone Answering Machine) support.
-config FREETZ_HAS_AVM_UDEV
+config FREETZ_AVM_HAS_UDEV
bool "udev" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if you have a box with udev.
+ Select this if the original firmware contains udev-based device manager.
-config FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE
+config FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE
bool "Has update filesystem image" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_3370 || \
@@ -561,10 +571,10 @@ config FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE
FREETZ_TYPE_6840
default n
help
- Select this if you have a box with an update filesystem image.
+ Select this if you have a box with an "update filesystem"-image.
-config FREETZ_HAS_USB_CLIENT
- bool "USB client" if FREETZ_TYPE_CUSTOM
+config FREETZ_AVM_HAS_ETHERNET_OVER_USB
+ bool "Ethernet over USB" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_2170 || \
FREETZ_TYPE_300IP || \
@@ -578,9 +588,10 @@ config FREETZ_HAS_USB_CLIENT
FREETZ_TYPE_3170
default n
help
- Select this if you have a box with USB.
+ Select this if your box has support for Ethernet-over-USB,
+ i.e. it has USB port but no USB host controller.
-config FREETZ_HAS_AVM_USB_HOST
+config FREETZ_AVM_HAS_USB_HOST
bool "USB host" if FREETZ_TYPE_CUSTOM
default n if \
FREETZ_TYPE_300IP || \
@@ -602,11 +613,11 @@ config FREETZ_HAS_AVM_USB_HOST
FREETZ_TYPE_3030
default y
help
- Select this if your USB port is a host adapter (which was not designed by AVM).
+ Select this if your box has USB host controller.
-config FREETZ_HAS_AVM_USB_HOST_AHCI
+config FREETZ_AVM_HAS_USB_HOST_AHCI
bool "AVM USB host (AHCI)" if FREETZ_TYPE_CUSTOM
- depends on FREETZ_HAS_AVM_USB_HOST
+ depends on FREETZ_AVM_HAS_USB_HOST
default y if \
FREETZ_TYPE_2170 || \
FREETZ_TYPE_5124 || \
@@ -619,18 +630,17 @@ config FREETZ_HAS_AVM_USB_HOST_AHCI
FREETZ_TYPE_3170
default n
help
- Select this if your USB port is a host adapter
- named AHCI (= AVM [USB] Host Controller Interface).
- Hint: No support for "Low Speed" devices.
+ Select this if your box has USB host controller named AHCI (= AVM [USB] Host Controller Interface).
+ Note: No support for "low speed" devices.
-config FREETZ_HAS_AVM_E2FSPROGS
+config FREETZ_AVM_HAS_E2FSPROGS
bool "Has AVM e2fsprogs files" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if you have a firmware with blkid, fsck and mkfs.
+ Select this if the original firmware contains binaries from e2fsprogs package (blkid, fsck, mkfs, etc).
-config FREETZ_HAS_AVM_WLAN
+config FREETZ_AVM_HAS_WLAN
bool "Has WLAN" if FREETZ_TYPE_CUSTOM
default n if \
FREETZ_TYPE_2170 || \
@@ -642,18 +652,18 @@ config FREETZ_HAS_AVM_WLAN
FREETZ_TYPE_5140
default y
help
- Select this if you have a box with WLAN.
+ Select this if you have a box with WLAN support.
-config FREETZ_HAS_AVM_UMTS
+config FREETZ_AVM_HAS_UMTS
bool "Has UMTS" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_AVM_VERSION_05_2X_MIN || \
FREETZ_TYPE_7270_V1
default n
help
- Select this if you have a box with UMTS.
+ Select this if you have a box with UMTS support.
-config FREETZ_HAS_AVM_JFFS2
+config FREETZ_AVM_HAS_JFFS2
bool "Has jffs2.ko" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_7150 || \
@@ -668,9 +678,9 @@ config FREETZ_HAS_AVM_JFFS2
FREETZ_TYPE_3270
default n
help
- Select this if you have a box with optional JFFS2 filesystem (jffs2.ko).
+ Select this if you have a box with optional JFFS2 filesystem support (jffs2.ko).
-config FREETZ_HAS_AVM_JUNK_BYTES
+config FREETZ_AVM_HAS_JUNK_BYTES
bool "Has AVM junk bytes in SquashFS" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_6810 || \
@@ -678,10 +688,10 @@ config FREETZ_HAS_AVM_JUNK_BYTES
FREETZ_TYPE_7390
default n
help
- Select this if you have a firmware with junk bytes in SquashFS, as
- described in http://freetz.org/ticket/1614#comment:70
+ Select this if the original firmware image contains junk bytes in SquashFS,
+ see http://freetz.org/ticket/1614#comment:70 for more information.
-config FREETZ_HAS_AVM_MICROVOIP_DSL
+config FREETZ_AVM_HAS_MICROVOIP_DSL
bool "Has microvoip-dsl.bin" if FREETZ_TYPE_CUSTOM
default y if \
FREETZ_TYPE_FON || \
@@ -701,9 +711,9 @@ config FREETZ_HAS_AVM_MICROVOIP_DSL
# FREETZ_TYPE_5113
default n
help
- Select this if firmware contains microvoip-dsl.bin.
+ Select this if the original firmware contains microvoip-dsl.bin.
-config FREETZ_HAS_AVM_ANNEX_A_AND_B
+config FREETZ_AVM_HAS_ANNEX_A_AND_B
bool "Has Annex A and B" if FREETZ_TYPE_CUSTOM
default y if FREETZ_TYPE_LANG_EN && \
( \
@@ -716,25 +726,27 @@ config FREETZ_HAS_AVM_ANNEX_A_AND_B
)
default n
help
- Select this if a firmware for Annex A and B is available.
+ Select this if two different firmware images are available for your box
+ one supporting Annex A and another one supporting Annex B.
-config FREETZ_HAS_AVM_MULTI_ANNEX
+config FREETZ_AVM_HAS_MULTI_ANNEX
bool "Has AVM Multi-Annex" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if you have a firmware with Multi-Annex.
+ Select this if the original firmware has Multi-Annex support,
+ i.e. the same firmware image can be used both for Annex A and B.
-config FREETZ_HAS_AVM_RAMZSWAP
+config FREETZ_AVM_HAS_RAMZSWAP
bool "Has AVM ramzswap.ko" if FREETZ_TYPE_CUSTOM
default y if FREETZ_AVM_VERSION_05_2X_MIN
default n
help
- Select this if you have a firmware with ramzswap.ko.
+ Select this if the original firmware contains ramzswap.ko module.
-config FREETZ_HAS_AVM_AHA
+config FREETZ_AVM_HAS_AHA
bool "Has AVM Home Automation" if FREETZ_TYPE_CUSTOM
- default y if FREETZ_AVM_VERSION_05_5X_MIN && FREETZ_HAS_AVM_DECT
+ default y if FREETZ_AVM_VERSION_05_5X_MIN && FREETZ_AVM_HAS_DECT
default n
help
- Select this if you have a firmware with AHA (AVM Home Automation).
+ Select this if the original firmware contains support for AHA (AVM Home Automation).
View
4 FIRMWARES
@@ -91,6 +91,8 @@ Currently supported boxes and firmwares
* Labor 74.05.50 rev24717
* Alien 7270 v1
* 54/74.05.23 rev22845 (International)
+ * 54/74.05.51 rev25395 (International)
+ * Alien 7570 (International)
* Fritz!Box Fon WLAN 7312
* 117.05.23 rev22847
@@ -150,3 +152,5 @@ Currently supported boxes and firmwares
* 7270v2: AVM 7270v1
* 7320: AVM 7330
* 7340: AVM 7390
+ * 7570: AVM 7270 (International)
+
View
2  Makefile
@@ -340,7 +340,7 @@ $(eval $(call CONFIG_CLEAN_DEPS,config-clean-deps-keep-busybox,kernel modules$(_
common-clean:
./fwmod_custom clean
- $(RM) .static .dynamic .exclude-dist-tmp $(CONFIG_IN_CACHE)
+ $(RM) .static .dynamic .packages .exclude-dist-tmp $(CONFIG_IN_CACHE)
$(RM) -r $(BUILD_DIR)
$(RM) -r $(FAKEROOT_CACHE_DIR)
View
24 fwmod
@@ -230,9 +230,9 @@ else
MKSQUASHFS_OPTIONS+=" -le"
fi
-# Use FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE etc. to determine correct mksquashfs tool
+# Use FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE etc. to determine correct mksquashfs tool
# TODO: Add new symbols for SquashFS version and LZMA compression to Config.in
-if [ "${FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
+if [ "${FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
MKSQUASHFS="${TOOLS_DIR}/mksquashfs3"
MKSQUASHFS_OPTIONS+=" -no-progress -no-exports -no-sparse"
elif [ "$FREETZ_KERNEL_VERSION_2_6_13" -a ! "$FREETZ_REPLACE_KERNEL" == "y" ]; then
@@ -332,7 +332,7 @@ HTML_DIR="${FILESYSTEM_DIR}/${HTML_SUBDIR}"
RAW_KERNEL="${KERNEL_DIR}/${RAW_KERNEL_FILE}"
RAW_FILESYSTEM="${KERNEL_DIR}/${RAW_HIDDEN_FILE}"
KERNEL="${FIRMWARE_DIR}/${KERNEL_IMAGE}"
-if [ "${FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
+if [ "${FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
FILESYSTEM="$FILESYSTEM_CORE_DIR/$FILESYSTEM_CORE_IMAGE"
else
FILESYSTEM="${RAW_FILESYSTEM}"
@@ -410,9 +410,9 @@ if [ "$DO_UNPACK" -gt 0 ]; then
done
# Remove AVM's special junk bytes from SquashFS
- if [ "$FREETZ_HAS_AVM_JUNK_BYTES" == "y" ]; then
+ if [ "$FREETZ_AVM_HAS_JUNK_BYTES" == "y" ]; then
echo0 "removing AVM SquashFS junk bytes"
- [ "$FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE" == "y" ] && JUNK_BYTES_FILE="${FIRMWARE_DIR}/${FILESYSTEM_IMAGE}" || JUNK_BYTES_FILE="$KERNEL"
+ [ "$FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE" == "y" ] && JUNK_BYTES_FILE="${FIRMWARE_DIR}/${FILESYSTEM_IMAGE}" || JUNK_BYTES_FILE="$KERNEL"
[ "$FREETZ_VERBOSITY_LEVEL" -lt 2 ] && $redirect=">/dev/null 2>&1"
"${REMOVE_JUNK}" "$JUNK_BYTES_FILE" "$JUNK_BYTES_FILE.nojunk" $redirect
[ $? -eq 0 ] || error 1 "AVM SquashFS junk bytes not found"
@@ -423,7 +423,7 @@ if [ "$DO_UNPACK" -gt 0 ]; then
"$RMTICHKSUM" -f "${FIRMWARE_DIR}/${FILESYSTEM_IMAGE}" > /dev/null
mkdir -p "$KERNEL_DIR"
- if [ "${FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
+ if [ "${FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
cp "${KERNEL}" "${RAW_KERNEL}"
echo "unpacking update image"
@@ -438,7 +438,7 @@ if [ "$DO_UNPACK" -gt 0 ]; then
if [ ! -r "$RAW_KERNEL" -o ! -r "$FILESYSTEM" ]; then
if [ -r "${FIRMWARE_DIR}/${FILESYSTEM_IMAGE}" ] && [ $(stat -c %s "${FIRMWARE_DIR}/${FILESYSTEM_IMAGE}") -gt 0 ]; then
- _config_hint=" - maybe you should configure a firmware with FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE"
+ _config_hint=" - maybe you should configure a firmware with FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE"
fi
error 1 "kernel splitting failed${_config_hint}"
fi
@@ -508,7 +508,7 @@ FILESYSTEM_MOD="${FIRMWARE_MOD_DIR}/${FILESYSTEM_IMAGE}"
RAW_KERNEL_MOD="${KERNEL_MOD_DIR}/${RAW_KERNEL_FILE}"
RAW_FILESYSTEM_MOD="${KERNEL_MOD_DIR}/${RAW_HIDDEN_FILE}"
-if [ "${FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
+if [ "${FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
CORE_FILESYSTEM_MOD="${FILESYSTEM_CORE_MOD_DIR}/${FILESYSTEM_CORE_IMAGE}"
else
CORE_FILESYSTEM_MOD="$RAW_FILESYSTEM_MOD"
@@ -625,7 +625,7 @@ if [ "$DO_MOD" -gt 0 ]; then
# Copy the unpacked directory
mkdir -p "$MOD_DIR"
- [ "$FREETZ_HAS_AVM_UDEV" == y ] || exclude_dev="--exclude=./filesystem/dev"
+ [ "$FREETZ_AVM_HAS_UDEV" == y ] || exclude_dev="--exclude=./filesystem/dev"
"$TAR" -c -C "$ORG_DIR" $exclude_dev . | "$TAR" -x -C "$MOD_DIR" || exit 1
# Fix some permissions
@@ -1341,7 +1341,7 @@ if [ "$action_names" ]; then
[ ! -s "$VARTAR_MOD" ] && error 1 "packing of var.tar failed"
- [ "$FREETZ_HAS_AVM_UDEV" == "y" ] || \
+ [ "$FREETZ_AVM_HAS_UDEV" == "y" ] || \
$MAKEDEVS -d $MAKEDEVS_FILE $FILESYSTEM_MOD_DIR > $MOD_DIR/filesystem.log 2>&1
fi
@@ -1377,7 +1377,7 @@ if [ "$DO_PACK" -gt 0 ]; then
${MKSQUASHFS} $FILESYSTEM_MOD_DIR/* $CORE_FILESYSTEM_MOD $MKSQUASHFS_OPTIONS -b $FREETZ_SQUASHFS_BLOCKSIZE >> $MOD_DIR/filesystem.log 2>&1
- if [ "${FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
+ if [ "${FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ]; then
${MKSQUASHFS} $FILESYSTEM_CORE_MOD_DIR/* $RAW_FILESYSTEM_MOD $MKSQUASHFS_OPTIONS -b $FREETZ_SQUASHFS_BLOCKSIZE >> $MOD_DIR/filesystem.log 2>&1
[ ! -s "$RAW_FILESYSTEM_MOD" ] && error 1 "creation of filesystem failed"
@@ -1425,7 +1425,7 @@ if [ "$DO_PACK" -gt 0 ]; then
fi
fi
if [ "$FREETZ_VERBOSITY_LEVEL" -ge 1 ]; then
- if [ "$FREETZ_HAS_AVM_TAM" = "y" -a "${FREETZ_HAS_UPDATE_FILESYSTEM_IMAGE}" != "y" ]; then
+ if [ "$FREETZ_AVM_HAS_TAM" = "y" -a "${FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE}" != "y" ]; then
# Calculate aproximately free space in seconds for the answering machine
# 5*64kB sectors needed, see http://freetz.org/ticket/1680#comment:4
FREE_BYTE_JFFS2=$((($KERNEL_LIMIT - $KERNEL_SIZE - 327680)))
View
6 kernel/Config.in.modules
@@ -353,7 +353,7 @@ config FREETZ_MODULE_ext2
config FREETZ_MODULE_ext3
bool "ext3.ko"
- depends on ! FREETZ_HAS_AVM_EXT3
+ depends on ! FREETZ_AVM_HAS_EXT3
select FREETZ_MODULE_jbd if FREETZ_KERNEL_VERSION_2_6_19_MAX
select FREETZ_MODULE_mbcache
default n
@@ -534,7 +534,7 @@ config FREETZ_MODULE_cls_u32
config FREETZ_MODULE_ipv6
bool "ipv6.ko"
- depends on FREETZ_TARGET_IPV6_SUPPORT && ! FREETZ_HAS_AVM_IPV6
+ depends on FREETZ_TARGET_IPV6_SUPPORT && ! FREETZ_AVM_HAS_IPV6
default n
help
This is complemental support for the IP version 6.
@@ -612,7 +612,7 @@ config FREETZ_MODULE_rfcomm
config FREETZ_MODULE_sit
bool "sit.ko"
depends on \
- ! FREETZ_HAS_AVM_IPV6 && \
+ ! FREETZ_AVM_HAS_IPV6 && \
FREETZ_KERNEL_VERSION_2_6_19 && \
FREETZ_MODULE_ipv6
default n
View
4 kernel/external.in
@@ -6,7 +6,7 @@ config EXTERNAL_FREETZ_MODULE_cifs
bool "cifs.ko"
default n
help
- externals these file(s):
+ externals the following file(s):
/lib/modules/*/kernel/fs/cifs/cifs.ko
config EXTERNAL_FREETZ_MODULE_ipv6
@@ -14,5 +14,5 @@ config EXTERNAL_FREETZ_MODULE_ipv6
bool "ipv6.ko"
default n
help
- externals these file(s):
+ externals the following file(s):
/lib/modules/*/kernel/net/ipv6/ipv6.ko
View
4 make/Config.in
@@ -250,6 +250,8 @@ source make/dnsd-cgi/Config.in
source make/downloader/Config.in
source make/nfsd-cgi/Config.in
source make/onlinechanged-cgi/Config.in
+source make/openvpn-cgi/Config.in
+source make/openvpn-v2-cgi/Config.in
source make/phpxmail/Config.in
source make/ppp-cgi/Config.in
source make/rrdstats/Config.in
@@ -262,6 +264,7 @@ endmenu
menu "Unstable packages"
visible if FREETZ_SHOW_EXPERT
+source make/asterisk/Config.in
source make/collectd/Config.in
source make/dtmfbox/Config.in
source make/dtmfbox-cgi/Config.in
@@ -272,6 +275,7 @@ source make/iptables/Config.in
source make/mdev/Config.in
source make/mini_fo/Config.in
source make/sane-backends/Config.in
+source make/scanbuttond/Config.in
source make/squid/Config.in
source make/truecrypt/Config.in
source make/virtualip-cgi/Config.in
View
4 make/Makefile.in
@@ -485,7 +485,7 @@ $(DL_DIR)/$($(PKG)_SOURCE): | $(DL_DIR)
$(call MESSAGE, Found $($(PKG)_SOURCE) in $(MIRROR_DIR), creating hard link); \
ln $(MIRROR_DIR)/$($(PKG)_SOURCE) $(DL_DIR); \
else \
- $(DL_TOOL) $(DL_DIR) $($(PKG)_SOURCE) $($(PKG)_SITE) $($(PKG)_SOURCE_MD5) $(SILENT); \
+ $(DL_TOOL) $(DL_DIR) $($(PKG)_SOURCE) $($(PKG)_SITE) $(or $($(PKG)_SOURCE_SHA1),$($(PKG)_SOURCE_MD5)) $(SILENT); \
fi
$(pkg)-download: $(DL_DIR)/$($(PKG)_SOURCE)
@@ -495,7 +495,7 @@ $(MIRROR_DIR)/$($(PKG)_SOURCE): | $(MIRROR_DIR)
$(call MESSAGE, Found $($(PKG)_SOURCE) in $(DL_DIR), creating hard link); \
ln $(DL_DIR)/$($(PKG)_SOURCE) $(MIRROR_DIR); \
else \
- $(DL_TOOL) $(MIRROR_DIR) $($(PKG)_SOURCE) $($(PKG)_SITE) $($(PKG)_SOURCE_MD5) $(SILENT); \
+ $(DL_TOOL) $(MIRROR_DIR) $($(PKG)_SOURCE) $($(PKG)_SITE) $(or $($(PKG)_SOURCE_SHA1),$($(PKG)_SOURCE_MD5)) $(SILENT); \
fi
$(pkg)-download-mirror: $(MIRROR_DIR)/$($(PKG)_SOURCE)
View
2  make/aiccu/Config.in
@@ -1,7 +1,7 @@
config FREETZ_PACKAGE_AICCU
bool "aiccu - Automatic IPv6 Connectivity Client Utility"
depends on FREETZ_TARGET_IPV6_SUPPORT
- select FREETZ_MODULE_sit if FREETZ_KERNEL_VERSION_2_6_19 && ! FREETZ_HAS_AVM_IPV6
+ select FREETZ_MODULE_sit if FREETZ_KERNEL_VERSION_2_6_19 && ! FREETZ_AVM_HAS_IPV6
select FREETZ_LIB_libpthread
select FREETZ_BUSYBOX_IP
select FREETZ_BUSYBOX_FEATURE_IP_ADDRESS
View
2  make/aiccu/external.in
@@ -3,5 +3,5 @@ config EXTERNAL_FREETZ_PACKAGE_AICCU
bool "aiccu"
default n
help
- externals these file(s):
+ externals the following file(s):
/usr/sbin/aiccu
View
29 make/asterisk/Config.in
@@ -0,0 +1,29 @@
+config FREETZ_PACKAGE_ASTERISK
+ bool "Asterisk 11.4.0 (binary only) - EXPERIMENTAL"
+#
+# asterisk binary dependencies
+#
+ select FREETZ_LIB_libdl
+ select FREETZ_LIB_libm
+ select FREETZ_LIB_libpthread
+ select FREETZ_LIB_libncurses
+ select FREETZ_LIB_libsqlite3
+#
+# combined dependencies of all modules
+#
+ select FREETZ_LIB_libdl
+ select FREETZ_LIB_libm
+ select FREETZ_LIB_libpthread
+ select FREETZ_LIB_libcurl
+ select FREETZ_LIB_libgsm
+ select FREETZ_LIB_libpj
+ select FREETZ_LIB_libpjlib_util
+ select FREETZ_LIB_libpjnath
+ select FREETZ_LIB_libspeex
+ select FREETZ_LIB_libspeexdsp
+ select FREETZ_LIB_libsqlite3
+ select FREETZ_LIB_libsrtp
+ select FREETZ_LIB_libz
+ default n
+ help
+ Asterisk is an open source framework for building communications applications.
View
151 make/asterisk/asterisk.mk
@@ -0,0 +1,151 @@
+$(call PKG_INIT_BIN, 11.4.0)
+$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
+$(PKG)_SOURCE_SHA1:=8ec0d10834c87a2bff58f23d961c67f16a26d01a
+$(PKG)_SITE:=http://downloads.asterisk.org/pub/telephony/asterisk/releases
+
+$(PKG)_INSTALL_SUBDIR:=_install
+
+$(PKG)_BINARY_BUILD_DIR := $($(PKG)_DIR)/$($(PKG)_INSTALL_SUBDIR)/usr/sbin/asterisk
+$(PKG)_BINARY_TARGET_DIR := $($(PKG)_DEST_DIR)/usr/sbin/asterisk
+
+$(PKG)_MODULE_BUILD_DIR := $($(PKG)_DIR)/$($(PKG)_INSTALL_SUBDIR)/usr/lib/asterisk/modules/chan_iax2.so
+$(PKG)_MODULE_TARGET_DIR := $($(PKG)_DEST_DIR)/usr/lib/asterisk/modules/chan_iax2.so
+
+$(PKG)_DEPENDS_ON += curl
+$(PKG)_DEPENDS_ON += libgsm
+$(PKG)_DEPENDS_ON += ncurses
+#$(PKG)_DEPENDS_ON += openssl
+$(PKG)_DEPENDS_ON += pjproject2
+$(PKG)_DEPENDS_ON += popt
+$(PKG)_DEPENDS_ON += speex
+$(PKG)_DEPENDS_ON += sqlite
+$(PKG)_DEPENDS_ON += srtp
+$(PKG)_DEPENDS_ON += zlib
+
+# Remove internal pjproject version to ensure that it is not used.
+# We use pjproject version modified by asterisk developers (contains shared libraries support).
+$(PKG)_CONFIGURE_PRE_CMDS += $(RM) -r res/pjproject;
+
+$(PKG)_CONFIGURE_OPTIONS += --disable-rpath
+$(PKG)_CONFIGURE_OPTIONS += --disable-xmldoc
+$(PKG)_CONFIGURE_OPTIONS += --disable-asteriskssl
+
+$(PKG)_CONFIGURE_OPTIONS += --with-asound=no
+$(PKG)_CONFIGURE_OPTIONS += --with-avcodec=no
+$(PKG)_CONFIGURE_OPTIONS += --with-bfd=no
+$(PKG)_CONFIGURE_OPTIONS += --with-bluetooth=no
+$(PKG)_CONFIGURE_OPTIONS += --with-cap=no
+$(PKG)_CONFIGURE_OPTIONS += --with-cpg=no
+$(PKG)_CONFIGURE_OPTIONS += --with-crypto=no
+$(PKG)_CONFIGURE_OPTIONS += --with-curses=no
+$(PKG)_CONFIGURE_OPTIONS += --with-dahdi=no
+$(PKG)_CONFIGURE_OPTIONS += --with-execinfo=no
+$(PKG)_CONFIGURE_OPTIONS += --with-gmime=no
+$(PKG)_CONFIGURE_OPTIONS += --with-gsm="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+$(PKG)_CONFIGURE_OPTIONS += --with-gtk2=no
+$(PKG)_CONFIGURE_OPTIONS += --with-h323=no
+$(PKG)_CONFIGURE_OPTIONS += --with-hoard=no
+$(PKG)_CONFIGURE_OPTIONS += --with-ical=no
+$(PKG)_CONFIGURE_OPTIONS += --with-iconv=no
+$(PKG)_CONFIGURE_OPTIONS += --with-iksemel=no
+$(PKG)_CONFIGURE_OPTIONS += --with-ilbc=no
+$(PKG)_CONFIGURE_OPTIONS += --with-imap=no
+$(PKG)_CONFIGURE_OPTIONS += --with-inotify=no
+$(PKG)_CONFIGURE_OPTIONS += --with-iodbc=no
+$(PKG)_CONFIGURE_OPTIONS += --with-isdnnet=no
+$(PKG)_CONFIGURE_OPTIONS += --with-jack=no
+$(PKG)_CONFIGURE_OPTIONS += --with-kqueue=no
+$(PKG)_CONFIGURE_OPTIONS += --with-ldap=no
+$(PKG)_CONFIGURE_OPTIONS += --with-libcurl="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+#$(PKG)_CONFIGURE_OPTIONS += --with-libedit=no # use internal libedit
+$(PKG)_CONFIGURE_OPTIONS += --with-libxml2=no
+$(PKG)_CONFIGURE_OPTIONS += --with-ltdl=no
+$(PKG)_CONFIGURE_OPTIONS += --with-lua=no
+$(PKG)_CONFIGURE_OPTIONS += --with-misdn=no
+$(PKG)_CONFIGURE_OPTIONS += --with-mysqlclient=no
+$(PKG)_CONFIGURE_OPTIONS += --with-nbs=no
+$(PKG)_CONFIGURE_OPTIONS += --with-ncurses="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+$(PKG)_CONFIGURE_OPTIONS += --with-neon29=no
+$(PKG)_CONFIGURE_OPTIONS += --with-neon=no
+$(PKG)_CONFIGURE_OPTIONS += --with-netsnmp=no
+$(PKG)_CONFIGURE_OPTIONS += --with-newt=no
+$(PKG)_CONFIGURE_OPTIONS += --with-ogg=no
+$(PKG)_CONFIGURE_OPTIONS += --with-openr2=no
+$(PKG)_CONFIGURE_OPTIONS += --with-osptk=no
+$(PKG)_CONFIGURE_OPTIONS += --with-oss=no
+$(PKG)_CONFIGURE_OPTIONS += --with-popt="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+$(PKG)_CONFIGURE_OPTIONS += --with-portaudio=no
+$(PKG)_CONFIGURE_OPTIONS += --with-postgres=no
+$(PKG)_CONFIGURE_OPTIONS += --with-pri=no
+$(PKG)_CONFIGURE_OPTIONS += --with-pwlib=no
+$(PKG)_CONFIGURE_OPTIONS += --with-radius=no
+$(PKG)_CONFIGURE_OPTIONS += --with-resample=no
+$(PKG)_CONFIGURE_OPTIONS += --with-SDL_image=no
+$(PKG)_CONFIGURE_OPTIONS += --with-sdl=no
+$(PKG)_CONFIGURE_OPTIONS += --with-sounds-cache=no
+$(PKG)_CONFIGURE_OPTIONS += --with-spandsp=no
+$(PKG)_CONFIGURE_OPTIONS += --with-speexdsp="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+$(PKG)_CONFIGURE_OPTIONS += --with-speex="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+$(PKG)_CONFIGURE_OPTIONS += --with-sqlite3="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+$(PKG)_CONFIGURE_OPTIONS += --with-sqlite=no
+$(PKG)_CONFIGURE_OPTIONS += --with-srtp="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+$(PKG)_CONFIGURE_OPTIONS += --with-ss7=no
+$(PKG)_CONFIGURE_OPTIONS += --with-ssl=no
+$(PKG)_CONFIGURE_OPTIONS += --with-suppserv=no
+$(PKG)_CONFIGURE_OPTIONS += --with-tds=no
+$(PKG)_CONFIGURE_OPTIONS += --with-termcap=no
+$(PKG)_CONFIGURE_OPTIONS += --with-timerfd=no
+$(PKG)_CONFIGURE_OPTIONS += --with-tinfo=no
+$(PKG)_CONFIGURE_OPTIONS += --with-tonezone=no
+$(PKG)_CONFIGURE_OPTIONS += --with-unixodbc=no
+$(PKG)_CONFIGURE_OPTIONS += --with-vorbis=no
+$(PKG)_CONFIGURE_OPTIONS += --with-vpb=no
+$(PKG)_CONFIGURE_OPTIONS += --with-x11=no
+$(PKG)_CONFIGURE_OPTIONS += --with-z="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
+
+$(PKG)_MAKE_OPTIONS += -C $(ASTERISK_DIR)
+$(PKG)_MAKE_OPTIONS += NOISY_BUILD=yes
+$(PKG)_MAKE_OPTIONS += DEBUG=""
+$(PKG)_MAKE_OPTIONS += OPTIMIZE=""
+$(PKG)_MAKE_OPTIONS += ASTCFLAGS="-fno-strict-aliasing -DLOW_MEMORY"
+$(PKG)_MAKE_OPTIONS += PJPROJECT_BUILD_MAK_DIR="$(abspath $(PJPROJECT2_DIR))"
+
+$(PKG_SOURCE_DOWNLOAD)
+$(PKG_UNPACKED)
+$(PKG_CONFIGURED_CONFIGURE)
+
+$($(PKG)_DIR)/.compiled: $($(PKG)_DIR)/.configured
+ $(SUBMAKE) $(ASTERISK_MAKE_OPTIONS)
+ touch $@
+
+$($(PKG)_DIR)/.installed: $($(PKG)_DIR)/.compiled
+ $(SUBMAKE) $(ASTERISK_MAKE_OPTIONS) \
+ DESTDIR="$(abspath $(ASTERISK_DIR)/$(ASTERISK_INSTALL_SUBDIR))" \
+ install samples
+ touch $@
+
+$($(PKG)_BINARY_BUILD_DIR) $($(PKG)_MODULE_BUILD_DIR): $($(PKG)_DIR)/.installed
+
+$($(PKG)_BINARY_TARGET_DIR): $($(PKG)_BINARY_BUILD_DIR)
+ $(INSTALL_BINARY_STRIP)
+
+$($(PKG)_MODULE_TARGET_DIR): $($(PKG)_MODULE_BUILD_DIR)
+ mkdir -p $(dir $@)
+ cp -a $(dir $<)/*.so $(dir $@)
+ -$(TARGET_STRIP) $(dir $@)/*.so
+ touch $@
+
+$(pkg):
+
+$(pkg)-precompiled: $($(PKG)_BINARY_TARGET_DIR) $($(PKG)_MODULE_TARGET_DIR)
+
+$(pkg)-clean:
+ -$(SUBMAKE) $(ASTERISK_MAKE_OPTIONS) distclean
+ $(RM) $(ASTERISK_DIR)/{.configured,.compiled,.installed}
+
+$(pkg)-uninstall:
+ $(RM) -r \
+ $(ASTERISK_BINARY_TARGET_DIR) \
+ $(ASTERISK_DEST_DIR)/usr/lib/asterisk/modules
+
+$(PKG_FINISH)
View
2  make/asterisk/external.files
@@ -0,0 +1,2 @@
+[ "$EXTERNAL_FREETZ_PACKAGE_ASTERISK" == "y" ] && EXTERNAL_FILES+=" /usr/sbin/asterisk"
+[ "$EXTERNAL_FREETZ_PACKAGE_ASTERISK" == "y" -a "$EXTERNAL_SUBDIRS" == "y" ] && EXTERNAL_FILES+=" /usr/lib/asterisk"
View
8 make/asterisk/external.in
@@ -0,0 +1,8 @@
+config EXTERNAL_FREETZ_PACKAGE_ASTERISK
+ depends on EXTERNAL_ENABLED && FREETZ_PACKAGE_ASTERISK
+ bool "asterisk"
+ default n
+ help
+ externals the following file(s):
+ /usr/sbin/asterisk
+ /usr/lib/asterisk
View
11 make/asterisk/patches/010-no_libresolv.patch
@@ -0,0 +1,11 @@
+--- main/Makefile
++++ main/Makefile
+@@ -43,7 +43,7 @@
+ ifneq (x$(CAP_LIB),x)
+ AST_LIBS+=$(CAP_LIB)
+ endif
+- AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv
++ AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm
+ else
+ AST_LIBS+=$(EDITLINE_LIB) -lm
+ endif
View
59 make/asterisk/patches/020-glob.patch
@@ -0,0 +1,59 @@
+--- res/ael/ael.flex
++++ res/ael/ael.flex
+@@ -69,6 +69,7 @@
+
+ %{
+ #include "asterisk.h"
++#include "asterisk/compat.h" // MY_GLOB_FLAGS
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 366126 $")
+
+ #include <sys/types.h>
+@@ -595,11 +596,7 @@
+ snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
+ ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
+ }
+-#ifdef SOLARIS
+- glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
+-#else
+- glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
+-#endif
++ glob_ret = glob(fnamebuf, MY_GLOB_FLAGS, NULL, &globbuf);
+ if (glob_ret == GLOB_NOSPACE) {
+ ast_log(LOG_WARNING,
+ "Glob Expansion of pattern '%s' failed: Not enough memory\n", fnamebuf);
+--- res/ael/ael_lex.c
++++ res/ael/ael_lex.c
+@@ -1,4 +1,5 @@
+ #include "asterisk.h"
++#include "asterisk/compat.h" // MY_GLOB_FLAGS
+
+ #line 2 "ael_lex.c"
+
+@@ -1976,11 +1977,7 @@
+ snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
+ ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
+ }
+-#ifdef SOLARIS
+- glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
+-#else
+- glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
+-#endif
++ glob_ret = glob(fnamebuf, MY_GLOB_FLAGS, NULL, &globbuf);
+ if (glob_ret == GLOB_NOSPACE) {
+ ast_log(LOG_WARNING,
+ "Glob Expansion of pattern '%s' failed: Not enough memory\n", fnamebuf);
+--- utils/extconf.c
++++ utils/extconf.c
+@@ -3736,11 +3736,7 @@
+ glob_t globbuf;
+
+ globbuf.gl_offs = 0; /* initialize it to silence gcc */
+-#ifdef SOLARIS
+- glob_ret = glob(fn, GLOB_NOCHECK, NULL, &globbuf);
+-#else
+- glob_ret = glob(fn, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
+-#endif
++ glob_ret = glob(fn, MY_GLOB_FLAGS, NULL, &globbuf);
+ if (glob_ret == GLOB_NOSPACE)
+ ast_log(LOG_WARNING,
+ "Glob Expansion of pattern '%s' failed: Not enough memory\n", fn);
View
14 make/asterisk/patches/030-speex_check.patch
@@ -0,0 +1,14 @@
+Check for speex_encoder_init instead of speex_encode to determine the presense of libspeex.
+When compiled with no floating numbers support it does provide speex_encode_int and no speex_encode.
+speex_encoder_init is available regardless of "float vs. int"-configuration.
+--- configure
++++ configure
+@@ -26699,7 +26699,7 @@
+ pbxlibdir="-L${SPEEX_DIR}"
+ fi
+ fi
+- pbxfuncname="speex_encode"
++ pbxfuncname="speex_encoder_init"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_SPEEX_FOUND=yes
+ else
View
55 make/asterisk/patches/040-external-pjlib.patch
@@ -0,0 +1,55 @@
+--- res/Makefile
++++ res/Makefile
+@@ -67,26 +67,20 @@
+ ael/pval.o: ael/pval.c
+
+ clean::
+- @if [ -f pjproject/build.mak ]; then $(MAKE) -C pjproject realclean; fi
+ rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
+
+ dist-clean::
+- rm -f pjproject/build.mak
+-
+-pjproject/build.mak: pjproject/aconfigure
+- (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
+
+ ifneq ($(findstring $(MAKECMDGOALS),all),)
+--include pjproject/build.mak
++ifeq ($(strip $(PJPROJECT_BUILD_MAK_DIR)),)
++$(error PJPROJECT_BUILD_MAK_DIR variable pointing to a directory containing pjproject build.mak file is not set)
++endif
++include $(strip $(PJPROJECT_BUILD_MAK_DIR))/build.mak
+ endif
+
+ .PHONY: FORCE
+ FORCE:
+
+-$(PJ_LIB_FILES): FORCE
+- $(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
+-
+-res_rtp_asterisk.o: $(PJ_LIB_FILES)
+-res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
+-res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
+-res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
++res_rtp_asterisk.o: _ASTCFLAGS+=$(filter-out -I%,$(PJ_CFLAGS))
++res_rtp_asterisk.so: _ASTLDFLAGS+=$(filter-out -L%,$(PJ_LDFLAGS))
++res_rtp_asterisk.so: LIBS+=-Wl,--as-needed $(PJ_LDLIBS) -Wl,--no-as-needed
+--- res/res_rtp_asterisk.c
++++ res/res_rtp_asterisk.c
+@@ -48,11 +48,13 @@
+
+ /* Asterisk discourages the use of bzero in favor of memset, in fact if you try to use bzero it will tell you to use memset. As a result bzero has to be undefined
+ * here since it is used internally by pjlib. The only other option would be to modify pjlib... which won't happen. */
++#if 0 /* disable this ugly hack as it doesn't work with uClibc, we use a patched version of pjlib */
+ #undef bzero
+ #define bzero bzero
+-#include "pjlib.h"
+-#include "pjlib-util.h"
+-#include "pjnath.h"
++#endif
++#include <pjlib.h>
++#include <pjlib-util.h>
++#include <pjnath.h>
+
+ #include "asterisk/stun.h"
+ #include "asterisk/pbx.h"
View
11 make/asterisk/patches/050-pjproject-2.0.1-to-2.1.0.patch
@@ -0,0 +1,11 @@
+--- res/res_rtp_asterisk.c
++++ res/res_rtp_asterisk.c
+@@ -1778,7 +1778,7 @@
+ ast_rtp_instance_set_data(instance, rtp);
+
+ /* Create an ICE session for ICE negotiation */
+- if (icesupport && pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2, &ast_rtp_ice_sess_cb, &ufrag, &passwd, &rtp->ice) == PJ_SUCCESS) {
++ if (icesupport && pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2, &ast_rtp_ice_sess_cb, &ufrag, &passwd, NULL, &rtp->ice) == PJ_SUCCESS) {
+ /* Make this available for the callbacks */
+ rtp->ice->user_data = rtp;
+
View
23 make/asterisk/patches/060-no_res_nsearch_in_uclibc.patch
@@ -0,0 +1,23 @@
+--- configure