diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 137ff2bc9d..ac4c3d4a63 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20190416 +PKG_VERSION:=20190815 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=4851120ea69436fd5088fc72674798ad343c5ddb89ac6b4161225357d1eda08c +PKG_HASH:=15615d87ac9d93aa5c20939a6c65cca7f3bc656b5e8ffd998b8acb932c854327 PKG_MAINTAINER:=Felix Fietkau @@ -33,4 +33,4 @@ define Build/Compile endef include $(wildcard ./*.mk) -#$(eval $(call BuildPackage,linux-firmware)) \ No newline at end of file +#$(eval $(call BuildPackage,linux-firmware)) diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk index 2bdcd6d0a1..4f7492a2d8 100755 --- a/package/firmware/linux-firmware/broadcom.mk +++ b/package/firmware/linux-firmware/broadcom.mk @@ -103,6 +103,8 @@ define Package/brcmfmac-firmware-43455-sdio-rpi-4b/install $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + $(SED) 's/boardflags3=.*/boardflags3=0x44200100/g' \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt endef $(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio-rpi-4b)) diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk index 401ab1aa7e..923701c703 100755 --- a/package/firmware/linux-firmware/intel.mk +++ b/package/firmware/linux-firmware/intel.mk @@ -73,7 +73,7 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl3160)) Package/iwlwifi-firmware-iwl3168 = $(call Package/firmware-default,Intel Wireless 3168 firmware) define Package/iwlwifi-firmware-iwl3168/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-27.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-29.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl3168)) @@ -157,14 +157,14 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl8265)) Package/iwlwifi-firmware-iwl9000 = $(call Package/firmware-default,Intel Wireless 9000 firmware) define Package/iwlwifi-firmware-iwl9000/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-38.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl9000)) Package/iwlwifi-firmware-iwl9260 = $(call Package/firmware-default,Intel Wireless 9260 firmware) define Package/iwlwifi-firmware-iwl9260/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-38.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl9260)) diff --git a/package/firmware/linux-firmware/mediatek.mk b/package/firmware/linux-firmware/mediatek.mk index b258551a00..18677bc748 100755 --- a/package/firmware/linux-firmware/mediatek.mk +++ b/package/firmware/linux-firmware/mediatek.mk @@ -41,3 +41,12 @@ define Package/rt73-usb-firmware/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/ endef $(eval $(call BuildPackage,rt73-usb-firmware)) + +Package/mt7622bt-firmware = $(call Package/firmware-default,mt7622bt firmware) +define Package/mt7622bt-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/mediatek + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/mediatek/mt7622pr2h.bin \ + $(1)/lib/firmware/mediatek +endef +$(eval $(call BuildPackage,mt7622bt-firmware)) diff --git a/package/lean/luci-app-docker/root/etc/docker-init b/package/lean/luci-app-docker/root/etc/docker-init index e9dbfb778e..b00ea26afb 100755 --- a/package/lean/luci-app-docker/root/etc/docker-init +++ b/package/lean/luci-app-docker/root/etc/docker-init @@ -1,9 +1,26 @@ #!/bin/sh +dtype=`fdisk -l | grep 'Disklabel type' | awk '{print $3}'` +partid="0" + +if [ "$dtype" = "gpt" ] +then + partid=`echo "n -echo "n -p -3 w -" | fdisk /dev/sda && mkfs.ext4 /dev/sda3 \ No newline at end of file +" | fdisk /dev/sda | grep 'Created a new partition' | awk '{print $5}'` + +elif [ "$dtype" = "dos" ] +then + partid=`echo "n +p + + + +w +" | fdisk /dev/sda | grep 'Created a new partition' | awk '{print $5}'` +fi + +echo "y" | mkfs.ext4 /dev/sda$partid + diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 97cbe3f136..801c07b8f1 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=117 +PKG_RELEASE:=118 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules index 61b1cf85b8..c3f5330201 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -120,7 +120,7 @@ EOF ipset -N whitelist hash:net 2>/dev/null ipset -N blacklist hash:net 2>/dev/null $IPT -I SS_SPEC_WAN_AC -m set --match-set blacklist dst -j SS_SPEC_WAN_FW - $IPT -I SS_SPEC_WAN_AC -m set --match-set whitelist dst -j SS_SPEC_WAN_FW + $IPT -I SS_SPEC_WAN_AC -m set --match-set whitelist dst -j RETURN return $? } diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index bea68ecb0b..138ff75c9e 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=v4.19 -PKG_RELEASE:=3 +PKG_VERSION:=4.20 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/v2ray/files/amd64/v2ray b/package/lean/v2ray/files/amd64/v2ray index 3c8e0641b7..5ae09fced5 100755 Binary files a/package/lean/v2ray/files/amd64/v2ray and b/package/lean/v2ray/files/amd64/v2ray differ diff --git a/package/lean/v2ray/files/arm/v2ray b/package/lean/v2ray/files/arm/v2ray index 70bdd4a0a2..36b213b2ee 100755 Binary files a/package/lean/v2ray/files/arm/v2ray and b/package/lean/v2ray/files/arm/v2ray differ diff --git a/package/lean/v2ray/files/arm/v2ray_armv7 b/package/lean/v2ray/files/arm/v2ray_armv7 index a07dbbc3e5..23190110cd 100755 Binary files a/package/lean/v2ray/files/arm/v2ray_armv7 and b/package/lean/v2ray/files/arm/v2ray_armv7 differ diff --git a/package/lean/v2ray/files/arm64/v2ray b/package/lean/v2ray/files/arm64/v2ray index d7a961696e..9b4728d3ed 100755 Binary files a/package/lean/v2ray/files/arm64/v2ray and b/package/lean/v2ray/files/arm64/v2ray differ diff --git a/package/lean/v2ray/files/mips/v2ray b/package/lean/v2ray/files/mips/v2ray index 1586824579..625f8d6ecd 100755 Binary files a/package/lean/v2ray/files/mips/v2ray and b/package/lean/v2ray/files/mips/v2ray differ diff --git a/package/lean/v2ray/files/mipsle/v2ray b/package/lean/v2ray/files/mipsle/v2ray index 8e68ce0cb7..917b161c43 100755 Binary files a/package/lean/v2ray/files/mipsle/v2ray and b/package/lean/v2ray/files/mipsle/v2ray differ diff --git a/package/lean/v2ray/files/x86/v2ray b/package/lean/v2ray/files/x86/v2ray index 092669bc11..75b7cab72f 100755 Binary files a/package/lean/v2ray/files/x86/v2ray and b/package/lean/v2ray/files/x86/v2ray differ