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: (22 commits)
  upx: fixes build with gcc 11
  rockchip: backport yt8531s driver from net-next
  ramips: HATLab GateBoard-One using gen_image_generic.sh to gen image
  upx: witch to the release version
  rockchip: opc-h68k: add sata support
  ramips: fixes kernel 5.4 mt76 build error
  ramips: fix HATLab GateBoard-One Support
  mt76: fixes kernel 5.4 build error
  iwinfo: backport MT7986 related commit
  rockchip: backport Amlogic S905 emmc fixes
  rockchip: 5.15: backport yt8521 driver from upstream kernel v6.2
  Revert "r8101: update to 1.038.02" (coolsnowwolf#10523)
  r8168: Drop 020-5.18-support (coolsnowwolf#10518)
  package: Update realtek ethernet driver (coolsnowwolf#10516)
  mt76: update firmware for MT7986
  wolfssl: update to v5.5.3
  ipset: update to 7.16
  nls.mk: fixup cmake packages
  ramips: add JD-Cloud router support
  Revert "mediatek: add LED support for Xiaomi Redmi Router AX6000"
  ...
  • Loading branch information
github-actions[bot] committed Dec 3, 2022
2 parents e016cfe + 276348a commit 7e59e90
Show file tree
Hide file tree
Showing 90 changed files with 9,407 additions and 2,183 deletions.
2 changes: 1 addition & 1 deletion config/Config-images.in
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ menu "Target Images"

config TARGET_ROOTFS_PARTSIZE
int "Root filesystem partition size (in MB)"
depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_sunxi || TARGET_uml
depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_sunxi || TARGET_uml || TARGET_ramips
default 400
help
Select the root filesystem partition size.
Expand Down
1 change: 1 addition & 0 deletions include/nls.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ifeq ($(CONFIG_BUILD_NLS),y)
INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-full
INTL_FULL:=1

CMAKE_OPTIONS += -DCMAKE_PREFIX_PATH="$(ICONV_PREFIX);$(INTL_PREFIX)"
else
ICONV_PREFIX:=
ICONV_FULL:=
Expand Down
6 changes: 3 additions & 3 deletions package/kernel/mt76/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=

PKG_SOURCE_URL:=https://github.com/openwrt/mt76
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2022-11-12
PKG_SOURCE_VERSION:=4bf2607362fc64fc4cb7d662feb736b7536c0811
PKG_MIRROR_HASH:=fd4291ac89e14750073cc8c345772883d756bf32cf19fc7205fa344b5b3b91d0
PKG_SOURCE_DATE:=2022-11-24
PKG_SOURCE_VERSION:=daae6ca5d81fceed2dbbfcfca49be3f0727386e3
PKG_MIRROR_HASH:=7c9b5d90cb674880a0612cf268e675d046bd1e399ae1869d84c89d15fbb9fa43

PKG_MAINTAINER:=Felix Fietkau <[email protected]>
PKG_USE_NINJA:=0
Expand Down
19 changes: 0 additions & 19 deletions package/lean/luci-app-mosdns/Makefile

This file was deleted.

42 changes: 0 additions & 42 deletions package/lean/luci-app-mosdns/luasrc/controller/mosdns.lua

This file was deleted.

111 changes: 0 additions & 111 deletions package/lean/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua

This file was deleted.

5 changes: 0 additions & 5 deletions package/lean/luci-app-mosdns/luasrc/model/cbi/mosdns/log.lua

This file was deleted.

87 changes: 0 additions & 87 deletions package/lean/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua

This file was deleted.

31 changes: 0 additions & 31 deletions package/lean/luci-app-mosdns/luasrc/model/cbi/mosdns/update.lua

This file was deleted.

34 changes: 0 additions & 34 deletions package/lean/luci-app-mosdns/luasrc/view/mosdns/geo_update.htm

This file was deleted.

29 changes: 0 additions & 29 deletions package/lean/luci-app-mosdns/luasrc/view/mosdns/mosdns_log.htm

This file was deleted.

Loading

0 comments on commit 7e59e90

Please sign in to comment.