diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 3d320178e6..eb41da3d2f 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,12 +3,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .71 -LINUX_VERSION-4.4 = .89 -LINUX_VERSION-4.9 = .52 +LINUX_VERSION-4.4 = .91 +LINUX_VERSION-4.9 = .54 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 -LINUX_KERNEL_HASH-4.4.89 = a81d1b1306e4fddee5d6f7219090a616073b02f4069e44522a9c0454b17f2b67 -LINUX_KERNEL_HASH-4.9.52 = ffdd034f1bf32fa41d1a66a347388c0dc4c3cff6f578a1e29d88b20fbae1048a +LINUX_KERNEL_HASH-4.4.91 = cb9d2b8c1afe58414de5bc7d65429cc9f5f37c80fc229d0e83c55c5c3c254ffb +LINUX_KERNEL_HASH-4.9.54 = 651005db6efbce4fcd607415ebd697dd8d2f5a2abc2c632b11ece03a1a210fc5 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/include/target.mk b/include/target.mk index 932d16c307..86c5e6bd5e 100644 --- a/include/target.mk +++ b/include/target.mk @@ -16,7 +16,8 @@ DEVICE_TYPE?=router DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd \ iptables-mod-nat-extra kmod-nf-nathelper kmod-nf-nathelper-extra kmod-macvlan block-mount \ default-settings ipset-lists luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ -luci-app-filetransfer luci-app-shadowsocksr-pro luci-app-usb-printer luci-app-vsftpd luci-app-sfe +luci-app-filetransfer luci-app-shadowsocksr-pro luci-app-usb-printer luci-app-vsftpd luci-app-sfe \ +luci-app-pptp-server luci-app-ipsec-vpnd # For nas targets DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm # For router targets diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index d10232be9f..31d4553437 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=3 +PKG_RELEASE:=6 include $(INCLUDE_DIR)/package.mk @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define Package/autocore TITLE:=x86/x64 auto core loadbalance script. MAINTAINER:=Lean - DEPENDS:=@TARGET_x86 +bc + DEPENDS:=@TARGET_x86 +bc +lm-sensors endef define Package/autocore/description diff --git a/package/lean/autocore/files/autocore b/package/lean/autocore/files/autocore index 216b362294..0b75d5d16c 100755 --- a/package/lean/autocore/files/autocore +++ b/package/lean/autocore/files/autocore @@ -23,6 +23,12 @@ start() do echo $cc > $fileRps done + + a=$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq) + b=$(echo -n ' x ') + c=$(cat /proc/cpuinfo | grep 'processor' | wc -l) + f=${a}${b}${c} + echo $f > /tmp/sysinfo/model } diff --git a/package/lean/automount/Makefile b/package/lean/automount/Makefile index 3d56204199..8881a060d0 100644 --- a/package/lean/automount/Makefile +++ b/package/lean/automount/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=automount PKG_VERSION:=1 -PKG_RELEASE:=18 +PKG_RELEASE:=19 PKG_ARCH:=all include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/automount/files/15-automount b/package/lean/automount/files/15-automount index 1948d75a0b..dd518c4ecb 100755 --- a/package/lean/automount/files/15-automount +++ b/package/lean/automount/files/15-automount @@ -14,6 +14,7 @@ if [ $basename != "block" ] && [ -z "${device##sd*}" ] && [ $skip -eq 1 ]; then case "$ACTION" in add) mkdir -p /mnt/$mntpnt + chmod 777 /mnt/$mntpnt # Try to be gentle on solid state devices mount -o rw,noatime,discard /dev/$device /mnt/$mntpnt ;; diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 4aaad4d2a2..3d47004399 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.0 -PKG_RELEASE:=21 +PKG_RELEASE:=22 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 4e11b0aa3c..ee88e8b45e 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -47,9 +47,9 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh wifi up sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='R7.4.1 By Lean'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R7.4.2 By Lean'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release -echo "DISTRIB_DESCRIPTION='LEDE 17.01.2'" >> /etc/openwrt_release +echo "DISTRIB_DESCRIPTION='LEDE 17.01.3'" >> /etc/openwrt_release exit 0 diff --git a/package/lean/libcryptopp/Makefile b/package/lean/libcryptopp/Makefile new file mode 100644 index 0000000000..f37b6088be --- /dev/null +++ b/package/lean/libcryptopp/Makefile @@ -0,0 +1,66 @@ +# +# Copyright (C) 2009-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libcryptopp +PKG_VERSION:=5.6.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=cryptopp$(subst .,,$(PKG_VERSION)).zip +PKG_SOURCE_URL:=http://www.cryptopp.com/ +PKG_MD5SUM:=4ee7e5cdd4a45a14756c169eaf2a77fc + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) + +CMAKE_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/libcryptopp + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libpthread +libstdcpp + TITLE:=Crypto++ is library for creating C++ programs which use cryptographic algorithms + URL:=http://packages.debian.org/sid/libcrypto++-dev +endef + +define Package/package/libcryptopp + Crypto++ is library for creating C++ programs which use cryptographic algorithms. + The library uses a Pipes & Filters architecture with heavy use of templates and + abstract base classes. +endef + +#CONFIGURE_ARGS += \ +# --enable-static \ +# --enable-shared + +#TARGET_LDFLAGS += \ +# -lpthread +CMAKE_OPTIONS += -DCMAKE_CXX_FLAGS="$(FPIC)" +CMAKE_OPTIONS += -DBUILD_STATIC=ON +CMAKE_OPTIONS += -DBUILD_SHARED=ON + +UNPACK_CMD=cd $(PKG_BUILD_DIR) && unzip "$(DL_DIR)/$(PKG_SOURCE)" +define Build/Prepare + $(Build/Prepare/Default) + cd $(PKG_BUILD_DIR) && rm -f GNUmakefile GNUmakefile-cross +endef +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/cryptopp + $(CP) $(PKG_INSTALL_DIR)/usr/include/cryptopp/* $(1)/usr/include/cryptopp/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptopp.{a,so*} $(1)/usr/lib/ +endef + +define Package/libcryptopp/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptopp.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libcryptopp)) diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index ad6623a4d0..4f45f5c056 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/package/lean/luci-app-adbyby-plus/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +coreutils +coreutils-nohup +dnsmasq-full LUCI_PKGARCH:=all PKG_NAME:=luci-app-adbyby-plus PKG_VERSION:=2.0 -PKG_RELEASE:=20 +PKG_RELEASE:=22 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh index 9f6bef759a..c9030aea7a 100755 --- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh +++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh @@ -5,13 +5,13 @@ update_source=$(uci get adbyby.@adbyby[0].update_source 2>/dev/null) rm -f /usr/share/adbyby/data/*.bak if [ $update_source -eq 1 ]; then - wget -t 1 -T 10 -O /tmp/lazy.txt http://update.adbyby.com/rule3/lazy.jpg - wget -t 1 -T 10 -O /tmp/video.txt http://update.adbyby.com/rule3/video.jpg - wget -t 1 -T 10 -O /tmp/user.action http://update.adbyby.com/rule3/user.action + wget-ssl -t 1 -T 10 -O /tmp/lazy.txt http://update.adbyby.com/rule3/lazy.jpg + wget-ssl -t 1 -T 10 -O /tmp/video.txt http://update.adbyby.com/rule3/video.jpg + wget-ssl -t 1 -T 10 -O /tmp/user.action http://update.adbyby.com/rule3/user.action fi -[ ! -s "/tmp/lazy.txt" ] && wget --no-check-certificate -O /tmp/lazy.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt -[ ! -s "/tmp/video.txt" ] && wget --no-check-certificate -O /tmp/video.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/video.txt +[ ! -s "/tmp/lazy.txt" ] && wget-ssl --no-check-certificate -O /tmp/lazy.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt +[ ! -s "/tmp/video.txt" ] && wget-ssl --no-check-certificate -O /tmp/video.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/video.txt [ -s "/tmp/lazy.txt" ] && ( ! cmp -s /tmp/lazy.txt /usr/share/adbyby/data/lazy.txt ) && mv /tmp/lazy.txt /usr/share/adbyby/data/lazy.txt [ -s "/tmp/video.txt" ] && ( ! cmp -s /tmp/video.txt /usr/share/adbyby/data/video.txt ) && mv /tmp/video.txt /usr/share/adbyby/data/video.txt diff --git a/package/lean/luci-app-shadowsocksr-pro/Makefile b/package/lean/luci-app-shadowsocksr-pro/Makefile index d7d807984f..d5b2b15432 100644 --- a/package/lean/luci-app-shadowsocksr-pro/Makefile +++ b/package/lean/luci-app-shadowsocksr-pro/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for Shadowsocksr LUCI_DEPENDS:=+iptables-mod-tproxy +kmod-ipt-tproxy +ip +ipset-lists +shadowsocksr-libev-alt +pdnsd-alt +coreutils +coreutils-base64 +coreutils-nohup +dnsmasq-full LUCI_PKGARCH:=all PKG_VERSION:=2.0 -PKG_RELEASE:=17 +PKG_RELEASE:=18 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua b/package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua index 6a43954454..bac488c56b 100644 --- a/package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua +++ b/package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua @@ -122,6 +122,8 @@ protocol:value("auth_chain_a") protocol:value("auth_chain_b") protocol:value("auth_chain_c") protocol:value("auth_chain_d") +protocol:value("auth_chain_e") +protocol:value("auth_chain_f") obfs = s:taboption("main",ListValue, "obfs", translate("Obfs Param")) obfs:value("plain") @@ -143,8 +145,6 @@ obfs_param.rmempty = true obfs_param.datatype = "host" obfs_param:depends("plugin_param", "1") - - s:tab("list", translate("User-defined GFW-List")) gfwlist = s:taboption("list", TextValue, "conf") gfwlist.description = translate("
（!）Note: When the domain name is entered and will automatically merge with the online GFW-List. Please manually update the GFW-List list after applying.") diff --git a/package/lean/shadowsocksR-libev-full/Makefile b/package/lean/shadowsocksR-libev-full/Makefile index 4b40b2cb7e..7deedc0686 100644 --- a/package/lean/shadowsocksR-libev-full/Makefile +++ b/package/lean/shadowsocksR-libev-full/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocksrr/shadowsocksr-libev.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=9a2365ce6774dddd5561322881aef726c7990639 +PKG_SOURCE_VERSION:=91c72165d4e7ae92eba2d678812a8d11a037932d PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=breakwa11 diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 000.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 000.png deleted file mode 100644 index d9d80a9d81..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 000.png and /dev/null differ diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 001.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 001.png deleted file mode 100644 index 1992ce24ac..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 001.png and /dev/null differ diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 002.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 002.png deleted file mode 100644 index 314cfe2fd2..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 002.png and /dev/null differ diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 003.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 003.png deleted file mode 100644 index 6efd09e3ad..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 003.png and /dev/null differ diff --git a/package/lean/wxbase/Makefile b/package/lean/wxbase/Makefile new file mode 100644 index 0000000000..97f6e70150 --- /dev/null +++ b/package/lean/wxbase/Makefile @@ -0,0 +1,136 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=wxbase +PKG_VERSION:=2.8.12 +PKG_RELEASE:=1 + +PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/wxwindows +PKG_MD5SUM:=08f81ab60647308058f6ce99712b14f8 + +PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION) + +PKG_INSTALL:=1 + +PKG_CHECK_FORMAT_SECURITY:=0 + +include $(INCLUDE_DIR)/package.mk + +define Package/libwxbase + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Cross-platform C++ framework + URL:=http://www.wxwidgets.org/ + DEPENDS:=+libexpat +libstdcpp +zlib +libpthread +endef + +define Package/libwxbase/description + wxBase contains most of the non-GUI classes from the wxWindows cross- + -platform C++ framework. There are 2 categories: generally useful portable + code (date/time handling, command line parsing, regular expression support) + and wrappers for the OS objects (files, directories, sockets, threads, + etc.) allowing you to write portable programs easily. +endef + +TARGET_CFLAGS += $(FPIC) + +# XXX: aMule *needs* the following configure options to be enabled: +# --enable-intl +# --enable-largefile +# --disable-no_rtti +# --with-regex +# --enable-unicode +CONFIGURE_ARGS+= \ + --enable-shared \ + --disable-rpath \ + --with-gnu-ld \ + --disable-gui \ + --disable-monolithic \ + --enable-plugins \ + --disable-universal \ + --disable-nanox \ + --disable-gtk2 \ + --disable-gpe \ + --disable-optimise \ + --disable-debug \ + --disable-stl \ + --disable-omf \ + --disable-debug_flag \ + --disable-debug_info \ + --disable-debug_gdb \ + --disable-debug_cntxt \ + --disable-mem_tracing \ + --disable-profile \ + --disable-no_rtti \ + --disable-no_exceptions \ + --disable-compat22 \ + --disable-compat24 \ + --enable-intl \ + --disable-backtrace \ + --enable-exceptions \ + --disable-sound \ + --enable-largefile \ + \ + --without-gtk \ + --without-motif \ + --without-mac \ + --without-cocoa \ + --without-wine \ + --without-msw \ + --without-pm \ + --without-mgl \ + --without-microwin \ + --without-x11 \ + --without-libpng \ + --without-libjpeg \ + --without-libtiff \ + --without-libxpm \ + --without-libmspack \ + --without-sdl \ + --without-gnomeprint \ + --without-opengl \ + --without-dmalloc \ + --with-regex="sys" \ + --with-zlib="sys" \ + --without-odbc \ + --with-expat="sys" \ + --without-gtk-prefix \ + --without-x \ + --without-libiconv-prefix \ + --without-sdl-prefix \ + --without-cppunit-prefix \ + --disable-precomp-headers + +UNICODE=yes + +ifeq ($(UNICODE),yes) + CONFIGURE_ARGS+= --enable-unicode + LIB_PFX:=u +else + CONFIGURE_ARGS+= --disable-unicode + LIB_PFX:= +endif + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib + $(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/ + $(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config + $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config +endef + +define Package/libwxbase/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libwxbase)) diff --git a/package/lean/wxbase/patches/wxGTK-2.8.12-abicheck.patch b/package/lean/wxbase/patches/wxGTK-2.8.12-abicheck.patch new file mode 100644 index 0000000000..97055ba46f --- /dev/null +++ b/package/lean/wxbase/patches/wxGTK-2.8.12-abicheck.patch @@ -0,0 +1,15 @@ +diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp +--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 ++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 +@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con + msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + #undef wxCMP + diff --git a/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch b/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch index 23b8e86aac..d43e8c7dc5 100644 --- a/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch +++ b/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch @@ -58,7 +58,7 @@ return; + } - if (hw_read_otgsc(ci, OTGSC_BSV)) + if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active) usb_gadget_vbus_connect(&ci->gadget); --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h diff --git a/target/linux/bcm53xx/patches-4.9/033-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch b/target/linux/bcm53xx/patches-4.9/033-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch index d174adc0b8..94498e892f 100644 --- a/target/linux/bcm53xx/patches-4.9/033-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch +++ b/target/linux/bcm53xx/patches-4.9/033-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch @@ -157,5 +157,5 @@ Signed-off-by: Florian Fainelli - }; - memory { - reg = <0x00000000 0x10000000>; + reg = <0x80000000 0x10000000>; }; diff --git a/target/linux/brcm2708/patches-4.9/950-0084-Support-for-Blokas-Labs-pisound-board.patch b/target/linux/brcm2708/patches-4.9/950-0084-Support-for-Blokas-Labs-pisound-board.patch index 21f43347b3..1033326614 100644 --- a/target/linux/brcm2708/patches-4.9/950-0084-Support-for-Blokas-Labs-pisound-board.patch +++ b/target/linux/brcm2708/patches-4.9/950-0084-Support-for-Blokas-Labs-pisound-board.patch @@ -19,8 +19,8 @@ Print a logline when the kernel module is removed. --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -40,6 +40,7 @@ auvidea Auvidea GmbH - avago Avago Technologies +@@ -41,6 +41,7 @@ avago Avago Technologies + avia avia semiconductor avic Shanghai AVIC Optoelectronics Co., Ltd. axis Axis Communications AB +blokaslabs Vilniaus Blokas UAB diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch index 8b607ac89b..0d47c7621b 100644 --- a/target/linux/generic/hack-4.9/721-phy_packets.patch +++ b/target/linux/generic/hack-4.9/721-phy_packets.patch @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2939,10 +2939,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2942,10 +2942,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 0616eaa7c0..b7ba384f4c 100644 --- a/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4256,6 +4256,9 @@ static enum gro_result dev_gro_receive(s +@@ -4259,6 +4259,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5422,6 +5425,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5425,6 +5428,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *private) -@@ -5493,6 +5538,7 @@ static int __netdev_upper_dev_link(struc +@@ -5496,6 +5541,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); return 0; -@@ -5619,6 +5665,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5622,6 +5668,7 @@ void netdev_upper_dev_unlink(struct net_ list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr); @@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6159,6 +6206,7 @@ int dev_set_mac_address(struct net_devic +@@ -6162,6 +6209,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-4.4/721-phy_packets.patch b/target/linux/generic/pending-4.4/721-phy_packets.patch index 89ffdc558d..a7a23278d0 100644 --- a/target/linux/generic/pending-4.4/721-phy_packets.patch +++ b/target/linux/generic/pending-4.4/721-phy_packets.patch @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2743,10 +2743,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2746,10 +2746,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index cfa0a69fb3..ad0fb5bdc5 100644 --- a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4520,6 +4520,9 @@ static enum gro_result dev_gro_receive(s +@@ -4523,6 +4523,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5808,6 +5811,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5811,6 +5814,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) -@@ -6006,6 +6051,8 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6009,6 +6054,8 @@ void netdev_upper_dev_unlink(struct net_ list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr); @@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6606,6 +6653,7 @@ int dev_set_mac_address(struct net_devic +@@ -6609,6 +6656,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/mediatek/patches-4.9/0048-net-core-add-RPS-balancer.patch b/target/linux/mediatek/patches-4.9/0048-net-core-add-RPS-balancer.patch index 6a34cf2f26..fca43cbdf3 100644 --- a/target/linux/mediatek/patches-4.9/0048-net-core-add-RPS-balancer.patch +++ b/target/linux/mediatek/patches-4.9/0048-net-core-add-RPS-balancer.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3547,6 +3547,58 @@ set_rps_cpu(struct net_device *dev, stru +@@ -3550,6 +3550,58 @@ set_rps_cpu(struct net_device *dev, stru return rflow; } @@ -69,7 +69,7 @@ Signed-off-by: John Crispin /* * get_rps_cpu is called from netif_receive_skb and returns the target * CPU from the RPS map of the receiving queue for a given skb. -@@ -3636,7 +3688,7 @@ static int get_rps_cpu(struct net_device +@@ -3639,7 +3691,7 @@ static int get_rps_cpu(struct net_device try_rps: if (map) { @@ -78,7 +78,7 @@ Signed-off-by: John Crispin if (cpu_online(tcpu)) { cpu = tcpu; goto done; -@@ -8427,6 +8479,9 @@ static int __init net_dev_init(void) +@@ -8430,6 +8482,9 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } diff --git a/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch b/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch index d6c5c627a6..a94ac2277b 100644 --- a/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch +++ b/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch @@ -1,6 +1,6 @@ --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -174,6 +174,7 @@ picochip Picochip Ltd +@@ -175,6 +175,7 @@ picochip Picochip Ltd plathome Plat'Home Co., Ltd. plda PLDA pixcir PIXCIR MICROELECTRONICS Co., Ltd diff --git a/target/linux/ramips/patches-4.9/0067-enable-mt7621-xhci.patch b/target/linux/ramips/patches-4.9/0067-enable-mt7621-xhci.patch deleted file mode 100644 index 6e13e626cd..0000000000 --- a/target/linux/ramips/patches-4.9/0067-enable-mt7621-xhci.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -45,9 +45,9 @@ config USB_XHCI_PLATFORM - If unsure, say N. - - config USB_XHCI_MTK -- tristate "xHCI support for Mediatek MT65xx" -+ tristate "xHCI support for Mediatek MT65xx/MT7621" - select MFD_SYSCON -- depends on ARCH_MEDIATEK || COMPILE_TEST -+ depends on SOC_MT7621 || ARCH_MEDIATEK || COMPILE_TEST - ---help--- - Say 'Y' to enable the support for the xHCI host controller - found in Mediatek MT65xx SoCs. diff --git a/target/linux/ramips/patches-4.9/0085-pinmux-util.patch b/target/linux/ramips/patches-4.9/0085-pinmux-util.patch deleted file mode 100644 index e891bc166b..0000000000 --- a/target/linux/ramips/patches-4.9/0085-pinmux-util.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/arch/mips/ralink/mt7620.c -+++ b/arch/mips/ralink/mt7620.c -@@ -176,7 +176,7 @@ static struct rt2880_pmx_func spi_cs1_gr - - static struct rt2880_pmx_func spis_grp_mt7628[] = { - FUNC("pwm_uart2", 3, 14, 4), -- FUNC("util", 2, 14, 4), -+ FUNC("utif", 2, 14, 4), - FUNC("gpio", 1, 14, 4), - FUNC("spis", 0, 14, 4), - }; -@@ -190,28 +190,28 @@ static struct rt2880_pmx_func gpio_grp_m - - static struct rt2880_pmx_func p4led_kn_grp_mt7628[] = { - FUNC("jtag", 3, 30, 1), -- FUNC("util", 2, 30, 1), -+ FUNC("utif", 2, 30, 1), - FUNC("gpio", 1, 30, 1), - FUNC("p4led_kn", 0, 30, 1), - }; - - static struct rt2880_pmx_func p3led_kn_grp_mt7628[] = { - FUNC("jtag", 3, 31, 1), -- FUNC("util", 2, 31, 1), -+ FUNC("utif", 2, 31, 1), - FUNC("gpio", 1, 31, 1), - FUNC("p3led_kn", 0, 31, 1), - }; - - static struct rt2880_pmx_func p2led_kn_grp_mt7628[] = { - FUNC("jtag", 3, 32, 1), -- FUNC("util", 2, 32, 1), -+ FUNC("utif", 2, 32, 1), - FUNC("gpio", 1, 32, 1), - FUNC("p2led_kn", 0, 32, 1), - }; - - static struct rt2880_pmx_func p1led_kn_grp_mt7628[] = { - FUNC("jtag", 3, 33, 1), -- FUNC("util", 2, 33, 1), -+ FUNC("utif", 2, 33, 1), - FUNC("gpio", 1, 33, 1), - FUNC("p1led_kn", 0, 33, 1), - }; -@@ -232,28 +232,28 @@ static struct rt2880_pmx_func wled_kn_gr - - static struct rt2880_pmx_func p4led_an_grp_mt7628[] = { - FUNC("jtag", 3, 39, 1), -- FUNC("util", 2, 39, 1), -+ FUNC("utif", 2, 39, 1), - FUNC("gpio", 1, 39, 1), - FUNC("p4led_an", 0, 39, 1), - }; - - static struct rt2880_pmx_func p3led_an_grp_mt7628[] = { - FUNC("jtag", 3, 40, 1), -- FUNC("util", 2, 40, 1), -+ FUNC("utif", 2, 40, 1), - FUNC("gpio", 1, 40, 1), - FUNC("p3led_an", 0, 40, 1), - }; - - static struct rt2880_pmx_func p2led_an_grp_mt7628[] = { - FUNC("jtag", 3, 41, 1), -- FUNC("util", 2, 41, 1), -+ FUNC("utif", 2, 41, 1), - FUNC("gpio", 1, 41, 1), - FUNC("p2led_an", 0, 41, 1), - }; - - static struct rt2880_pmx_func p1led_an_grp_mt7628[] = { - FUNC("jtag", 3, 42, 1), -- FUNC("util", 2, 42, 1), -+ FUNC("utif", 2, 42, 1), - FUNC("gpio", 1, 42, 1), - FUNC("p1led_an", 0, 42, 1), - }; diff --git a/target/linux/ramips/patches-4.9/301-fix-rt3883.patch b/target/linux/ramips/patches-4.9/301-fix-rt3883.patch deleted file mode 100644 index 5b79526894..0000000000 --- a/target/linux/ramips/patches-4.9/301-fix-rt3883.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/arch/mips/ralink/rt3883.c -+++ b/arch/mips/ralink/rt3883.c -@@ -147,5 +147,5 @@ void prom_soc_init(struct ralink_soc_inf - - rt2880_pinmux_data = rt3883_pinmux_data; - -- ralink_soc == RT3883_SOC; -+ ralink_soc = RT3883_SOC; - } diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 87bb5fbf6b..1af29cfdbc 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -19,8 +19,10 @@ KERNELNAME:=bzImage include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs wpad kmod-usb-hid kmod-usb-net-asix kmod-usb-net-asix-ax88179 \ -kmod-ath5k kmod-ath9k kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-vmxnet3 htop lm-sensors +DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid kmod-usb-net-asix kmod-usb-net-asix-ax88179 \ +kmod-ath5k kmod-ath9k kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-vmxnet3 htop lm-sensors \ +autocore automount autosamba ath10k-firmware-qca988x brcmfmac-firmware-43602a1-pcie \ +alsa-utils kmod-ac97 kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-intel kmod-sound-hda-codec-via kmod-sound-via82xx kmod-usb-audio $(eval $(call BuildTarget))