OpenWrt/xiaomi-ax3600
1
0
Fork 0
mirror of https://github.com/immortalwrt/immortalwrt.git synced 2025-08-07 22:06:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2025-07-03 19:59:20 +08:00
parent 94a754ac7c e2cdcf8e46
commit e81af1cc95
16 changed files with 81 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/u-boot.mk
View File

@ -29,6 +29,8 @@ endif
ifdef UBOOT_USE_INTREE_DTC
$(eval $(call TestHostCommand,python3-dev, \
Please install the python3-dev package, \
python3.13-config --includes 2>&1 | grep 'python3', \
python3.12-config --includes 2>&1 | grep 'python3', \
python3.11-config --includes 2>&1 | grep 'python3', \
python3.10-config --includes 2>&1 | grep 'python3', \
python3.9-config --includes 2>&1 | grep 'python3', \

4
package/libs/openssl/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
PKG_VERSION:=3.5.0
PKG_VERSION:=3.5.1
PKG_RELEASE:=1
PKG_BUILD_FLAGS:=no-mips16 gc-sections no-lto
@ -21,7 +21,7 @@ PKG_SOURCE_URL:= \
https://www.openssl.org/source/old/$(PKG_BASE)/ \
https://github.com/openssl/openssl/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
PKG_HASH:=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
PKG_HASH:=529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

2
package/libs/openssl/patches/100-Configure-afalg-support.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
--- a/Configure
+++ b/Configure
@@ -1810,7 +1810,9 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-
@@ -1811,7 +1811,9 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-
unless ($disabled{afalgeng}) {
$config{afalgeng}="";

6
package/system/ubus/Makefile
View File

@ -5,9 +5,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
PKG_SOURCE_DATE:=2025-05-16
PKG_SOURCE_VERSION:=88e6325092bf1d1cfa877cd220670fa7cc2fad03
PKG_MIRROR_HASH:=8af913d18c9f50cabfd3d32ce3462028ecf469d5e649ccf7f642d9d6bd6dc695
PKG_SOURCE_DATE:=2025-07-02
PKG_SOURCE_VERSION:=5952b48e251c0ea76dfce97f129da6f18d889eda
PKG_MIRROR_HASH:=60edfc101eaa85976d243febc368fc419fe44283bd3a743851a6bc7975e881f0
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
CMAKE_INSTALL:=1

4
package/utils/util-linux/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
PKG_VERSION:=2.41
PKG_VERSION:=2.41.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
PKG_HASH:=81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6
PKG_HASH:=be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57
PKG_CPE_ID:=cpe:/a:kernel:util-linux
PKG_LICENSE:=GPL-2.0-only

38
package/utils/util-linux/patches/0001-meson-add-feature-for-translated-documentation.patch
View File

@ -1,38 +0,0 @@
From cd5038306e6815592fafbd06d406f45af2df3fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Mon, 14 Apr 2025 23:32:36 +0200
Subject: [PATCH] meson: add feature for translated documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Translating the documentation is slow.
Add a feature which can be used to disable this step.
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
meson_options.txt | 2 ++
po-man/meson.build | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -25,6 +25,8 @@ option('sysvinit', type : 'feature',
option('btrfs', type : 'feature')
option('widechar', type : 'feature',
description : 'compile with wide character support')
+option('translate-docs', type : 'feature',
+ description : 'translate documentation')
# enable building of various programs and features ("build-" prefix)
--- a/po-man/meson.build
+++ b/po-man/meson.build
@@ -1,6 +1,6 @@
po4a = find_program('po4a', required : false)
-if not (asciidoctor.found() and po4a.found())
+if not get_option('translate-docs').require(asciidoctor.found()).require(po4a.found()).allowed()
subdir_done()
endif

38
package/utils/util-linux/patches/0001-meson-remove-tinfo-dependency-from-more.patch
View File

@ -1,38 +0,0 @@
From 363e48da01956321fb9337c59d78865c97c711a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Mon, 14 Apr 2025 23:19:06 +0200
Subject: [PATCH] meson: remove tinfo dependency from 'more'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The more utility does not need libtinfo and it is not
specified in autotools either.
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
meson.build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/meson.build
+++ b/meson.build
@@ -1387,8 +1387,7 @@ exe = executable(
more_sources,
link_with : [lib_common],
include_directories : includes,
- dependencies : [lib_tinfo,
- curses_libs,
+ dependencies : [curses_libs,
lib_magic],
install : opt,
build_by_default : opt)
@@ -1398,8 +1397,7 @@ exe2 = executable(
link_with : [lib_common],
include_directories : includes,
c_args : '-DTEST_PROGRAM',
- dependencies : [lib_tinfo,
- curses_libs,
+ dependencies : [curses_libs,
lib_magic],
build_by_default : opt and program_tests)
exes += exe

33
package/utils/util-linux/patches/0100-include-linux-unistd-h.patch
View File

@ -1,33 +0,0 @@
From 0033f97482a7979e0de71de0a16b583e8d74dbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Sat, 19 Apr 2025 22:02:11 +0200
Subject: [PATCH] include/mount-api-utils: include linux/unistd.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If SYS_statmount/SYS_listmount is not provided by the libc,
util-linux will fall back to __NR_statmount/__NR_listmount from the
kernel UAPI headers.
However it is not guaranteed that these symbols are actually visible in
mount-api-utils.
Include linux/unistd.h which provides syscall numbers.
While this header is specific to Linux, the code is already using
linux/mount.h.
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
include/mount-api-utils.h | 1 +
1 file changed, 1 insertion(+)
--- a/include/mount-api-utils.h
+++ b/include/mount-api-utils.h
@@ -8,6 +8,7 @@
#ifdef HAVE_LINUX_MOUNT_H
#include <sys/mount.h>
#include <linux/mount.h>
+#include <linux/unistd.h>
#include <sys/syscall.h>
#include <inttypes.h>

24
scripts/make-index-json.py
View File

@ -31,6 +31,8 @@ def parse_args():
help="Required device architecture: like 'x86_64' or 'aarch64_generic'")
parser.add_argument("-f", "--source-format", required=True, choices=source_format,
help="Required source format of input: 'apk' or 'opkg'")
parser.add_argument("-m", "--manifest", action="store_true", default=False,
help="Print output in manifest format, as package:version pairs")
parser.add_argument(dest="source",
help="File name for input, '-' for stdin")
# fmt: on
@ -42,7 +44,11 @@ def parse_apk(text: str) -> dict:
packages: dict = {}
data = json.loads(text)
for package in data.get("packages", []):
if isinstance(data, dict) and "packages" in data:
# Extract 'apk adbdump' dict field to 'apk query' package list
data = data["packages"]
for package in data:
package_name: str = package["name"]
for tag in package.get("tags", []):
@ -83,9 +89,13 @@ if __name__ == "__main__":
text: str = input.read()
packages = parse_apk(text) if args.source_format == "apk" else parse_opkg(text)
index = {
"version": 2,
"architecture": args.architecture,
"packages": packages,
}
print(json.dumps(index, indent=2))
if args.manifest:
for name, version in packages.items():
print(name, version)
else:
index = {
"version": 2,
"architecture": args.architecture,
"packages": packages,
}
print(json.dumps(index, indent=2))

3
target/imagebuilder/files/Makefile
View File

@ -168,7 +168,8 @@ _call_manifest: FORCE
ifeq ($(CONFIG_USE_APK),)
$(OPKG) list-installed $(if $(STRIP_ABI),--strip-abi)
else
$(APK) list --quiet --manifest --no-network
$(APK) query --format json --fields name,version,$(if $(STRIP_ABI),tags) --installed '*' | \
$(SCRIPT_DIR)/make-index-json.py -a $(ARCH_PACKAGES) -f apk --manifest -
endif
package_index: FORCE

2
target/linux/ramips/dts/mt7621_c-life_xg1.dts
View File

@ -176,7 +176,7 @@
};
&uartlite2 {
/* EFR32BG21 Ble */
/* EFR32BG21 Ble */
status = "okay";
};

22
target/linux/realtek/image/rt-loader/src/board.c
View File

@ -7,19 +7,21 @@
#include "memory.h"
#include "nanoprintf.h"
#define DRAM_CONFIG_REG 0xb8001004
#define UART_BUFFER_REG 0xb8002000
#define UART_LINE_STATUS_REG 0xb8002014
#define UART_TX_READY (1 << 29)
#define RTL83XX_DRAM_CONFIG_REG 0xb8001004
#define RTL838X_ENABLE_RW_MASK 0x3
#define RTL838X_INT_RW_CTRL_REG 0xbb000058
#define RTL838X_MODEL_NAME_INFO_REG 0xbb0000d4
#define RTL839X_MODEL_NAME_INFO_REG 0xbb000ff0
#define RTL83XX_CHIP_INFO_EN 0xa0000000
#define RTL931X_DRAM_CONFIG_REG 0xb814304c
#define RTL93XX_MODEL_NAME_INFO_REG 0xbb000004
#define RTL93XX_CHIP_INFO_EN 0xa0000
/*
* board_putchar() is the central function to write to serial console of the device. This is
* linked to printf() and the provider library via globals.h.
@ -41,14 +43,18 @@ void board_putchar(int ch, void *ctx)
unsigned int board_get_memory(void)
{
unsigned int dcr = ioread32(DRAM_CONFIG_REG);
char ROWCNTv[] = {11, 12, 13, 14, 15, 16};
char COLCNTv[] = {8, 9, 10, 11, 12};
char BNKCNTv[] = {1, 2, 3};
char BUSWIDv[] = {0, 1, 2};
unsigned int dcr, bits;
return 1 << (BNKCNTv[(dcr >> 28) & 0x3] + BUSWIDv[(dcr >> 24) & 0x3] +
ROWCNTv[(dcr >> 20) & 0xf] + COLCNTv[(dcr >> 16) & 0xf]);
if ((ioread32(RTL93XX_MODEL_NAME_INFO_REG) & 0xfffc0000) == 0x93100000) {
dcr = ioread32(RTL931X_DRAM_CONFIG_REG);
bits = (dcr >> 12) + ((dcr >> 6) & 0x3f) + (dcr & 0x3f);
} else {
dcr = ioread32(RTL83XX_DRAM_CONFIG_REG);
bits = ((dcr >> 28) & 0x3) + ((dcr >> 24) & 0x3) +
((dcr >> 20) & 0xf) + ((dcr >> 16) & 0xf) + 20;
}
return 1 << bits;
}
/*

2
tools/squashfs4/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=squashfs4
PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
PKG_VERSION:=4.7.0
PKG_RELEASE=1
PKG_RELEASE=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools

34
tools/squashfs4/patches/002-print_pager-add-missing-includes.patch Normal file
View File

@ -0,0 +1,34 @@
From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Fri, 6 Jun 2025 15:23:07 +0100
Subject: [PATCH] print_pager: add missing includes
When building with musl:
print_pager.h:33:25: error: unknown type name 'pid_t'
33 | extern void wait_to_die(pid_t process);
| ^~~~~
print_pager.h:34:25: error: unknown type name 'pid_t'
34 | extern FILE *exec_pager(pid_t *process);
| ^~~~~
print_pager.h uses pid_t and FILE, so add the required #includes to
ensure that these are defined.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
squashfs-tools/print_pager.h | 3 +++
1 file changed, 3 insertions(+)
--- a/squashfs-tools/print_pager.h
+++ b/squashfs-tools/print_pager.h
@@ -30,6 +30,9 @@
#define MORE_PAGER 2
#define UNKNOWN_PAGER 3
+#include <stdio.h>
+#include <sys/types.h>
+
extern void wait_to_die(pid_t process);
extern FILE *exec_pager(pid_t *process);
extern int get_column_width();

4
tools/util-linux/Makefile
View File

@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
PKG_VERSION:=2.41
PKG_VERSION:=2.41.1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
PKG_HASH:=81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6
PKG_HASH:=be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57
PKG_CPE_ID:=cpe:/a:kernel:util-linux
PKG_FIXUP:=autoreconf

26
tools/util-linux/patches/101-macos-weak-aliases.patch
View File

@ -1,26 +0,0 @@
From 9445f477cfcfb3615ffde8f93b1b98c809ee4eca Mon Sep 17 00:00:00 2001
From: Eugene Gershnik <gershnik@users.noreply.github.com>
Date: Mon, 6 May 2024 09:29:39 -0700
Subject: [PATCH] This re-enables build on macOS.
Weak aliases are not supported by clang on Darwin.
Instead this fix uses inline asm to make `_uuid_time` and alias to `___uuid_time`
Fixes util-linux/util-linux#2873
---
libuuid/src/uuid_time.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/libuuid/src/uuid_time.c
+++ b/libuuid/src/uuid_time.c
@@ -144,6 +144,10 @@ time_t __uuid_time(const uuid_t uu, stru
}
#if defined(__USE_TIME_BITS64) && defined(__GLIBC__)
extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time")));
+#elif defined(__clang__) && defined(__APPLE__)
+__asm__(".globl _uuid_time");
+__asm__(".set _uuid_time, ___uuid_time");
+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
#else
extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time")));
#endif