Sync upstream up to 20241224

Signed-off-by: GitHub Actions <[email protected]>
pmkol · Dec 23, 2024 · 7314f57 · 7314f57
1 parent ffcf2ee
commit 7314f57
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/einat-ebpf/Makefile b/einat-ebpf/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=einat-ebpf
 PKG_UPSTREAM_VERSION:=0.1.5
 PKG_UPSTREAM_GITHASH:=
 PKG_VERSION:=$(PKG_UPSTREAM_VERSION)$(if $(PKG_UPSTREAM_GITHASH),~$(call version_abbrev,$(PKG_UPSTREAM_GITHASH)))
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 ifeq ($(PKG_UPSTREAM_GITHASH),)
 PKG_SOURCE_URL:=https://codeload.github.com/EHfive/einat-ebpf/tar.gz/refs/tags/v$(PKG_UPSTREAM_VERSION)?
@@ -52,6 +52,14 @@ TARGET_PATH_PKG:=$(LLVM_PATH):$(TARGET_PATH_PKG)
 # RUST_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||mips||mipsel||mips64||mips64el||mipsel||powerpc64||riscv64||x86_64)
 EINAT_EBPF_RUST_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||powerpc64||riscv64||x86_64) # Architectures other than x86_64 and aarch64 have not been tested.
 
+ifeq ($(ARCH),arm)
+  CONFIG_EINAT_EBPF_BINDGEN:=y
+else ifeq ($(ARCH),i386)
+  CONFIG_EINAT_EBPF_BINDGEN:=y
+else ifeq ($(ARCH),i686)
+  CONFIG_EINAT_EBPF_BINDGEN:=y
+endif
+
 define Package/$(PKG_NAME)
   SECTION:=net
   CATEGORY:=Network

diff --git a/luci-app-filemanager/htdocs/luci-static/resources/view/system/filemanager.js b/luci-app-filemanager/htdocs/luci-static/resources/view/system/filemanager.js
@@ -297,7 +297,7 @@ function getFileList(path) {
 		lines.forEach(function(line) {
 			if (line.startsWith('total') || !line.trim()) return;
 			// Parse the output line from 'ls' command
-			var parts = line.match(/^([\-dl])[rwx\-]{2}[rwx\-Ss]{1}[rwx\-]{2}[rwx\-Ss]{1}[rwx\-]{2}[rwx\-Tt]{1}\s+\d+\s+(\S+)\s+(\S+)\s+(\d+)\s+([\d\-]+\s+[\d\:\.]{8,12}\s+\+\d{4})\s+(.+)$/);
+			var parts = line.match(/^([\-dl])[rwx\-]{2}[rwx\-Ss]{1}[rwx\-]{2}[rwx\-Ss]{1}[rwx\-]{2}[rwx\-Tt]{1}\s+\d+\s+(\S+)\s+(\S+)\s+(\d+)\s+([\d\-]+\s+[\d\:\.]{8,12}\s+[+-]\d{4})\s+(.+)$/);
 			if (!parts || parts.length < 7) {
 				console.warn('Failed to parse line:', line);
 				return;

diff --git a/oaf/src/af_log.c b/oaf/src/af_log.c
@@ -59,9 +59,6 @@ static struct ctl_table oaf_table[] = {
 		.mode = 0666,
 		.proc_handler = proc_douintvec,
 	},
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0))
-	{}
-#endif
 };
 
 static struct ctl_table oaf_root_table[] = {