From 57ef4cc3bdf0c1cae526dc77f824ea752cee6cbb Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Mon, 30 May 2016 00:54:43 +0200 Subject: [PATCH] add support for LEDE * replace: * OpenWrt -> LEDE * OPENWRT -> LEDE * openwrt -> lede * fix imagebuilder/toolchain/sdk file name because it's now lowercase * refresh patches * use LEDE-commit of 2016-12-23 * update feeds to trunk of 2016-12-23 * change feed url from git -> https:// * rename ar71xx -> ar71xx_generic Signed-off-by: Alexander Couzens This is backported and updated to the master-branch. orginal commit was cd1ae9b81daea5234dca77b5e14c491378cc215c change NAME and VERSION to reflect LEDE-branch-build - according to proposal: https://github.com/freifunk-berlin/firmware/issues/24#issuecomment-269655041 profiles: update new default of ar71xx-mikrotik - LEDE: "ar71xx: create a proper default profile for the mikrotik subtarget, drop other profiles" (e53e44a0ad4873645c7a22) Signed-off-by: Sven Roederer update LEDE (switch to LEDE-17.01 branch) - opkg - muls backports - includes OpenVPN 2.4.0 - build: add diffconfig target - rpcd: Update to 2016-12-03 - ramips: MiWiFi Nano fixes - mac80211: Allow HT/VHT rates when running unencrypted mesh b9857b2 tools/kernel2minor: fix permissions of created files 188626f mac80211: backport cfg80211 support for ieee80211-freq-limit DT property 4235cd0 x86: add kernel module for AMD CS5535/CS5536 audio chipset 476e77c tools/kernel2minor: fix endian conversion issues, allow creating little-endian images 8782672 tools/kernel2minor: fix portability issue 7304510 base-files: save /bin/mknod for sysupgrade f277f45 yaffs: fix to detect MLC/TLC NAND flash d8dde8c lantiq: fix console print b7e8de6 strace: update to version 4.15 612e227 dnsmasq: change 'add_local_hostname' to use dnsmasq '--interface-name' 06e2636 dnsmasq: clean up white space in dnsmasq.init 1fef80f ar71xx: add support for TP-Link WBS210/510 2ee3e8d firmware-utils: tplink-safeloader: add support for TP-Link WBS210/510 1.2 08d73bf tools: cmake: use different approach for passing LDFLAGS 267b05f Revert "build: fix HOST_CONFIGURE_VARS placement" f9b2531 tools: cmake: use pkg-config to discover libcrypto linker flags 0c03650 tools: mkimage: use pkg-config to discover libcrypto linker flags bfb2512 tools: make libressl build depend on pkg-config 28f9df6 build: fix HOST_CONFIGURE_VARS placement 8160beb cmake: update to version 3.7.1 d2ddda6 build: ensure that prereq-build is run before metadata scan from feeds (FS#367) fbe3e22 uboot-sunxi: enable parallel build 0ac00c9 sunxi: use fwtool for checking sdcard images 5ece16f sunxi: add sysupgrade support 8a2c56c sunxi: make sdcard image with squashfs as rootfs 4eb0fd8 sunxi: convert to new image generation method 6268d49 uboot-sunxi: add uboot-sunxi-all for selecting all other variants 6f61d85 base-files: export x86 platform upgrade functions to common.sh d53fcde sunxi: enable loopback device and f2fs support 76ee28c sunxi: fix dts name for Mele M9 4ebb13a build: unzip: perform operations quietly fa37bdc x86: move sysupgrade.tgz only if it exists 5f9e367 kernel: spi: allow setting chipselect gpio to sleep af79fdb ar71xx: remove a non-upstream spi core patch e307259 ath9k: don't run periodic and nf calibration at the same time 84bd740 build: use mkhash to replace various quirky md5sum/openssl calls dad48c6 build: add a small standalone utility for calculating md5/sha256 hash a0993dd tools: make cmake depend on libressl, one of its utilities uses it bdaa138 host-build: remove openssl include path from host cflags f6e6341 tools: build libressl on all systems a46c9a4 oxnas: remove support for pre-4.4 kernels from drivers ed69e93 kernel/modules: add SSSE3 SHA512 module 86de532 kernel/modules: add SSSE3 SHA256 module 159e82d kernel/modules: add SSSE3 SHA1 module a93accd kernel: allow subtarget specific KernelPackage 301301d x86/64: enable AES-NI support in kernel 2406b34 brcm47xx: generic: include Ethernet drivers in standard image 5f8e338 brcm47xx: drop some personal profiles d091b2c brcm47xx: generic: drop standalone profiles duplicating device ones b138e69 brcm47xx: generic: specify DEVICE_PACKAGES for all devices 11c41a0 brcm47xx: fix bgmac package 2a72a91 build: add diffconfig target 38a8cea powerpc: boot: fix build with parallel make 18152e7 brcm47xx: mips74k: specify DEVICE_PACKAGES for all devices 1d74f78 brcm47xx: legacy: specify DEVICE_PACKAGES for all devices c296ba8 Revert "ath9k: Add airtime fairness scheduler" 10f9152 dnsmasq: add DHCP Unique Identifier for DHCPv6 1175a5b odhcpd: bump to git HEAD version 34fa03e odhcp6c: bump to git HEAD version 388681f hostapd: enable SHA256-based algorithms 30f14f6 hostapd: add function to handle wpa_key_mgmt bdcffb9 wpa_supplicant: rework wpa_key_mgmt handling b13e103 ath5k: select 802.11w support e2f866d generic: mtd: add lock/unlock support for f25l32pa d6c831e generic: mtd: backport SPI_NOR_HAS_LOCK 799d0dd layerscape: add ls2088ardb device support 1866368 layerscape: add ls1088ardb device support c6d3a62 gre: add different per-protocol prefixes to GRE-TAP IPv4/6 tunnel interfaces. 15d8d9c build: drop `trapret` function from non-Linux HOST_TAR variant 0bb4746 elfutils: bump to 0.168 fc6b6f4 download.pl: use curl in preference to wget 5586800 curl: Remove PolarSSL and adjust default to mbedTLS cd18ff9 tools: gmp: Update to 6.1.2 0050b39 gmp: Update to 6.1.2 6099f22 zlib: Update to 1.2.9 bb4afdc libusb: Update to 1.0.21 54ff3b1 xz: Update to 5.2.3 1618c4a rpcd: Update to 2016-12-03 9bf2bc7 fstools: Update to 2016-12-04 55209a9 uclient: Update to 2016-12-09 91dab05 ixp4xx: drop 3.18 config/patches 8c822ec uboot-lantiq: fix boot of images larger than 8MB cfe1c6d uboot-lantiq: fix build with gcc6 b35a41c generic: backport dwc2 kernel panic fix b28e94d ramips: MiWiFi Nano fixes fd718c5 mac80211: Allow HT/VHT rates when running unencrypted mesh. 8496659 base-files: fix message of initscript wrapper 5639e45 generic: package Broadcom BNX2 driver 321aca6 oxnas: fix syntax in ox820-akitio.dts 1436e15 curl: update to version 7.52.1 3e2c60e oxnas: append metadata to sysupgrade image 5cde94d oxnas: backport upstream NAND driver ae21033 oxnas: drop support for kernel 4.1 1f7a358 oxnas: switch to kernel 4.4 b7677f0 ustream-ssl: remove extra DEFAULT_VARIANT from libustream-polarssl 619c8fa imagebuilder: remove existing debug kernel image d1514e8 imagebuilder: remove existing root filesystem images c6a8a23 xburst: remove hack to determine entry point d2424d4 malta: remove hack to determine entry point 3e521fa sdk: exclude locale files to save some space 920170a firewall: fix forwarding local subnet traffic 9641cee mvebu: simplify etc/board.d/02_network f24ffb9 mvsw61xx: add support for MV88E6352 89ecfa7 mvebu: several fixes for Linksys WRT3200ACM 8935689 mxs: gzip ext4 images 515d012 arc770: gzip rootfs image to save some space 113dd45 archs38: gzip rootfs image to save some space 8af5e57 image.mk: add generic function for gzipping images if enabled 6f57e32 mvebu: remove the clearfog-bundle 87b6687 image: when using the new image build code, gzip ext4 images by default c914fa0 dnsmasq: use ubus signalling in ntp hotplug script 7499189 x86: disable crashlog e38fd1e x86: disable a workaround for a buggy glibc version 27fbf54 octeon: disable ext4 images 402fea6 netifd: update to the latest version 8596935 image.mk: use LINUX_KARCH rather than ARCH for mkits f44663c uqmi: mark as nonshared because of the usb dependencies 185b06f umbim: mark as nonshared because of the usb dependencies 1ca31b0 comgt: mark as nonshared because of the usb dependencies bd68ddb polarssl: remove package dcd8357 armvirt: add kernel config change missing from 0d44f0cb d6c77b9 ar71xx: default to external USB power on RB-912UAG 5919cc2 build: let make check warn about use of legacy PKG_MD5SUM variable in feeds 6f9011f cmake: properly pass host cflags/ldflags to the build 7969770 cmake: support verbose build that shows compiler commands d6de313 cmake: restore parallel build support for bootstrap 83eef37 x86/64: enable the fusion scsi driver 2b6284f mac80211: fix broken spatial multiplexing defaults 544dee5 ath10k-fw: Update to latest CT firmware 5c09d7f ath10k-ct: Update to latest CT 4.7 ath10k driver. 0d44f0c armvirt: enable the USB feature flag 627b0d3 mountd: drop USB related dependencies 29097b9 ramips: fix WLI-TX4-AG300N boot and network 3f31029 ramips: add support for VoCore2 d7fd1a0 ar71xx: enable serial console on Mikrotik RB411/RB433 287283e ramips: rt3883: fix typo in pinctrl lna_g_func d1daf3f map: take over maintainership 0d49f9f odhcp6c: take over maintainership 5303d4b odhcpd: take over maintainership ec63e3b Revert "dnsmasq: change 'add_local_hostname' to use dnsmasq '--interface-name'" bb8e9c5 map: delete map-t device when tearing down map interface 1ad30be Revert the recent dependency and metadata scanning rework fbe522d comgt: allow build without USB_SUPPORT 278ad00 umbim: allow build without USB_SUPPORT 863888e uqmi: allow build without USB_SUPPORT 96daf63 mountd: allow build without USB_SUPPORT cfd8355 scripts/package-metadata.pl: fix overriding conditional dependencies with conditional select 90f0ca0 arc770: build dtb files in Image/Prepare so that they are available for Device/* b9713ad archs38: build dtb files in Image/Prepare so that they are available for Device/* 4ce3c41 bcm53xx: backport upstream bcm53xx spi driver changes 2e1f6f1 mvebu: work around an ethernet tx scheduling fairness issue 3be4c6c kirkwood: only add UBI EOF markers for devices that need it 4d8da82 procd: add support for overriding the tar sysupgrade board name e21cb64 ar71xx: disable sub-page writes on routerboard nand drivers b7bee28 kernel: remove linux 4.1 support b1dbe60 ar71xx: fix legacy image build error 1b17f4f arc770: fix parallel build issue 3fa2c77 archs38: fix parallel build issue 889272d ar71xx: fix RB4xx CPLD SPI device mode setup c3a8b87 ar71xx: fix RB4xx SPI driver mode bits 15f4fbb mvebu: update mwlwifi driver to version 10.3.2.0-20170110 80dbaa4 kernel: backport a MIPS SMP icache flush fix 7c8a363 kernel: update bcm47xxpart failsafe partition patches 5932400 wpa_supplicant: Fix mesh encryption config b95494b gettext-full: avoid using iconv for host builds 43d5339 tools: cmake: link librt if needed (FS#381) 69be65b tools: mkimage: pass crypto libraries through HOST_LOADLIBES (FS#381) 96a9403 tools: libressl: always build as PIC 77beaf2 package: replace $(STAGING_DIR)/host with $(STAGING_DIR_HOSTPKG) 7480d33 kernel: add missing config symbols e9b49a4 kernel: add missing config symbol f714fe4 mac80211: pending brcmfmac patches cleaning channels management 07df80a mac80211: rename b43 patches to make more space 90ed0aa build: scan.mk: consider KernelPackage pattern as well 1ce9b56 procd: update mirror hash c9dd40f kernel: remove gpiommc patches / driver 1a5cb4a kernel: add pending bcm47xxpart support for failsafe TRX partition ef9208c kernel: update spi-nor.h include fix with upstream accepted version b4d2575 kernel: rename bcm47xxpart patches to fit more of them a891e5e build: scan.mk: remove overlay broad grep pattern 01d9527 kernel: remove DEVTMPFS platform overrides c2fc52a kernel: remove DEVMEM/DEVKMEM platform overrides 36167ae ath10k-firmware: update board data for qca9984 4ee4c24 kernel: drop kmod-i2c-ibm-iic 96815fe kernel: remove omap24xx specific kernel module packages 7ff7be9 omap: build various core drivers into the kernel instead of packaging them 10f7a8d kernel: add missing config symbol f630342 kernel: simplify dependencies for kmod-via-velocity 5b92dca kernel: drop crypto-hw-ppc4xx 9cdf852 opkg: drop S/MIME support f5c649d mpc85xx: build i2c support into the kernel instead of packaging it separately 96ade7a mpc85xx: build usb support into the kernel instead of packaging it separately 0b2b162 kernel: remove kmod-gianfar, it is already built into the kernel c472ed2 kernel: remove kmod-ata-imx, it is already built into the kernel cdcf726 lldpd: take over maintainership 046606a lldpd: add Net-SNMP AgentX support 0d3dc16 ar71xx: drop references to madwifi c687a70 iwinfo: drop references to madwifi cc66f81 px5g-standalone: provide px5g via PROVIDES 06c76e4 ppc44x: mark as broken 43a528e kernel: add missing config symbol 83b6bfc build: fix HOST_CONFIGURE_VARS placement fe876e9 mvebu: Fix up some leds on this series 72d751c build: rework library bundling 38de638 mtd-utils: mark as nonshared acd0c8c kernel: move the gateworks system controller driver to an out-of-tree package c00e5a4 mpc85xx: enable the crypto acceleration driver in the kernel config instead of packaging it a2f6b56 imx6: enable the crypto acceleration driver in the kernel config instead of packaging it 93cbdde kernel: fix kmod-w1-master-mxc dependency 78de59f kernel: fix dwc2 gadget dependency 29443e2 mxs: remove modules.mk, select drivers in the kernel config 915d7db mxs: remove obsolete kernel package depending on linux 3.18 64be6fe mxs: enable the chipidea usb driver in the kernel config instead of packaging it 7450698 imx6: enable the chipidea usb driver in the kernel config instead of packaging it 7f0796d imx6: remove kmod-thermal-imx, it is already enabled in the kernel config 348fedc imx6: build support for the ventana ethernet expansion board into the kernel instead of packaging it c524d1b imx6: enable the Freescale SNVS RTC driver in the kernel config instead of packaging it 1e1d735 build: remove obsolete parallel build related options 029b36d procd: update to latest git HEAD e3358b2 malta: Fix README file examples dfe93c2 libnl: Update to 3.2.29 f2b6412 ramips: Fix VLAN limits for MT7621 GSW 1016a32 usbutils: Update usb.ids database to 2016.10.13 6ebb46a ipq806x: fix pvs1_bin voltage in ipq8065 DT e9f0b75 cyassl: update to wolfssl version 3.10.0 f036956 lantiq: update USB controller initialization 2dac674 lantiq: fix dma locking problems with SMP 828a471 tools: remove obsolete yaffs tool a9232ba tools: reorganize dependencies, fix build after deleting staging dir 589a16f px5g: remove obsolete reference to $(BUILD_VARIANT) 5903c46 build: fix build of ubifs images 1c6b1ab imx6: fix image boot ubifs compression option 3e7b894 ustream-ssl: remove legacy polarssl support 1cf64e2 px5g: remove legacy polarssl support 018d800 kernel: remove ubifs xz decompression support 8d2171e odhcp6c: add option "keep_ra_dnslifetime" f0353c5 mbedtls: re-enable CFB support c1b12aa Makefile: ensure that BIN_DIR exists for diffconfig d4ce3e8 uboot-mvebu: enable loader with the default profile 355e150 mbedtls: re-enable RC4 support (needed by transmission and others) 621f8cbf odhcpd: bump to git HEAD 4061c8e Revert "gdb: fix build with gcc 4.1.2 as host compiler" 186cd45 zlib: update to 1.2.10 50a3bce rb532: drop patch-cmdline from base-files ad76fdf rb532: switch to UBI, drop yaffs2 support, use sysupgrade for NAND 5b6b0aa rb532: convert to new loopback based overlay support c2e6ca2 build: add image command for calling kernel2minor b18f75c oxnas: minor kernel config improvements 69903c3 oxnas: require image metadata 870b7be oxnas: remove some kprintf calls from NAND driver 8f0dc92 lantiq: fix console print for additional boards 88ca639 kernel: bump to 4.4.40 5b089e4 kernel: update 4.4 kernel to 4.4.42 - base-files: add ARCH_PACKAGES to openwrt_release and os-release - ubox: turn logd into a separate package - opkg: use default PKG_BUILD_DIR - misc mac80211-updates - openvpn: let all openvpn variants provide a virtual openvpn package - x86/generic: add xen DomU support / remove xen_domU subtarget - cleanup / remove some other archs - ath9k: add stability fixes for long standing hang issues (FS#13, #34, #373, #383) TP-Link TL-WR1043ND stable WiFi again - Add back the commit "ath9k: Add airtime fairness scheduler" - ath9k: fix up a refcount imbalance error in the IRQ related fix - openssl: update to version 1.0.2k - openvpn: add support for various new 2.4 configuration options - musl: update musl to 1.1.16+ and switch to download from git - ar71xx: fix tl-wr841n-v7 switch port mapping - Fix dependency for hostapd - odhcp6c: update to git HEAD version - odhcpd: update to git HEAD version - netifd: update to git HEAD version - openvpn: ssl-enabled variants also provide a virtual openvpn-crypto package - update kmod-sched-cake and iproute - ubus: update to the latest version update routing - use olsr master from 2016-12-29 - to official olsr-master with sighup-interval - includes OLSR with disabled "6and4" and mod-nameservice0.4 update berlin-packages - fix deps of Freifunk-UI, openvpn-defaults - ffwizzard: added support for reading wifi channel from community profile 3a50141 ffwizard: remove unused variable 'sharenet' in tools.lua c193187 ffwizard: remove unused function firewall_zone_add_masq_src - allows drop of patch/800-fix_owm-firmware-name.patch which is upstream update LuCI - luci-theme-bootstrap: tune default style select boxes - community-profiles: update Berlin - patches: luci-bootstrap-input-css seems obsoleted by https://github.com/openwrt/luci/commit/d0bf6489e969f7667e2be18365d11936e73a4cac de4bda6 Merge pull request #939 from dibdot/master 6a7eaeb Merge pull request #938 from cshore-firmware/pull-request-statistics-df 3481088 luci-app-travelmate: update gui elements 61fa65f i18n: sync translations 44b56f7 luci-mod-admin-full: fix help text for wifi join options 12d861f Merge pull request #933 from musashino205/wifischd-upd-ja 7e53e57 luci-app-wifischedule: Update Japanese translation 6c13339 Merge pull request #930 from cshore-firmware/pull-request-fix-webadmin 8703653 Merge pull request #929 from bittorf/master bae8205 luci-app-olsr: adapt to changed behavior of new OLSRd v0.9.5 cf5d266 luci-ssl-openssl: update note about px5g's SSL library usage 92c537b Merge pull request #919 from kuoruan/luci-app-wifischedule d830231 Merge pull request #927 from jp-bennett/master 846bdf4 [luci-app-fwknopd] Remove usage of dynamic tag. Also adds NAT-DNS as a default setting, and enables a QR-c$ ddfe7c4 luci-app-wifischedule: minor changes 95d3f26 Merge pull request #923 from kuoruan/i18n-zh-cn a3066aa luci-app-privoxy: Update Simplified Chinese translation 70b7259 luci-base: Update Simplified Chinese translation 9dbfb9d luci-base: update LuaSrcDiet download location a2dfd21 i18n: sync translations 953d281 Merge pull request #916 from musashino205/shairplay-add-ja ebe5fdd luci-app-shairplay: Add Japanese translation 7bfd36d base: webadmin: Don't take substring of nil variable 388c84f app-statistics: df: Don't separate disk usage types - freifunk-common: bump version as of recent changes - luci-app-travelmate: update translations - luci-base: add ipmask, ipmask4 and ipmask6 validators - luci-app-firewall: use new ipmask validation types when applicable - luci-base: datatypes.lua: add missing parentheses in conditional - luci-mod-admin-full: allow unset txpower value - luci-mod-admin-full: reload wifi settings page after changing counteycode - luci-mod-admin-full: admin: change password in Map.parse() update packages - patch "add_package_snmp-mibs" made it upstream - update of net-snmp to 5.37.3 - update of tmux bf5c92a Merge pull request #3775 from jow-/net-snmp-nl-tiny 867453b Merge pull request #3785 from diizzyy/patch-17 e7e68c0 glib2: add --enable-libmount=no to HOST_CONFIGURE_ARGS ae19abe glib2: update to 2.50.2 8153fd3 Merge pull request #3729 from diizzyy/patch-1 961c97b net/shadowsocks-libev: Update to 2.6.1 8791488 Merge pull request #3828 from pprindeville/fix-perl-cgi2 e0da6bf mosquitto: Fix host UNAME detection 462219c https-dns-proxy: bump PKG_RELEASE 4de86db Merge pull request #3825 from aarond10/patch-2 d7a41ee https-dns-proxy: Fix wrong commandline argument ae9d95d utils/gnupg: Bump version; use both PKG_HASH (sha256) and PKG_MD5SUM (md5sum) cac89a3 utils/gnupg: Add myself as maintainer 933e84c utils/gnupg: Add build of gpgv 1546057 bind: update to bind-9.10.4-P5 13e5066 perl-cgi: bump package release because of PKG_LEAVE_COMMENTS 80f93e5 gnunet: fix build e62def0 Merge pull request #3822 from mhei/update-open-plc-utils 19bb3f7 Merge pull request #3740 from pprindeville/fix-perlmod-stripping 785b67a perlmod: global knob to disable comment stripping modules a0d4b80 open-plc-utils: update to commit 6a07d621583cb86ddf2fddcacb41cc4cf28bf33a 1a8c520 php7: add a patch to fix build on aarch64 d6f5933 Merge pull request #3739 from pprindeville/fix-perl-cgi 1776793 Merge pull request #3821 from chris5560/ddns-scripts 028ad67 perl-cgi: disable comment stripping which damages module 71b50a7 ddns-scripts: fixes for nslookup and khost 3823ef9 Merge pull request #3813 from NeoRaider/hostpkg 9331f99 Merge pull request #3811 from commodo/python-gmpy-drop f6e4197 Merge pull request #3818 from commodo/youtube-dl-fix 3b2e6ca Merge pull request #3816 from danrl/wireguard 65cd2a6 wireguard: version bump b5b6ef3 python: bump PKG_RELEASE to 3 8ca0284 python: remove `011-do-not-prefer-ncursesw.patch` 4e2f4a7 python: use built-in libffi lib for host build ee88853 python: link with static libs of ssl, crypto for host builds 5154683 Revert "python: don't use libressl for host build" 3bfdf67 python: drop CFLAGS in HOST_CONFIGURE_ARGS ; it's already in HOST_CONFIGURE_VARS ed5cd3e python: remove Host/Install rule default add 89d23ea Merge pull request #3703 from nxhack/icu-update-to-v58_2 67b5e98 icu: Bumped to v58.2 1c12cb6 Merge pull request #3766 from thess/ffmpeg3-update 410ce3d ccid: update to version 1.4.26 8d44169 pcsc-lite: update to version 1.8.20 b8cd28f gnunet: update source 1497a56 Merge pull request #3527 from sartura/deboostrap-bump 5589f9a Merge pull request #3814 from thess/libextractor-update 9e269e3 net/openssh: Offload main site 3fc9ae5 php7: update to 7.1.0 e15fc66 libextractor: Add Debian ffmpeg api updates. Fix gstreamer dependencies 1d85158 Merge pull request #3762 from diizzyy/patch-10 99a0747 libs/poco: Use bz2 tarball instead of gz a419873 Merge pull request #3490 from t-8ch/esniper_2.32 b8565de esniper: to 2.32.0 758184a Merge pull request #3738 from diizzyy/patch-5 8f1de0f utils/xz: Update to 5.2.3 and update URLs f3cd14d Merge pull request #3736 from damianorenfer/master c361090 Merge pull request #3807 from thess/umurmur-update 83f2f0a irssi: update to 0.8.21 4a984a8 treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG) 43f6c05 Merge pull request #3777 from pprindeville/update-isc-dhcp ab5afd7 libs/dtc: fix build on x86_64 8588159 umurmur: Update to lastest version. Replace PolarSSL with mbed TLS 462ca31 python-gmpy: drop package (in favor or python-gmpy2) 9a30e8a gnunet: upstream fixes and packaging improvements 876d139 python{,3}: remove STAGING_DIR_HOSTPKG fallback definition 564b138 Merge pull request #3800 from hauke/iotivity 0c5eb5a iotivity: make logging configurable a2bc69d iotivity: install the header files 2734f86 iotivity: replace environment patches with upstream versions 1e28dfe iotivity: update to version 1.2.1 b1398d6 iotivity: remove things manager c5c6937 iotivity: add simple client + server edd3c54 Merge pull request #3803 from diizzyy/patch-22 9e4d0a6 Merge pull request #3805 from chris5560/ddns-scripts 3a69e24 shairport-sync: Create mbed TLS version (replaces PolarSSL) 2c7d476 ddns-scripts: make cloudflare v1 same "domain" parameter syntax 72d7cb2 Merge pull request #3804 from dibdot/travelmate 50a51bc travelmate: bugfix 0.3.1 372fe29 admin/syslog-ng: Fix accidental inclusion of libs d13f3f2 gnunet: update source and remove gnunet-sqlite dummy package b621e71 Merge pull request #3791 from aarond10/patch-1 31ab5b2 https-dns-proxy: Switch from bz2 to xz 65219e2 Merge pull request #3802 from commodo/keepalived-maintainer-switch 1faf879 keepalived: switch maintainer to Ben Kelly (@scrpi) 2857071 Merge pull request #3796 from pprindeville/fix-syslog-plugins 84b136c syslog-ng: fix various install problems such as missing plugins, etc 909209e bind: Enable filter-aaaa build-time option by default. d2faf59 Merge pull request #3801 from mwarning/fix-broken-dependency-detection 6addfe5 net/zerotier: fix broken dependency detection 3923917 Merge pull request #3799 from fededim/master 863f6f8 sstp-client: updated the fake title and description (old carelessness) baae1b7 Merge pull request #3798 from fededim/master d94bc13 lftp: updated to 4.7.5 sstp-client: updated to 1.0.11 and moved under VPN submenu 21b9ac9 ser2net: update to 3.3 4e9adcb Merge pull request #3797 from diizzyy/patch-21 677492e net/transmission: Refresh patches and minor tweaks 3b73eb1 bcp38: Add note about IPv6 to package description and help text dd86386 Merge pull request #3795 from obsy/master ba55878 transmission: conversion polarssl to mbedtls ea9e3b0 luajit: move patches dir to the right place 0392cd0 Merge pull request #3787 from diizzyy/patch-19 2b85289 https-dns-proxy: Version bump 9984b85 net/zerotier: Fix source tarball filename b2bd7b4 libs/libstrophe: Fix source tarball filename e701fb9 Merge pull request #3788 from mwarning/libupnpc-detection 8beaec1 net/zerotier: improve libupnpc detection 6e26195 Merge pull request #3786 from diizzyy/patch-18 1c56d7e lang/luajit: Move to lua submenu 55da121 Merge pull request #3781 from mwarning/zerotier 47f6006 zerotier: fix upnp build support aebb014 Merge pull request #2823 from milani/luajit 0f3f62e luajit: new package 50a01b5 Merge pull request #3749 from mwarning/add-zerotier-package ac531a9 isc-dhcp: bump version to latest and fix build issues 811595c Merge pull request #3776 from diizzyy/patch-14 7273fd2 kernel/exfat-nofuse: Update to snapshot 2017-01-03 c7bdcb0 Merge pull request #3578 from MikePetullo/syslog-ng 20a1d02 Merge pull request #3577 from MikePetullo/eventlog 785159f ffmpeg: Upgrade to 3.2.2. Remove Speex support cb1e8c2 Merge pull request #3625 from p-wassi/grep_226 399d0e5 net-snmp: build against libnl-tiny a3e7b2d Merge pull request #3774 from dibdot/adblock 43971e2 adblock: bugfix 2.1.1 fd23a5e Merge pull request #3773 from commodo/python-fix-host-build ca800e6 python: don't use libressl for host build 3cc1cf8 eventlog: import from oldpackages ef0fef5 syslog-ng: import from oldpackages fad0bcc Merge pull request #3770 from diizzyy/patch-13 74e436f net-snmp: fix libnl dependency for snmpd-static 63571b3 utils/haveged: Add SF as primary download site 3195925 haveged: change hash to SHA256 8b8b93a ccrypt: change hash to SHA256 1bd7eac sox: Upgrade to 14.4.2. ffmpeg no longer required c9d239c moc: Upgrade to 2.5.2. Includes ffmpeg3 compatibility aa77076 Merge pull request #3742 from diizzyy/patch-6 0368739 net-snmp: enable AgentX support f9e96a9 Merge pull request #3746 from thess/pianod-update 8a227b4 Merge pull request #3765 from dibdot/adblock 23983d7 zerotier: add initial package 092599f adblock: update 2.1.0 0532864 Merge pull request #3761 from ClaymorePT/boost_1.63 8637073 libs/sqlite3: Update to 3.16.0 and add optimizations 6428d61 boost: Package Version Update -> 1.63.0 ca2e844 Merge pull request #3760 from KurdyMalloy/master b71421a poco: update to 1.7.7 Update package to latest stable version (1.7.7) 54d955f Merge pull request #3759 from commodo/keepalived-default-old-conf f59f751 keepalived: use old keepalived.conf by default 0ef72ba Merge pull request #3758 from stintel/keepalived_3757 28275a7 keepalived: fix recvmsg/sendmsg on mips64 again d45c0f1 Merge pull request #3755 from commodo/python3-update-build 3bf2135 Merge pull request #3754 from commodo/python-upgrade 3af2027 python3: sync makefiles with python package f04641d python: upgrade to version 2.7.13 6d91370 python: simplify/unify default build rules for python packages bb2f8fa python-dev: add python-lib2to3 as dependency 165cd9f python: update PYTHON_FOR_BUILD (based on python3) 9d87673 python: remove argument for `--with-system-ffi` configure arg (based on python3) d330a9a pianod: Update to private version 174.05. Remove PolarSSL dependency. 4174f03 net/dnscrypt-proxy: update to 1.9.1. Change config system, use config file instead of command line args, no changes made to existing UCI part. Add blacklists support 024aec7 utils/grep: update to 2.26 8288016 debootstrap: update to version 1.0.87 - vnstat: update to v1.16 --- Makefile | 106 ++++---- config.mk | 4 +- configs/common.config | 5 +- feeds.conf | 10 +- patches/000-fix-mt7620-failsafe.patch | 17 -- patches/003-add_tpl-wr842v3.patch | 275 -------------------- patches/004-add_GL-AR150.patch | 322 ------------------------ patches/100-add_package_snmp-mibs.patch | 62 ----- patches/series | 14 -- profiles/ar71xx-mikrotik.profiles | 2 +- 10 files changed, 64 insertions(+), 753 deletions(-) delete mode 100644 patches/000-fix-mt7620-failsafe.patch delete mode 100644 patches/003-add_tpl-wr842v3.patch delete mode 100644 patches/004-add_GL-AR150.patch delete mode 100644 patches/100-add_package_snmp-mibs.patch diff --git a/Makefile b/Makefile index 1cb3b71110..3b253598c4 100644 --- a/Makefile +++ b/Makefile @@ -10,13 +10,13 @@ REVISION=git describe --always # set dir and file names FW_DIR=$(shell pwd) -OPENWRT_DIR=$(FW_DIR)/openwrt +LEDE_DIR=$(FW_DIR)/lede TARGET_CONFIG=$(FW_DIR)/configs/common.config $(FW_DIR)/configs/$(TARGET).config IB_BUILD_DIR=$(FW_DIR)/imgbldr_tmp FW_TARGET_DIR=$(FW_DIR)/firmwares/$(TARGET) UMASK=umask 022 -# if any of the following files have been changed: clean up openwrt dir +# if any of the following files have been changed: clean up lede dir DEPS=$(TARGET_CONFIG) feeds.conf patches $(wildcard patches/*) # profiles to be built (router models) @@ -26,40 +26,40 @@ FW_REVISION=$(shell $(REVISION)) default: firmwares -# clone openwrt -$(OPENWRT_DIR): - git clone $(OPENWRT_SRC) $(OPENWRT_DIR) +# clone lede +$(LEDE_DIR): + git clone $(LEDE_SRC) $(LEDE_DIR) -# clean up openwrt working copy -openwrt-clean: stamp-clean-openwrt-cleaned .stamp-openwrt-cleaned -.stamp-openwrt-cleaned: config.mk | $(OPENWRT_DIR) openwrt-clean-bin - cd $(OPENWRT_DIR); \ +# clean up lede working copy +lede-clean: stamp-clean-lede-cleaned .stamp-lede-cleaned +.stamp-lede-cleaned: config.mk | $(LEDE_DIR) lede-clean-bin + cd $(LEDE_DIR); \ ./scripts/feeds clean && \ git clean -dff && git fetch && git reset --hard HEAD && \ rm -rf .config feeds.conf build_dir/target-* logs/ touch $@ -openwrt-clean-bin: - rm -rf $(OPENWRT_DIR)/bin +lede-clean-bin: + rm -rf $(LEDE_DIR)/bin -# update openwrt and checkout specified commit -openwrt-update: stamp-clean-openwrt-updated .stamp-openwrt-updated -.stamp-openwrt-updated: .stamp-openwrt-cleaned - cd $(OPENWRT_DIR); git checkout --detach $(OPENWRT_COMMIT) +# update lede and checkout specified commit +lede-update: stamp-clean-lede-updated .stamp-lede-updated +.stamp-lede-updated: .stamp-lede-cleaned + cd $(LEDE_DIR); git checkout --detach $(LEDE_COMMIT) touch $@ -# patches require updated openwrt working copy -$(OPENWRT_DIR)/patches: | .stamp-openwrt-updated +# patches require updated lede working copy +$(LEDE_DIR)/patches: | .stamp-lede-updated ln -s $(FW_DIR)/patches $@ # feeds -$(OPENWRT_DIR)/feeds.conf: .stamp-openwrt-updated feeds.conf +$(LEDE_DIR)/feeds.conf: .stamp-lede-updated feeds.conf cp $(FW_DIR)/feeds.conf $@ # update feeds feeds-update: stamp-clean-feeds-updated .stamp-feeds-updated -.stamp-feeds-updated: $(OPENWRT_DIR)/feeds.conf unpatch - +cd $(OPENWRT_DIR); \ +.stamp-feeds-updated: $(LEDE_DIR)/feeds.conf unpatch + +cd $(LEDE_DIR); \ ./scripts/feeds uninstall -a && \ ./scripts/feeds update && \ ./scripts/feeds install -a @@ -67,13 +67,13 @@ feeds-update: stamp-clean-feeds-updated .stamp-feeds-updated # prepare patch pre-patch: stamp-clean-pre-patch .stamp-pre-patch -.stamp-pre-patch: .stamp-feeds-updated $(wildcard $(FW_DIR)/patches/*) | $(OPENWRT_DIR)/patches +.stamp-pre-patch: .stamp-feeds-updated $(wildcard $(FW_DIR)/patches/*) | $(LEDE_DIR)/patches touch $@ -# patch openwrt working copy +# patch lede working copy patch: stamp-clean-patched .stamp-patched .stamp-patched: .stamp-pre-patch - cd $(OPENWRT_DIR); quilt push -a + cd $(LEDE_DIR); quilt push -a touch $@ .stamp-build_rev: .FORCE @@ -88,31 +88,31 @@ endif # share download dir $(FW_DIR)/dl: mkdir $(FW_DIR)/dl -$(OPENWRT_DIR)/dl: $(FW_DIR)/dl - ln -s $(FW_DIR)/dl $(OPENWRT_DIR)/dl +$(LEDE_DIR)/dl: $(FW_DIR)/dl + ln -s $(FW_DIR)/dl $(LEDE_DIR)/dl -# make embedded-files avail to openwrt -$(OPENWRT_DIR)/files: $(FW_DIR)/embedded-files - ln -s $(FW_DIR)/embedded-files $(OPENWRT_DIR)/files +# make embedded-files avail to lede +$(LEDE_DIR)/files: $(FW_DIR)/embedded-files + ln -s $(FW_DIR)/embedded-files $(LEDE_DIR)/files -# openwrt config -$(OPENWRT_DIR)/.config: .stamp-patched $(TARGET_CONFIG) .stamp-build_rev $(OPENWRT_DIR)/dl - cat $(TARGET_CONFIG) >$(OPENWRT_DIR)/.config - sed -i "/^CONFIG_VERSION_NUMBER=/ s/\"$$/\+$(FW_REVISION)\"/" $(OPENWRT_DIR)/.config +# lede config +$(LEDE_DIR)/.config: .stamp-patched $(TARGET_CONFIG) .stamp-build_rev $(LEDE_DIR)/dl + cat $(TARGET_CONFIG) >$(LEDE_DIR)/.config + sed -i "/^CONFIG_VERSION_NUMBER=/ s/\"$$/\+$(FW_REVISION)\"/" $(LEDE_DIR)/.config $(UMASK); \ - $(MAKE) -C $(OPENWRT_DIR) defconfig + $(MAKE) -C $(LEDE_DIR) defconfig -# prepare openwrt working copy +# prepare lede working copy prepare: stamp-clean-prepared .stamp-prepared $(OPENWRT_DIR)/files -.stamp-prepared: .stamp-patched $(OPENWRT_DIR)/.config - sed -i 's,^# REVISION:=.*,REVISION:=$(FW_REVISION),g' $(OPENWRT_DIR)/include/version.mk +.stamp-prepared: .stamp-patched $(LEDE_DIR)/.config + sed -i 's,^# REVISION:=.*,REVISION:=$(FW_REVISION),g' $(LEDE_DIR)/include/version.mk touch $@ # compile compile: stamp-clean-compiled .stamp-compiled -.stamp-compiled: .stamp-prepared openwrt-clean-bin +.stamp-compiled: .stamp-prepared lede-clean-bin $(UMASK); \ - $(MAKE) -C $(OPENWRT_DIR) $(MAKE_ARGS) + $(MAKE) -C $(LEDE_DIR) $(MAKE_ARGS) touch $@ # fill firmwares-directory with: @@ -123,8 +123,8 @@ firmwares: stamp-clean-firmwares .stamp-firmwares .stamp-firmwares: .stamp-compiled rm -rf $(IB_BUILD_DIR) mkdir -p $(IB_BUILD_DIR) - $(eval TOOLCHAIN_PATH := $(shell printf "%s:" $(OPENWRT_DIR)/staging_dir/toolchain-*/bin)) - $(eval IB_FILE := $(shell ls -tr $(OPENWRT_DIR)/bin/$(MAINTARGET)/OpenWrt-ImageBuilder-*.tar.bz2 | tail -n1)) + $(eval TOOLCHAIN_PATH := $(shell printf "%s:" $(LEDE_DIR)/staging_dir/toolchain-*/bin)) + $(eval IB_FILE := $(shell ls $(LEDE_DIR)/bin/targets/$(MAINTARGET)/$(SUBTARGET)/*-imagebuilder-*.tar.bz2)) mkdir -p $(FW_TARGET_DIR) # Create version info file GIT_BRANCH_ESC=$(shell $(GIT_BRANCH) | tr '/' '_'); \ @@ -132,12 +132,12 @@ firmwares: stamp-clean-firmwares .stamp-firmwares echo "https://github.com/freifunk-berlin/firmware" > $$VERSION_FILE; \ echo "https://wiki.freifunk.net/Berlin:Firmware" >> $$VERSION_FILE; \ echo "Firmware: git branch \"$$GIT_BRANCH_ESC\", revision $(FW_REVISION)" >> $$VERSION_FILE; \ - # add openwrt revision with data from config.mk \ - OPENWRT_REVISION=`cd $(OPENWRT_DIR); $(REVISION)`; \ - echo "OpenWRT: repository from $(OPENWRT_SRC), git branch \"$(OPENWRT_COMMIT)\", revision $$OPENWRT_REVISION" >> $$VERSION_FILE; \ + # add lede revision with data from config.mk \ + LEDE_REVISION=`cd $(LEDE_DIR); $(REVISION)`; \ + echo "OpenWRT: repository from $(LEDE_SRC), git branch \"$(LEDE_COMMIT)\", revision $$LEDE_REVISION" >> $$VERSION_FILE; \ # add feed revisions \ - for FEED in `cd $(OPENWRT_DIR); ./scripts/feeds list -n`; do \ - FEED_DIR=$(addprefix $(OPENWRT_DIR)/feeds/,$$FEED); \ + for FEED in `cd $(LEDE_DIR); ./scripts/feeds list -n`; do \ + FEED_DIR=$(addprefix $(LEDE_DIR)/feeds/,$$FEED); \ FEED_GIT_REPO=`cd $$FEED_DIR; $(GIT_REPO)`; \ FEED_GIT_BRANCH_ESC=`cd $$FEED_DIR; $(GIT_BRANCH) | tr '/' '_'`; \ FEED_REVISION=`cd $$FEED_DIR; $(REVISION)`; \ @@ -156,12 +156,12 @@ firmwares: stamp-clean-firmwares .stamp-firmwares for file in `find $(RELPATH) -name "openwrt-*"` ; do mv $$file $${file/openwrt-/kathleen-}; done # copy imagebuilder, sdk and toolchain (if existing) # remove old versions - rm -f $(FW_TARGET_DIR)/OpenWrt-*.tar.bz2 - cp -a $(OPENWRT_DIR)/bin/$(MAINTARGET)/OpenWrt-*.tar.bz2 $(FW_TARGET_DIR)/ + rm -f $(FW_TARGET_DIR)/*.tar.bz2 + cp -a $(LEDE_DIR)/bin/targets/$(MAINTARGET)/$(SUBTARGET)/*{imagebuilder,sdk,toolchain}*.tar.bz2 $(FW_TARGET_DIR)/ # copy packages PACKAGES_DIR="$(FW_TARGET_DIR)/packages"; \ rm -rf $$PACKAGES_DIR; \ - cp -a $(OPENWRT_DIR)/bin/$(MAINTARGET)/packages $$PACKAGES_DIR + cp -a $(LEDE_DIR)/bin/$(MAINTARGET)/$(SUBTARGET)/packages $$PACKAGES_DIR rm -rf $(IB_BUILD_DIR) touch $@ @@ -171,14 +171,14 @@ stamp-clean-%: stamp-clean: rm -f .stamp-* -# unpatch needs "patches/" in openwrt -unpatch: $(OPENWRT_DIR)/patches +# unpatch needs "patches/" in lede +unpatch: $(LEDE_DIR)/patches # RC = 2 of quilt --> nothing to be done - cd $(OPENWRT_DIR); quilt pop -a -f || [ $$? = 2 ] && true + cd $(LEDE_DIR); quilt pop -a -f || [ $$? = 2 ] && true rm -f .stamp-patched -clean: stamp-clean .stamp-openwrt-cleaned +clean: stamp-clean .stamp-lede-cleaned -.PHONY: openwrt-clean openwrt-clean-bin openwrt-update patch feeds-update prepare compile firmwares stamp-clean clean +.PHONY: lede-clean lede-clean-bin lede-update patch feeds-update prepare compile firmwares stamp-clean clean .NOTPARALLEL: .FORCE: diff --git a/config.mk b/config.mk index d44350ac0f..b4da536a4f 100644 --- a/config.mk +++ b/config.mk @@ -2,6 +2,6 @@ SHELL:=$(shell which bash) TARGET=ar71xx-generic PACKAGES_LIST_DEFAULT=default backbone -OPENWRT_SRC=git://github.com/openwrt/openwrt.git -OPENWRT_COMMIT=1b6dc2e48ce654a004a7d0b98d7070a515424595 +LEDE_SRC=https://git.lede-project.org/source.git +LEDE_COMMIT=5c4b2eb3dd9261d9e604dcdff2c93860a6313582 MAKE_ARGS= diff --git a/configs/common.config b/configs/common.config index 78bb02704b..4a1b3f0374 100644 --- a/configs/common.config +++ b/configs/common.config @@ -172,8 +172,9 @@ CONFIG_VERSIONOPT=y CONFIG_VERSION_DIST="Freifunk Berlin" CONFIG_VERSION_HWREV="" CONFIG_VERSION_MANUFACTURER="" -CONFIG_VERSION_NICK="Kathleen" -CONFIG_VERSION_NUMBER="experimental" +CONFIG_VERSION_NICK="Hedy" +CONFIG_VERSION_NUMBER="0.3.0-alpha" +CONFIG_VERSION_CODE="" CONFIG_VERSION_PRODUCT="" CONFIG_VERSION_REPO="http://buildbot.berlin.freifunk.net/buildbot/stable/%V/%T/packages" # CONFIG_OPENVPN_polarssl_ENABLE_DEF_AUTH is not set diff --git a/feeds.conf b/feeds.conf index 5a9cee991f..77d73904f6 100644 --- a/feeds.conf +++ b/feeds.conf @@ -1,11 +1,11 @@ -src-git packages git://github.com/openwrt/packages.git^e3e9f341e605a06d3c79b8530341a30df57d9d3f -src-git luci git://github.com/openwrt/luci.git^90474569d218cefb789f0c9cd804ccde44b532da -src-git routing git://github.com/openwrt-routing/packages.git^d580d71309f0867022ab7f47badb8c2a1860fc83 -src-git packages_berlin git://github.com/freifunk-berlin/firmware-packages.git^34d859b8eb5e7e56738a3de6bcc74e8f31072f18 +src-git packages https://github.com/openwrt/packages.git^5c749ad53ed466c0fb1b981a0f662bd0f4dec5c4 +src-git luci https://github.com/openwrt/luci.git^e306ee6c93c1ef600012f47e40dd75020d4ab555 +src-git routing https://github.com/openwrt-routing/packages.git^dd36dd47bbd75defcb3c517cafe7a19ee425f0af +src-git packages_berlin https://github.com/freifunk-berlin/firmware-packages.git^3186386056cf52ebea3c7298b0a57fa8eafc851e ## # just for reference (syntax of different feed-sources) # see https://wiki.openwrt.org/doc/devel/feeds for more info ## -#src-git packages_berlin git://github.com/freifunk-berlin/firmware-packages.git;master +#src-git packages_berlin https://github.com/freifunk-berlin/firmware-packages.git;master #src-link packages_berlin ../../../firmware-packages diff --git a/patches/000-fix-mt7620-failsafe.patch b/patches/000-fix-mt7620-failsafe.patch deleted file mode 100644 index 6c5bc398b2..0000000000 --- a/patches/000-fix-mt7620-failsafe.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: openwrt/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips -=================================================================== ---- openwrt.orig/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips -+++ openwrt/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips -@@ -26,6 +26,12 @@ ramips_set_preinit_iface() { - vconfig add eth0 1 - ifconfig eth0 up - ifname=eth0.1 -+ elif grep MT7620 /proc/cpuinfo; then -+ # from https://dev.openwrt.org/ticket/18768#comment:5 -+ swconfig dev mt7620 set reset 1 -+ swconfig dev mt7620 set enable_vlan 0 -+ swconfig dev mt7620 set apply -+ ifname=eth0 - else - ifname=eth0 - fi diff --git a/patches/003-add_tpl-wr842v3.patch b/patches/003-add_tpl-wr842v3.patch deleted file mode 100644 index e18b79fc6c..0000000000 --- a/patches/003-add_tpl-wr842v3.patch +++ /dev/null @@ -1,275 +0,0 @@ -commit 4f495c236f7a288810d1b51663b0b53081587cb9 -Author: Sven Roederer -Date: Fri May 20 23:29:08 2016 +0200 - - ar71xx: add support for TP-LINK TL-WR842N/ND v3 - - - CPU QCA9531-BL3A - - RAM: 64MB - - flash: 16MB - - USB - - AP143 platform, similar to tl-wr841n v10/v11, but with USB - - modified for OpenWRT-CC from LEDE-Project 0b45bec22c59cc6e6b2fa71dc9a88386c5587132 - -Index: openwrt/target/linux/ar71xx/base-files/etc/diag.sh -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/etc/diag.sh -+++ openwrt/target/linux/ar71xx/base-files/etc/diag.sh -@@ -280,6 +280,7 @@ get_status_led() { - tl-wr841n-v11 | \ - tl-wa830re-v2 | \ - tl-wr842n-v2 | \ -+ tl-wr842n-v3 | \ - tl-wr941nd | \ - tl-wr941nd-v5) - status_led="tp-link:green:system" -Index: openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -+++ openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -@@ -519,6 +519,16 @@ tl-wr842n-v2) - ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" - ;; - -+tl-wr842n-v3) -+ ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" -+ ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" -+ ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" -+ ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" -+ ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" -+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" -+ ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" -+ ;; -+ - tl-wa801nd-v2 | \ - tl-wa901nd-v3) - ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" -Index: openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -+++ openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -@@ -440,6 +440,7 @@ tl-wr741nd-v4 |\ - tl-wr841n-v7 |\ - tl-wr841n-v9 |\ - tl-wr841n-v11 |\ -+tl-wr842n-v3 |\ - whr-g301n |\ - whr-hp-g300n |\ - whr-hp-gn |\ -Index: openwrt/target/linux/ar71xx/base-files/lib/ar71xx.sh -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ openwrt/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -821,6 +821,9 @@ ar71xx_board_detect() { - *"TL-WR842N/ND v2") - name="tl-wr842n-v2" - ;; -+ *"TL-WR842N/ND v3") -+ name="tl-wr842n-v3" -+ ;; - *TL-WR941ND) - name="tl-wr941nd" - ;; -Index: openwrt/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -+++ openwrt/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -@@ -360,6 +360,7 @@ platform_check_image() { - tl-wr841n-v9 | \ - tl-wr841n-v11 | \ - tl-wr842n-v2 | \ -+ tl-wr842n-v3 | \ - tl-wr941nd | \ - tl-wr941nd-v5 | \ - tl-wr941nd-v6 | \ -Index: openwrt/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c -=================================================================== ---- openwrt.orig/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c -+++ openwrt/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c -@@ -1,5 +1,5 @@ - /* -- * TP-LINK TL-WR841N/ND v9/v11 -+ * TP-LINK TL-WR841N/ND v9/v11/TL-WR842N/ND v3 - * - * Copyright (C) 2014 Matthias Schiffer - * Copyright (C) 2016 Cezary Jackiewicz -@@ -49,6 +49,20 @@ - #define TL_WR841NV11_GPIO_BTN_RESET 12 - #define TL_WR841NV11_GPIO_BTN_WIFI 17 - -+#define TL_WR842NV3_GPIO_LED_SYSTEM 2 -+#define TL_WR842NV3_GPIO_LED_WLAN 3 -+#define TL_WR842NV3_GPIO_LED_WAN_RED 4 -+#define TL_WR842NV3_GPIO_LED_WAN_GREEN 11 -+#define TL_WR842NV3_GPIO_LED_LAN1 12 -+#define TL_WR842NV3_GPIO_LED_LAN2 13 -+#define TL_WR842NV3_GPIO_LED_LAN3 14 -+#define TL_WR842NV3_GPIO_LED_LAN4 15 -+#define TL_WR842NV3_GPIO_LED_3G 16 -+#define TL_WR842NV3_GPIO_LED_WPS 17 -+ -+#define TL_WR842NV3_GPIO_BTN_RESET 1 -+#define TL_WR842NV3_GPIO_BTN_WIFI 0 -+ - #define TL_WR841NV9_KEYS_POLL_INTERVAL 20 /* msecs */ - #define TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV9_KEYS_POLL_INTERVAL) - -@@ -151,6 +165,68 @@ static struct gpio_led tl_wr841n_v11_led - }, - }; - -+static struct gpio_led tl_wr842n_v3_leds_gpio[] __initdata = { -+ { -+ .name = "tp-link:green:lan1", -+ .gpio = TL_WR842NV3_GPIO_LED_LAN1, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:lan2", -+ .gpio = TL_WR842NV3_GPIO_LED_LAN2, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:lan3", -+ .gpio = TL_WR842NV3_GPIO_LED_LAN3, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:lan4", -+ .gpio = TL_WR842NV3_GPIO_LED_LAN4, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:wan", -+ .gpio = TL_WR842NV3_GPIO_LED_WAN_GREEN, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:red:wan", -+ .gpio = TL_WR842NV3_GPIO_LED_WAN_RED, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:wlan", -+ .gpio = TL_WR842NV3_GPIO_LED_WLAN, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:system", -+ .gpio = TL_WR842NV3_GPIO_LED_SYSTEM, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:3g", -+ .gpio = TL_WR842NV3_GPIO_LED_3G, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:wps", -+ .gpio = TL_WR842NV3_GPIO_LED_WPS, -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_keys_button tl_wr842n_v3_gpio_keys[] __initdata = { -+ { -+ .desc = "Reset button", -+ .type = EV_KEY, -+ .code = KEY_RESTART, -+ .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = TL_WR842NV3_GPIO_BTN_RESET, -+ .active_low = 1, -+ }, { -+ .desc = "WIFI button", -+ .type = EV_KEY, -+ .code = KEY_RFKILL, -+ .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = TL_WR842NV3_GPIO_BTN_WIFI, -+ .active_low = 1, -+ } -+}; -+ - static void __init tl_ap143_setup(void) - { - u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); -@@ -212,3 +288,21 @@ static void __init tl_wr841n_v11_setup(v - - MIPS_MACHINE(ATH79_MACH_TL_WR841N_V11, "TL-WR841N-v11", "TP-LINK TL-WR841N/ND v11", - tl_wr841n_v11_setup); -+ -+static void __init tl_wr842n_v3_setup(void) -+{ -+ tl_ap143_setup(); -+ -+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr842n_v3_leds_gpio), -+ tl_wr842n_v3_leds_gpio); -+ -+ ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL, -+ ARRAY_SIZE(tl_wr842n_v3_gpio_keys), -+ tl_wr842n_v3_gpio_keys); -+ -+ ath79_register_usb(); -+} -+ -+MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", -+ tl_wr842n_v3_setup); -+ -Index: openwrt/target/linux/ar71xx/image/Makefile -=================================================================== ---- openwrt.orig/target/linux/ar71xx/image/Makefile -+++ openwrt/target/linux/ar71xx/image/Makefile -@@ -590,6 +590,13 @@ define Device/tl-wr842n-v2 - TPLINK_HWID := 0x8420002 - endef - -+define Device/tl-wr842n-v3 -+ $(Device/tplink-16mlzma) -+ BOARDNAME := TL-WR842N-v3 -+ DEVICE_PROFILE := TLWR842 -+ TPLINK_HWID := 0x08420003 -+endef -+ - define Device/tl-wr843nd-v1 - $(Device/tplink-4mlzma) - BOARDNAME := TL-WR841N-v8 -@@ -603,7 +610,7 @@ define Device/tl-wr847n-v8 - DEVICE_PROFILE := TLWR841 - TPLINK_HWID := 0x08470008 - endef --TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8 -+TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr842n-v3 tl-wr843nd-v1 tl-wr847n-v8 - - define Device/tl-wr941nd-v5 - $(Device/tplink-4mlzma) -Index: openwrt/target/linux/ar71xx/patches-3.18/912-MIPS-ath79-add-tl_wr842v3.patch -=================================================================== ---- /dev/null -+++ openwrt/target/linux/ar71xx/patches-3.18/912-MIPS-ath79-add-tl_wr842v3.patch -@@ -0,0 +1,34 @@ -+--- a/arch/mips/ath79/Kconfig -++++ b/arch/mips/ath79/Kconfig -+@@ -1314,13 +1314,14 @@ config ATH79_MACH_TL_WR841N_V8 -+ select ATH79_DEV_WMAC -+ -+ config ATH79_MACH_TL_WR841N_V9 -+- bool "TP-LINK TL-WR841N/ND v9 support" -+- select SOC_QCA953X -+- select ATH79_DEV_ETH -+- select ATH79_DEV_GPIO_BUTTONS -+- select ATH79_DEV_LEDS_GPIO -+- select ATH79_DEV_M25P80 -+- select ATH79_DEV_WMAC -++ bool "TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 support" -++ select SOC_QCA953X -++ select ATH79_DEV_ETH -++ select ATH79_DEV_GPIO_BUTTONS -++ select ATH79_DEV_LEDS_GPIO -++ select ATH79_DEV_M25P80 -++ select ATH79_DEV_USB -++ select ATH79_DEV_WMAC -+ -+ config ATH79_MACH_TL_WR941ND -+ bool "TP-LINK TL-WR941ND support"--- a/arch/mips/ath79/machtypes.h -+--- a/arch/mips/ath79/machtypes.h -++++ b/arch/mips/ath79/machtypes.h -+@@ -171,6 +171,7 @@ -+ ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */ -+ ATH79_MACH_TL_WR841N_V9, /* TP-LINK TL-WR841N/ND v9 */ -+ ATH79_MACH_TL_WR842N_V2, /* TP-LINK TL-WR842N/ND v2 */ -++ ATH79_MACH_TL_WR842N_V3, /* TP-LINK TL-WR842N/ND v3 */ -+ ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ -+ ATH79_MACH_TL_WR941ND_V5, /* TP-LINK TL-WR941ND v5 */ -+ ATH79_MACH_TL_WR941ND_V6, /* TP-LINK TL-WR941ND v6 */ diff --git a/patches/004-add_GL-AR150.patch b/patches/004-add_GL-AR150.patch deleted file mode 100644 index 5f9719960a..0000000000 --- a/patches/004-add_GL-AR150.patch +++ /dev/null @@ -1,322 +0,0 @@ -commit e466da52e3ac0fca93cfb3bd10da7582c7e3e28d -Author: alzhao@gmail.com -Date: Thu May 5 11:02:05 2016 +0800 - - ar71xx: add GL-AR150 support - - Backport of changeset 47620, add support of GL-AR150 to cc - - Signed-off-by: Alfie Zhao - -Index: openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -+++ openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -@@ -188,6 +188,10 @@ dlan-pro-1200-ac) - ucidef_set_led_trigger_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0" - ;; - -+gl-ar150) -+ ucidef_set_led_wlan "wlan" "WLAN" "gl_ar150:wlan" "phy0tpt" -+ ;; -+ - gl-inet) - ucidef_set_led_netdev "lan" "LAN" "gl-connect:green:lan" "eth1" - ucidef_set_led_wlan "wlan" "WLAN" "gl-connect:red:wlan" "phy0tpt" -Index: openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -+++ openwrt/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -@@ -382,6 +382,7 @@ dir-505-a1) - alfa-ap96 |\ - alfa-nx |\ - ap83 |\ -+gl-ar150 |\ - gl-inet |\ - jwap003 |\ - pb42 |\ -Index: openwrt/target/linux/ar71xx/base-files/lib/ar71xx.sh -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ openwrt/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -461,6 +461,9 @@ ar71xx_board_detect() { - name="gl-inet" - gl_inet_board_detect - ;; -+ *"GL-AR150") -+ name="gl-ar150" -+ ;; - *"EnGenius EPG5000") - name="epg5000" - ;; -Index: openwrt/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -=================================================================== ---- openwrt.orig/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -+++ openwrt/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -@@ -212,6 +212,7 @@ platform_check_image() { - dlan-pro-500-wp | \ - dlan-pro-1200-ac | \ - dragino2 | \ -+ gl-ar150 | \ - epg5000 | \ - esr1750 | \ - esr900 | \ -Index: openwrt/target/linux/ar71xx/config-3.18 -=================================================================== ---- openwrt.orig/target/linux/ar71xx/config-3.18 -+++ openwrt/target/linux/ar71xx/config-3.18 -@@ -70,6 +70,7 @@ CONFIG_ATH79_MACH_ESR1750=y - CONFIG_ATH79_MACH_ESR900=y - CONFIG_ATH79_MACH_EW_DORIN=y - CONFIG_ATH79_MACH_F9K1115V2=y -+CONFIG_ATH79_MACH_GL_AR150=y - CONFIG_ATH79_MACH_GL_INET=y - CONFIG_ATH79_MACH_GS_MINIBOX_V1=y - CONFIG_ATH79_MACH_GS_OOLITE=y -Index: openwrt/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c -=================================================================== ---- /dev/null -+++ openwrt/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c -@@ -0,0 +1,125 @@ -+/* -+ * GL_ar150 board support -+ * -+ * Copyright (C) 2011 dongyuqi <729650915@qq.com> -+ * Copyright (C) 2011-2012 Gabor Juhos -+ * Copyright (C) 2013 alzhao -+ * Copyright (C) 2014 Michel Stempin -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published -+ * by the Free Software Foundation. -+*/ -+ -+#include -+ -+#include -+ -+#include "dev-eth.h" -+#include "dev-gpio-buttons.h" -+#include "dev-leds-gpio.h" -+#include "dev-m25p80.h" -+#include "dev-usb.h" -+#include "dev-wmac.h" -+#include "machtypes.h" -+ -+#define GL_AR150_GPIO_LED_WLAN 0 -+#define GL_AR150_GPIO_LED_LAN 13 -+#define GL_AR150_GPIO_LED_WAN 15 -+ -+#define GL_AR150_GPIO_BIN_USB 6 -+#define GL_AR150_GPIO_BTN_MANUAL 7 -+#define GL_AR150_GPIO_BTN_AUTO 8 -+#define GL_AR150_GPIO_BTN_RESET 11 -+ -+#define GL_AR150_KEYS_POLL_INTERVAL 20 /* msecs */ -+#define GL_AR150_KEYS_DEBOUNCE_INTERVAL (3 * GL_AR150_KEYS_POLL_INTERVAL) -+ -+#define GL_AR150_MAC0_OFFSET 0x0000 -+#define GL_AR150_MAC1_OFFSET 0x0000 -+#define GL_AR150_CALDATA_OFFSET 0x1000 -+#define GL_AR150_WMAC_MAC_OFFSET 0x0000 -+ -+static struct gpio_led gl_ar150_leds_gpio[] __initdata = { -+ { -+ .name = "gl_ar150:wlan", -+ .gpio = GL_AR150_GPIO_LED_WLAN, -+ .active_low = 0, -+ }, -+ { -+ .name = "gl_ar150:lan", -+ .gpio = GL_AR150_GPIO_LED_LAN, -+ .active_low = 0, -+ }, -+ { -+ .name = "gl_ar150:wan", -+ .gpio = GL_AR150_GPIO_LED_WAN, -+ .active_low = 0, -+ .default_state = 1, -+ }, -+}; -+ -+static struct gpio_keys_button gl_ar150_gpio_keys[] __initdata = { -+ { -+ .desc = "BTN_7", -+ .type = EV_KEY, -+ .code = BTN_7, -+ .debounce_interval = GL_AR150_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = GL_AR150_GPIO_BTN_MANUAL, -+ .active_low = 0, -+ }, -+ { -+ .desc = "BTN_8", -+ .type = EV_KEY, -+ .code = BTN_8, -+ .debounce_interval = GL_AR150_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = GL_AR150_GPIO_BTN_AUTO, -+ .active_low = 0, -+ }, -+ { -+ .desc = "reset", -+ .type = EV_KEY, -+ .code = KEY_RESTART, -+ .debounce_interval = GL_AR150_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = GL_AR150_GPIO_BTN_RESET, -+ .active_low = 0, -+ }, -+}; -+ -+static void __init gl_ar150_setup(void) -+{ -+ -+ /* ART base address */ -+ u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); -+ -+ /* disable PHY_SWAP and PHY_ADDR_SWAP bits */ -+ ath79_setup_ar933x_phy4_switch(false, false); -+ -+ /* register flash. */ -+ ath79_register_m25p80(NULL); -+ -+ /* register gpio LEDs and keys */ -+ ath79_register_leds_gpio(-1, ARRAY_SIZE(gl_ar150_leds_gpio), -+ gl_ar150_leds_gpio); -+ ath79_register_gpio_keys_polled(-1, GL_AR150_KEYS_POLL_INTERVAL, -+ ARRAY_SIZE(gl_ar150_gpio_keys), -+ gl_ar150_gpio_keys); -+ -+ /* enable usb */ -+ gpio_request_one(GL_AR150_GPIO_BIN_USB, -+ GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, -+ "USB power"); -+ ath79_register_usb(); -+ -+ /* register eth0 as WAN, eth1 as LAN */ -+ ath79_init_mac(ath79_eth0_data.mac_addr, art+GL_AR150_MAC0_OFFSET, 0); -+ ath79_init_mac(ath79_eth1_data.mac_addr, art+GL_AR150_MAC1_OFFSET, 0); -+ ath79_register_mdio(0, 0x0); -+ ath79_register_eth(0); -+ ath79_register_eth(1); -+ -+ /* register wireless mac with cal data */ -+ ath79_register_wmac(art + GL_AR150_CALDATA_OFFSET, art + GL_AR150_WMAC_MAC_OFFSET); -+} -+ -+MIPS_MACHINE(ATH79_MACH_GL_AR150, "GL-AR150", "GL-AR150",gl_ar150_setup); -Index: openwrt/target/linux/ar71xx/generic/profiles/gl-connect.mk -=================================================================== ---- openwrt.orig/target/linux/ar71xx/generic/profiles/gl-connect.mk -+++ /dev/null -@@ -1,17 +0,0 @@ --# --# Copyright (C) 2014 OpenWrt.org --# --# This is free software, licensed under the GNU General Public License v2. --# See /LICENSE for more information. --# -- --define Profile/GLINET -- NAME:=GL.iNet -- PACKAGES:=kmod-usb-core kmod-usb2 --endef -- --define Profile/GLINET/Description -- Package set optimized for the GL-Connect GL.iNet v1. --endef -- --$(eval $(call Profile,GLINET)) -Index: openwrt/target/linux/ar71xx/generic/profiles/gli.mk -=================================================================== ---- /dev/null -+++ openwrt/target/linux/ar71xx/generic/profiles/gli.mk -@@ -0,0 +1,27 @@ -+# -+# Copyright (C) 2013 OpenWrt.org -+# -+# This is free software, licensed under the GNU General Public License v2. -+# See /LICENSE for more information. -+# -+define Profile/GLINET -+ NAME:=GL.iNet 6416 -+ PACKAGES:=kmod-usb-core kmod-usb2 -+endef -+ -+define Profile/GLINET/Description -+ Package set optimized for the GL-Connect GL.iNet v1. -+endef -+ -+$(eval $(call Profile,GLINET)) -+ -+define Profile/GL-AR150 -+ NAME:=GL-AR150 -+ PACKAGES:=kmod-usb-core kmod-usb2 -+endef -+ -+define Profile/GL-AR150/Description -+ Configuration of GL-AR150. -+endef -+ -+$(eval $(call Profile,GL-AR150)) -Index: openwrt/target/linux/ar71xx/image/Makefile -=================================================================== ---- openwrt.orig/target/linux/ar71xx/image/Makefile -+++ openwrt/target/linux/ar71xx/image/Makefile -@@ -144,6 +144,14 @@ define Device/weio - endef - TARGET_DEVICES += weio - -+define Device/gl-ar150 -+ BOARDNAME = GL-AR150 -+ IMAGE_SIZE = 16000k -+ CONSOLE = ttyATH0,115200 -+ MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro -+endef -+TARGET_DEVICES += gl-ar150 -+ - define Device/wndr3700 - BOARDNAME = WNDR3700 - NETGEAR_KERNEL_MAGIC = 0x33373030 -Index: openwrt/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-gl_ar150.patch -=================================================================== ---- /dev/null -+++ openwrt/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-gl_ar150.patch -@@ -0,0 +1,39 @@ -+--- a/arch/mips/ath79/Kconfig -++++ b/arch/mips/ath79/Kconfig -+@@ -533,6 +533,16 @@ config ATH79_MACH_GL_INET -+ select ATH79_DEV_USB -+ select ATH79_DEV_WMAC -+ -++config ATH79_MACH_GL_AR150 -++ bool "GL AR150 support" -++ select SOC_AR933X -++ select ATH79_DEV_ETH -++ select ATH79_DEV_GPIO_BUTTONS -++ select ATH79_DEV_LEDS_GPIO -++ select ATH79_DEV_M25P80 -++ select ATH79_DEV_USB -++ select ATH79_DEV_WMAC -++ -+ config ATH79_MACH_EAP300V2 -+ bool "EnGenius EAP300 v2 support" -+ select SOC_AR934X -+--- a/arch/mips/ath79/Makefile -++++ b/arch/mips/ath79/Makefile -+@@ -78,6 +78,7 @@ obj-$(CONFIG_ATH79_MACH_EL_MINI) += mach -+ obj-$(CONFIG_ATH79_MACH_EPG5000) += mach-epg5000.o -+ obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o -+ obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o -++obj-$(CONFIG_ATH79_MACH_GL_AR150) += mach-gl-ar150.o -+ obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o -+ obj-$(CONFIG_ATH79_MACH_GS_MINIBOX_V1) += mach-gs-minibox-v1.o -+ obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o -+--- a/arch/mips/ath79/machtypes.h -++++ b/arch/mips/ath79/machtypes.h -+@@ -67,6 +67,7 @@ enum ath79_mach_type { -+ ATH79_MACH_ESR1750, /* EnGenius ESR1750 */ -+ ATH79_MACH_EPG5000, /* EnGenius EPG5000 */ -+ ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ -++ ATH79_MACH_GL_AR150, /* GL-AR150 support */ -+ ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */ -+ ATH79_MACH_GS_MINIBOX_V1, /* Gainstrong MiniBox V1.0 */ -+ ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */ diff --git a/patches/100-add_package_snmp-mibs.patch b/patches/100-add_package_snmp-mibs.patch deleted file mode 100644 index cd19571689..0000000000 --- a/patches/100-add_package_snmp-mibs.patch +++ /dev/null @@ -1,62 +0,0 @@ -commit 5eead6cd002b4d66f13123886c2d263ef94ec351 -Author: Sven Roederer -Date: Sat Jul 23 13:26:01 2016 +0200 - - net-snmp: add package snmp-mibs - - this installs the default MIBS-files under /usr/share/snmp/mibs - -diff --git a/feeds/packages/net/net-snmp/Makefile b/feeds/packages/net/net-snmp/Makefile -index 5736e0d..86a70b1 100644 ---- a/feeds/packages/net/net-snmp/Makefile -+++ b/feeds/packages/net/net-snmp/Makefile -@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk - - PKG_NAME:=net-snmp - PKG_VERSION:=5.4.4 --PKG_RELEASE:=1 -+PKG_RELEASE:=2 - - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=@SF/net-snmp -@@ -88,6 +88,18 @@ $(call Package/net-snmp/Default/description) - endef - - -+define Package/snmp-mibs -+$(call Package/net-snmp/Default) -+ TITLE:=Open source SNMP implementation (MIB-files) -+endef -+ -+define Package/snmp-mibs/description -+$(call Package/net-snmp/Default/description) -+ . -+ This package contains SNMP MIB-Files. -+endef -+ -+ - SNMP_MIB_MODULES_INCLUDED = \ - host/hr_device \ - host/hr_disk \ -@@ -164,7 +176,6 @@ CONFIGURE_ARGS += \ - --enable-applications \ - --disable-debugging \ - --disable-manuals \ -- --disable-mibs \ - --disable-scripts \ - --with-out-mib-modules="$(SNMP_MIB_MODULES_EXCLUDED)" \ - --with-mib-modules="$(SNMP_MIB_MODULES_INCLUDED)" \ -@@ -250,7 +261,13 @@ define Package/snmp-utils/install - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/ - endef - -+define Package/snmp-mibs/install -+ $(INSTALL_DIR) $(1)/usr/share/snmp/mibs -+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/snmp/mibs/* $(1)/usr/share/snmp/mibs/ -+endef -+ - $(eval $(call BuildPackage,libnetsnmp)) - $(eval $(call BuildPackage,snmp-utils)) - $(eval $(call BuildPackage,snmpd)) - $(eval $(call BuildPackage,snmpd-static)) -+$(eval $(call BuildPackage,snmp-mibs)) diff --git a/patches/series b/patches/series index 765466ae58..94978a75a3 100644 --- a/patches/series +++ b/patches/series @@ -1,19 +1,5 @@ -000-fix-mt7620-failsafe.patch 001-rt2x00_allow_adhoc_and_ap.patch 002-add_ramips-nexx-image.patch -003-add_tpl-wr842v3.patch -004-add_GL-AR150.patch -005-add_GL-AR300.patch -006-add_GL-DominoPi.patch -007-add_GL-MT300A.patch -008-add_GL-MT300N.patch -009-add_GL-MT750.patch -010-tpl-CPE_enable_LNA.patch -011-tpl-wr841_names.patch -012-iwinfo_add_nsm2locoxm.patch -100-add_package_snmp-mibs.patch -200-update-community-profiles.patch 600-imagebuilder-custom-postinst-script.patch 701-luci-freifunk-policyrouting-berlin.patch -702-luci-bootstrap-input-css.patch 703-policyrouting_fix_bypass-vpn.patch diff --git a/profiles/ar71xx-mikrotik.profiles b/profiles/ar71xx-mikrotik.profiles index 8b19395a15..697bb66f2c 100644 --- a/profiles/ar71xx-mikrotik.profiles +++ b/profiles/ar71xx-mikrotik.profiles @@ -1 +1 @@ -DefaultNoWifi +Default