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:
  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
  • Loading branch information
github-actions[bot] committed Nov 28, 2022
2 parents 73528a2 + 55bcd01 commit 8917aff
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 128 deletions.
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
6 changes: 3 additions & 3 deletions package/lean/r8101/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=r8101
PKG_VERSION:=1.037.01
PKG_RELEASE:=$(AUTORELEASE)
PKG_VERSION:=1.038.02
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/umarizulkifli/r8101/raw/main/
PKG_HASH:=62bb19848a87d2fe4de3fa9332225dcb5381f06cb93ec8931ea3fd894d492aea
PKG_HASH:=4141ebda97e277b5807a98b4090d7884d4463ac7a048676c72cb648ae4e8ae9e
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

PKG_MAINTAINER:=umarizulkifli <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions package/lean/r8152/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=r8152
PKG_VERSION:=2.16.1
PKG_VERSION:=2.16.3.20220914
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/wget/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=2be6a02f6e29485efd107bb7e777ad3c482d9db0ff7e5e6c5ef034a1557a395b
PKG_HASH:=61ed7af34c8882c6028ddd1a27bb78fb5bfba41211f84dd7a06e4dc84dbe9a9a

PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-linux-$(PKG_VERSION)

Expand Down
8 changes: 4 additions & 4 deletions package/lean/r8168/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=r8168
PKG_VERSION:=8.050.03
PKG_RELEASE:=$(AUTORELEASE)
PKG_VERSION:=8.051.02
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/BROBIRD/openwrt-r8168.git
PKG_SOURCE_VERSION:=ddfaceacd1b7ed2857fb995642a8ffb1fc37e989
PKG_MIRROR_HASH:=5428f60dc33e9503c6cfdf690c00077149dce24cbb0591129d905b9f1aad9202
PKG_SOURCE_VERSION:=4f6cfe1ca12fb772deed57f1d2d1062af041ad07
PKG_MIRROR_HASH:=6b149f5eb3b9e1dc50867a694984d253aa58d97dd5fbab30eb405d2d7b2be587

PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <linux/if_vlan.h>
#include <linux/crc32.h>
#include <linux/interrupt.h>
@@ -24643,6 +24644,22 @@ rtl8168_set_bios_setting(struct net_devi
@@ -24769,6 +24770,22 @@ rtl8168_set_bios_setting(struct net_devi
}
}

Expand All @@ -31,7 +31,7 @@
static void
rtl8168_init_software_variable(struct net_device *dev)
{
@@ -25206,6 +25223,8 @@ rtl8168_init_software_variable(struct ne
@@ -25343,6 +25360,8 @@ rtl8168_init_software_variable(struct ne
tp->NotWrMcuPatchCode = TRUE;
}

Expand Down
47 changes: 0 additions & 47 deletions package/lean/r8168/patches/020-5.18-support.patch

This file was deleted.

2 changes: 1 addition & 1 deletion package/libs/wolfssl/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ if PACKAGE_libwolfssl
bool "AF_ALG"

config WOLFSSL_HAS_DEVCRYPTO_CBC
bool "/dev/crytpo - AES-CBC-only"
bool "/dev/crypto - AES-CBC-only"
select WOLFSSL_HAS_DEVCRYPTO

config WOLFSSL_HAS_DEVCRYPTO_AES
Expand Down
4 changes: 2 additions & 2 deletions package/libs/wolfssl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=wolfssl
PKG_VERSION:=5.5.1-stable
PKG_VERSION:=5.5.3-stable
PKG_RELEASE:=$(AUTORELEASE)

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION)
PKG_HASH:=97339e6956c90e7c881ba5c748dd04f7c30e5dbe0c06da765418c51375a6dee3
PKG_HASH:=fd3135b8657d09fb96a8aad16585da850b96ea420ae8ce5ac4d5fdfc614c2683

PKG_FIXUP:=libtool libtool-abiver
PKG_INSTALL:=1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -2454,7 +2454,7 @@ extern void uITRON4_free(void *p) ;
@@ -2455,7 +2455,7 @@ extern void uITRON4_free(void *p) ;
#endif

/* warning for not using harden build options (default with ./configure) */
Expand Down
50 changes: 0 additions & 50 deletions package/libs/wolfssl/patches/200-ecc-rng.patch

This file was deleted.

4 changes: 2 additions & 2 deletions package/network/utils/ipset/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=ipset
PKG_VERSION:=7.15
PKG_VERSION:=7.16
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ipset.netfilter.org
PKG_HASH:=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
PKG_HASH:=87b1d9cdf4a1de3d1d0671e7da33e111eb65087e65ad75268b22bf13f0f296d0

PKG_MAINTAINER:=Jo-Philipp Wich <[email protected]>
PKG_LICENSE:=GPL-2.0
Expand Down

This file was deleted.

0 comments on commit 8917aff

Please sign in to comment.