Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  x86: fix cpu temp info
  mwlwifi:add disable-amsdu patch (coolsnowwolf#5027)
  mtwifi: update dual 7615 config (Thx zmzhuai and MeIsReallyBa) (coolsnowwolf#5025)
  Version update to R20.7.7
  bcm53xx: phicomm-k3 using custom k3-brcmfmac4366c-firmware
  bcm53xx: phicomm-k3 using custom k3-brcmfmac4366c-firmware
  package: remove some old pack
  coremark: bump version to 2020-05-28
  automount:use antfs instead of ntfs-3g
  shortcut-fe-cm: load only once to avoid panic (coolsnowwolf#5019)
  • Loading branch information
rainstar0426 committed Jul 7, 2020
2 parents 1b250e9 + 86d0c13 commit 21a9d0d
Show file tree
Hide file tree
Showing 44 changed files with 37 additions and 17,794 deletions.
11 changes: 11 additions & 0 deletions package/kernel/mwlwifi/patches/002-disable-AMSDU.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/core.c
+++ b/core.c
@@ -982,7 +982,7 @@ struct ieee80211_hw *mwl_alloc_hw(int bu
priv->use_short_preamble = false;
priv->disable_2g = false;
priv->disable_5g = false;
- priv->tx_amsdu = true;
+ priv->tx_amsdu = false;
priv->hif.bus = bus_type;
priv->hif.ops = ops;
priv->hif.priv = (char *)priv + ALIGN(sizeof(*priv), NETDEV_ALIGN);
28 changes: 0 additions & 28 deletions package/lean/antfs-mount/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions package/lean/antfs-mount/files/mount.ntfs

This file was deleted.

43 changes: 0 additions & 43 deletions package/lean/antfs/Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion package/lean/autocore/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=autocore
PKG_VERSION:=1
PKG_RELEASE:=33
PKG_RELEASE:=35


include $(INCLUDE_DIR)/package.mk
Expand Down
26 changes: 3 additions & 23 deletions package/lean/autocore/files/sbin/cpuinfo
Original file line number Diff line number Diff line change
@@ -1,25 +1,5 @@
#!/bin/sh

info()
{
MHz=`grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'`
#获取CPU工作频率

sensors 2>/dev/null

if [ $? -eq 0 ];then
a=`sensors | grep 'Core 0' | cut -c10-24`
#获取CPU核心1温度

else
a=""
fi
}

out()
{
info
echo "$MHz MHz $a "
}

out
MHz=`grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'`
TEMP=`sensors 2>/dev/null | grep 'Core 0' | cut -c12-`
echo "$MHz MHz $TEMP "
4 changes: 2 additions & 2 deletions package/lean/automount/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=automount
PKG_VERSION:=1
PKG_RELEASE:=32
PKG_RELEASE:=33
PKG_ARCH:=all

include $(INCLUDE_DIR)/package.mk

define Package/automount
TITLE:=Mount autoconfig hotplug script.
MAINTAINER:=Lean
DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas +kmod-fs-vfat +kmod-fs-ext4 +!LINUX_5_4:kmod-fs-exfat0 +LINUX_5_4:kmod-fs-exfat +ntfs-3g
DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas +kmod-fs-vfat +kmod-fs-ext4 +!LINUX_5_4:kmod-fs-exfat0 +LINUX_5_4:kmod-fs-exfat +antfs-mount
endef

define Package/automount/description
Expand Down
41 changes: 0 additions & 41 deletions package/lean/bonding/Makefile

This file was deleted.

211 changes: 0 additions & 211 deletions package/lean/bonding/files/lib/netifd/proto/bonding.sh

This file was deleted.

Loading

0 comments on commit 21a9d0d

Please sign in to comment.