移除内核诊断模式及关联集成

Documentation/admin-guide/console.rst

@@ -17,5 +17,4 @@ VT 与日志
 Kernel panic 在当前文本 VT 输出诊断；在 GUI 中从左上角绘制黑底字符格，
 保留其他像素。完整诊断继续写串口和 VT 历史。记录异常码、RIP、CR2/CR3、
 CPU/任务、内核版本和源码身份，使用同一构建的调试符号定位。
-Kerneldebug 的产品信息入口使用 ``About ReliefOS``；诊断工具不能代替正常内核。
 没有目标虚拟机故障注入的测试，不能宣称 panic 显示已在该平台通过。

Documentation/kbuild/products.rst

@@ -7,7 +7,7 @@
 
 输出均相对于 O：
 
-* ``kernel`` / ``kerneldebug``：generated/system 内核与调试载荷。
+* ``kernel``：generated/system 内核与独立调试符号。
 * ``runtime`` / ``userland``：公共运行库与所选应用。
 * ``sdk``：packages/reliefos-musl-sdk.tar.gz。
 * ``apk-repo``：packages/apk/repository。

Documentation/userspace-api/abi.rst

@@ -59,10 +59,20 @@ X11 应用通过 Xorg 通信。未知或旧兼容路径不能当作新的公开
 ==============
 
 旧自研窗口、鼠标区域、外观广播和 UI 工具包导出已移除，不再提供转发或空实现。
-历史 ABI 快照保持不变；集成验证要求已移除的图形接口不存在，并继续检查
+集成验证要求已移除的图形接口不存在，并继续检查
 其他接口的布局、符号类型和 SONAME。进程/时钟与 fbdev 辅助声明分别位于
 ``<reliefos/system.h>`` 和 ``<reliefos/fb.h>``，应用必须重新构建。
 
+引导与构建接口收敛
+==================
+
+开机前的交互诊断会话、独立载荷、SDK 控制接口和旧名称别名已整体移除。
+系统信息应用只显示版本信息，内核直接进入正常初始化流程。
+依赖已删除控制接口的程序必须移除调用并重新构建，不提供兼容空实现。
+ABI 清单同步删除这些已退役条目，其余结构布局、常量和符号约定保持不变。
+内核安装包只要求内核与独立符号文件；版本化启动目录保留内核、initramfs 和
+引导环境文件。构建调试配置、符号定位、串口日志及 panic 报告继续可用。
+
 独立安装实例的引导接口
 ======================
 

Kbuild

@@ -30,7 +30,7 @@ include $(srctree)/scripts/reliefos/Makefile.tests
 include $(srctree)/tools/host/Kbuild
 tools: $(RELIEFOS_HOST_TOOLS)
 
-kernel: $(RELIEFOS_KERNEL_SYS) $(RELIEFOS_KERNEL_DEBUG)
+kernel: $(RELIEFOS_KERNEL_SYS) $(RELIEFOS_KERNEL_SYMBOLS)
 
 test: test-tools test-build
 

NOTICE

@@ -39,8 +39,8 @@ Runtime, libraries, and applications
 * util-linux 2.41.6 (su/runuser and storage utilities/libraries): upstream
   GPL/LGPL and file-specific terms;
   see README.licensing.
-* e2fsprogs 1.47.3: upstream GPL/LGPL/BSD/MIT and file-specific terms;
-  see NOTICE. dosfstools 4.2 and exfatprogs 1.4.3: see their COPYING files
+* e2fsprogs 1.47.4: upstream GPL/LGPL/BSD/MIT and file-specific terms;
+  see NOTICE. dosfstools 4.2 and exfatprogs 1.4.4: see their COPYING files
   and individual source headers. Fixed archive references and checksums are
   in configs/storage-upstream.json; notices are installed under
   /usr/share/licenses/<package>/.

configs/dependencies.lock.json

@@ -2046,25 +2046,25 @@
     {
       "id": "alpine-vim",
       "kind": "apk",
-      "version": "9.2.1202-r0",
-      "url": "https://dl-cdn.alpinelinux.org/alpine/v3.24/community/x86_64/vim-9.2.1202-r0.apk",
-      "sha256": "922cdfce26e19a6413bbbd7110b7aa9460c7445caca41cf433341b243ad6cece",
-      "directory": "vim-9.2.1202-r0",
+      "version": "9.2.1310-r0",
+      "url": "https://dl-cdn.alpinelinux.org/alpine/v3.24/community/x86_64/vim-9.2.1310-r0.apk",
+      "sha256": "83f90479632e7abaf76dad16fa7a6b334dee2d01a87496d9310d49b993b23ca2",
+      "directory": "vim-9.2.1310-r0",
       "script": "tools/build/upstream-apk.sh",
       "target": "apk-root",
-      "note": "Alpine aports recipe commit 8dda40f62186710707d93e571f4fa7519b1538a0; .PKGINFO license = Vim",
+      "note": "Alpine aports recipe commit 7fc5a6e8b3e6afcb3fcfdc970633418453787640; .PKGINFO license = Vim",
       "license_in_source": ".PKGINFO"
     },
     {
       "id": "alpine-vim-common",
       "kind": "apk",
-      "version": "9.2.1202-r0",
-      "url": "https://dl-cdn.alpinelinux.org/alpine/v3.24/community/x86_64/vim-common-9.2.1202-r0.apk",
-      "sha256": "1565a62139d4049e7ade4fbbf58964d99ec7f33b78a8328061b426364ca2c251",
-      "directory": "vim-common-9.2.1202-r0",
+      "version": "9.2.1310-r0",
+      "url": "https://dl-cdn.alpinelinux.org/alpine/v3.24/community/x86_64/vim-common-9.2.1310-r0.apk",
+      "sha256": "d3e6ab17dcda2e6f478c2889c47a6d0cc35a1454aa5dfd16822e81cccbd08966",
+      "directory": "vim-common-9.2.1310-r0",
       "script": "tools/build/upstream-apk.sh",
       "target": "apk-root",
-      "note": "Alpine aports recipe commit 8dda40f62186710707d93e571f4fa7519b1538a0; .PKGINFO license = Vim; runtime data required by alpine-vim",
+      "note": "Alpine aports recipe commit 7fc5a6e8b3e6afcb3fcfdc970633418453787640; .PKGINFO license = Vim; runtime data required by alpine-vim",
       "license_in_source": ".PKGINFO"
     },
     {
@@ -2356,13 +2356,13 @@
     {
       "id": "alpine-xxd",
       "kind": "apk",
-      "version": "9.2.1202-r0",
-      "url": "https://dl-cdn.alpinelinux.org/alpine/v3.24/community/x86_64/xxd-9.2.1202-r0.apk",
-      "sha256": "22e8c267798e6b874b3efad6dee73048a5eef9ef993955af4ab4489186ceae8a",
-      "directory": "xxd-9.2.1202-r0",
+      "version": "9.2.1310-r0",
+      "url": "https://dl-cdn.alpinelinux.org/alpine/v3.24/community/x86_64/xxd-9.2.1310-r0.apk",
+      "sha256": "48e3ddfa817c91c64e9461bc247b61e5c685fc279afc4a36ae499ce9a90a8185",
+      "directory": "xxd-9.2.1310-r0",
       "script": "tools/build/upstream-apk.sh",
       "target": "apk-root",
-      "note": "Alpine aports recipe commit 8dda40f62186710707d93e571f4fa7519b1538a0; .PKGINFO license = Vim; required by alpine-vim",
+      "note": "Alpine aports recipe commit 7fc5a6e8b3e6afcb3fcfdc970633418453787640; .PKGINFO license = Vim; required by alpine-vim",
       "license_in_source": ".PKGINFO"
     },
     {
@@ -2476,12 +2476,12 @@
     {
       "id": "exfatprogs",
       "kind": "tarball",
-      "version": "1.4.3",
-      "url": "https://github.com/exfatprogs/exfatprogs/releases/download/1.4.3/exfatprogs-1.4.3.tar.xz",
-      "sha256": "57226a8ec1bfbce06d68a42cde8cd980414a9457882e691fbce4a4f86c8d5f08",
-      "directory": "exfatprogs-1.4.3",
+      "version": "1.4.4",
+      "url": "https://github.com/exfatprogs/exfatprogs/releases/download/1.4.4/exfatprogs-1.4.4.tar.xz",
+      "sha256": "102bbdfd934776c12c6d83743a31ec648f8c2f1ddfa1832b6e13b6efd09412cb",
+      "directory": "exfatprogs-1.4.4",
       "license_in_source": "COPYING",
-      "checksum_source": "https://api.github.com/repos/exfatprogs/exfatprogs/releases/tags/1.4.3",
+      "checksum_source": "https://api.github.com/repos/exfatprogs/exfatprogs/releases/tags/1.4.4",
       "script": "tools/build/upstream.sh",
       "target": "storage-upstream"
     },

configs/header-export.list

@@ -8,7 +8,6 @@ include/uapi/reliefos/driver_abi.h
 include/uapi/reliefos/fs_abi.h
 include/uapi/reliefos/gpu_abi.h
 include/uapi/reliefos/inputm_abi.h
-include/uapi/reliefos/kernel_debug_abi.h
 include/uapi/reliefos/net_abi.h
 include/uapi/reliefos/net_control.h
 include/uapi/reliefos/pty_abi.h

configs/nls/po/leonos.pot

@@ -2738,10 +2738,6 @@ msgstr ""
 msgid "Could not open the search result"
 msgstr ""
 
-#: userland/apps/osver/main.cpp:29
-msgid "Could not persist kernel debug mode."
-msgstr ""
-
 #: userland/apps/reliefmail/window_actions.cpp:606
 msgid "Could not prepare the bounded SMTP confirmation."
 msgstr ""
@@ -6342,18 +6338,6 @@ msgstr ""
 msgid "Kernel"
 msgstr ""
 
-#: userland/apps/osver/main.cpp:27
-msgid "Kernel debug mode"
-msgstr ""
-
-#: userland/apps/osver/main.cpp:26
-msgid "Kernel debug mode enabled"
-msgstr ""
-
-#: userland/apps/osver/main.cpp:28
-msgid "Kernel debug mode enabled. Reboot to enter it."
-msgstr ""
-
 #: userland/apps/devmgr/main.c:280
 msgid "Kernel device list"
 msgstr ""

configs/nls/po/zh_CN.po

@@ -2779,10 +2779,6 @@ msgstr "无法打开指定路径"
 msgid "Could not open the search result"
 msgstr "无法打开搜索结果"
 
-#: userland/apps/osver/main.cpp:29
-msgid "Could not persist kernel debug mode."
-msgstr "无法保存内核调试模式状态。"
-
 #: userland/apps/reliefmail/window_actions.cpp:606
 msgid "Could not prepare the bounded SMTP confirmation."
 msgstr "无法准备受限大小的 SMTP 确认信息。"
@@ -6425,18 +6421,6 @@ msgstr "开尔文 (K)"
 msgid "Kernel"
 msgstr "内核"
 
-#: userland/apps/osver/main.cpp:27
-msgid "Kernel debug mode"
-msgstr "内核调试模式"
-
-#: userland/apps/osver/main.cpp:26
-msgid "Kernel debug mode enabled"
-msgstr "内核调试模式已启用"
-
-#: userland/apps/osver/main.cpp:28
-msgid "Kernel debug mode enabled. Reboot to enter it."
-msgstr "已启用内核调试模式，重启后进入。"
-
 #: userland/apps/devmgr/main.c:280
 msgid "Kernel device list"
 msgstr "内核设备列表"
@@ -14821,9 +14805,6 @@ msgstr "工作进程错误"
 #~ msgid "Invalid shortcut."
 #~ msgstr "快捷方式无效。"
 
-#~ msgid "Kernel debugger"
-#~ msgstr "内核调试工具"
-
 #~ msgid "Label:"
 #~ msgstr "卷标:"
 
@@ -14980,9 +14961,6 @@ msgstr "工作进程错误"
 #~ msgid "Restart ReliefOS now?"
 #~ msgstr "是否立即重启 ReliefOS？"
 
-#~ msgid "Restart into kernel debugger"
-#~ msgstr "重启并进入内核调试工具"
-
 #~ msgid "Ring-3 desktop shadow blit"
 #~ msgstr "Ring-3 桌面阴影缓冲绘制"
 
@@ -15355,9 +15333,6 @@ msgstr "工作进程错误"
 #~ msgid "Items deleted permanently"
 #~ msgstr "项目已永久删除"
 
-#~ msgid "Kernel debug mode enabled. Use Start > Power to reboot into it."
-#~ msgstr "内核调试模式已启用。请从开始菜单的电源页面重启进入。"
-
 #~ msgid "Kernel driver modules"
 #~ msgstr "内核驱动模块"
 
@@ -15569,9 +15544,6 @@ msgstr "工作进程错误"
 #~ msgid "You can inspect loaded modules, but cannot change them."
 #~ msgstr "可以查看模块，但不能修改它们。"
 
-#~ msgid "boot, libraries, kerneldebug, EFI, docs, and drivers will be refreshed. Extra target applications and drivers are kept."
-#~ msgstr "boot、运行库、kerneldebug、EFI、内置文档和驱动程序会刷新；目标中多出的应用和驱动会保留。"
-
 #~ msgid "exFAT root cannot carry the current symlink layout; use a fresh ext2 install"
 #~ msgstr "exFAT 根分区无法承载当前符号链接布局，请改为 ext2 全新安装"
 

configs/storage-upstream.json

@@ -1,11 +1,11 @@
 {
   "e2fsprogs": {
-    "version": "1.47.3",
-    "url": "https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.3/e2fsprogs-1.47.3.tar.xz",
-    "sha256": "857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329",
-    "directory": "e2fsprogs-1.47.3",
+    "version": "1.47.4",
+    "url": "https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.4/e2fsprogs-1.47.4.tar.xz",
+    "sha256": "fd5bf388cbdbe006a3d3b318d983b2948382440acc85a87f1e7d108653e8db0b",
+    "directory": "e2fsprogs-1.47.4",
     "license_file": "NOTICE",
-    "checksum_source": "https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.3/sha256sums.asc"
+    "checksum_source": "https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.4/sha256sums.asc"
   },
   "dosfstools": {
     "version": "4.2",
@@ -16,11 +16,11 @@
     "checksum_source": "https://raw.githubusercontent.com/buildroot/buildroot/2025.02/package/dosfstools/dosfstools.hash"
   },
   "exfatprogs": {
-    "version": "1.4.3",
-    "url": "https://github.com/exfatprogs/exfatprogs/releases/download/1.4.3/exfatprogs-1.4.3.tar.xz",
-    "sha256": "57226a8ec1bfbce06d68a42cde8cd980414a9457882e691fbce4a4f86c8d5f08",
-    "directory": "exfatprogs-1.4.3",
+    "version": "1.4.4",
+    "url": "https://github.com/exfatprogs/exfatprogs/releases/download/1.4.4/exfatprogs-1.4.4.tar.xz",
+    "sha256": "102bbdfd934776c12c6d83743a31ec648f8c2f1ddfa1832b6e13b6efd09412cb",
+    "directory": "exfatprogs-1.4.4",
     "license_file": "COPYING",
-    "checksum_source": "https://api.github.com/repos/exfatprogs/exfatprogs/releases/tags/1.4.3"
+    "checksum_source": "https://api.github.com/repos/exfatprogs/exfatprogs/releases/tags/1.4.4"
   }
 }

include/leonos/layout.h

@@ -39,7 +39,6 @@
 #define LEONOS_PATH_ACCOUNTS_DB RELIEFOS_PATH_ACCOUNTS_DB
 #define LEONOS_PATH_BOOT_DISPLAY_CONF RELIEFOS_PATH_BOOT_DISPLAY_CONF
 #define LEONOS_PATH_BOOT_KERNEL RELIEFOS_PATH_BOOT_KERNEL
-#define LEONOS_PATH_BOOT_KERNELDEBUG_MARKER RELIEFOS_PATH_BOOT_KERNELDEBUG_MARKER
 #define LEONOS_PATH_BROWSER_CJK_FONT RELIEFOS_PATH_BROWSER_CJK_FONT
 #define LEONOS_PATH_BROWSER_FONT RELIEFOS_PATH_BROWSER_FONT
 #define LEONOS_PATH_CACERT RELIEFOS_PATH_CACERT
@@ -48,9 +47,6 @@
 #define LEONOS_PATH_FILEASSOC_CFG RELIEFOS_PATH_FILEASSOC_CFG
 #define LEONOS_PATH_GLIBC_INTERP RELIEFOS_PATH_GLIBC_INTERP
 #define LEONOS_PATH_HELP RELIEFOS_PATH_HELP
-#define LEONOS_PATH_KERNELDEBUG_CONTROL RELIEFOS_PATH_KERNELDEBUG_CONTROL
-#define LEONOS_PATH_KERNELDEBUG_ENABLED RELIEFOS_PATH_KERNELDEBUG_ENABLED
-#define LEONOS_PATH_KERNELDEBUG_MODULE RELIEFOS_PATH_KERNELDEBUG_MODULE
 #define LEONOS_PATH_LEONOS_CONF RELIEFOS_PATH_RELIEFOS_CONF
 #define LEONOS_PATH_LESSKEY RELIEFOS_PATH_LESSKEY
 #define LEONOS_PATH_LIBC RELIEFOS_PATH_LIBC

include/leonos/psf_font.h

@@ -42,7 +42,6 @@
 #define LEONOS_PATH_ACCOUNTS_DB RELIEFOS_PATH_ACCOUNTS_DB
 #define LEONOS_PATH_BOOT_DISPLAY_CONF RELIEFOS_PATH_BOOT_DISPLAY_CONF
 #define LEONOS_PATH_BOOT_KERNEL RELIEFOS_PATH_BOOT_KERNEL
-#define LEONOS_PATH_BOOT_KERNELDEBUG_MARKER RELIEFOS_PATH_BOOT_KERNELDEBUG_MARKER
 #define LEONOS_PATH_BROWSER_CJK_FONT RELIEFOS_PATH_BROWSER_CJK_FONT
 #define LEONOS_PATH_BROWSER_FONT RELIEFOS_PATH_BROWSER_FONT
 #define LEONOS_PATH_CACERT RELIEFOS_PATH_CACERT
@@ -51,9 +50,6 @@
 #define LEONOS_PATH_FILEASSOC_CFG RELIEFOS_PATH_FILEASSOC_CFG
 #define LEONOS_PATH_GLIBC_INTERP RELIEFOS_PATH_GLIBC_INTERP
 #define LEONOS_PATH_HELP RELIEFOS_PATH_HELP
-#define LEONOS_PATH_KERNELDEBUG_CONTROL RELIEFOS_PATH_KERNELDEBUG_CONTROL
-#define LEONOS_PATH_KERNELDEBUG_ENABLED RELIEFOS_PATH_KERNELDEBUG_ENABLED
-#define LEONOS_PATH_KERNELDEBUG_MODULE RELIEFOS_PATH_KERNELDEBUG_MODULE
 #define LEONOS_PATH_LEONOS_CONF RELIEFOS_PATH_RELIEFOS_CONF
 #define LEONOS_PATH_LESSKEY RELIEFOS_PATH_LESSKEY
 #define LEONOS_PATH_LIBC RELIEFOS_PATH_LIBC

include/leonos/system.h

@@ -6,14 +6,6 @@
 #include <reliefos/system.h>
 
 /* Old names alias the single canonical declaration. */
-#define LEONOS_KERNEL_DEBUG_CONTROL_ARM_NEXT_BOOT RELIEFOS_KERNEL_DEBUG_CONTROL_ARM_NEXT_BOOT
-#define LEONOS_KERNEL_DEBUG_CONTROL_CLEAR RELIEFOS_KERNEL_DEBUG_CONTROL_CLEAR
-#define LEONOS_KERNEL_DEBUG_CONTROL_GET_STATE RELIEFOS_KERNEL_DEBUG_CONTROL_GET_STATE
-#define LEONOS_KERNEL_DEBUG_CONTROL_SET_ENABLED RELIEFOS_KERNEL_DEBUG_CONTROL_SET_ENABLED
-#define LEONOS_KERNEL_DEBUG_H RELIEFOS_KERNEL_DEBUG_H
-#define LEONOS_KERNEL_DEBUG_STATE_ENABLED RELIEFOS_KERNEL_DEBUG_STATE_ENABLED
-#define LEONOS_KERNEL_DEBUG_STATE_NEXT_BOOT RELIEFOS_KERNEL_DEBUG_STATE_NEXT_BOOT
-#define LEONOS_KERNEL_DEBUG_VERSION RELIEFOS_KERNEL_DEBUG_VERSION
 #define LEONOS_MACHINE_IDENTITY_FLAG_BOOT_DISK_GUID RELIEFOS_MACHINE_IDENTITY_FLAG_BOOT_DISK_GUID
 #define LEONOS_MACHINE_IDENTITY_FLAG_BOOT_PARTITION_GUID RELIEFOS_MACHINE_IDENTITY_FLAG_BOOT_PARTITION_GUID
 #define LEONOS_MACHINE_IDENTITY_FLAG_PLATFORM_UUID RELIEFOS_MACHINE_IDENTITY_FLAG_PLATFORM_UUID
@@ -30,13 +22,7 @@
 #define LEONOS_SYSTEM_VERSION_LEN RELIEFOS_SYSTEM_VERSION_LEN
 #define LEONOS_TASK_AFFINITY_GET RELIEFOS_TASK_AFFINITY_GET
 #define LEONOS_TASK_AFFINITY_SET RELIEFOS_TASK_AFFINITY_SET
-#define LEONOS_UAPI_KERNEL_DEBUG_ABI_H RELIEFOS_UAPI_KERNEL_DEBUG_ABI_H
 #define LEONOS_UAPI_SYSTEM_ABI_H RELIEFOS_UAPI_SYSTEM_ABI_H
-#define leonos_kernel_debug_arm_next_boot reliefos_kernel_debug_arm_next_boot
-#define leonos_kernel_debug_clear reliefos_kernel_debug_clear
-#define leonos_kernel_debug_control reliefos_kernel_debug_control
-#define leonos_kernel_debug_get_state reliefos_kernel_debug_get_state
-#define leonos_kernel_debug_set_enabled reliefos_kernel_debug_set_enabled
 #define leonos_machine_identity reliefos_machine_identity
 #define leonos_perf_cpu_info reliefos_perf_cpu_info
 #define leonos_perf_info reliefos_perf_info