Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
util-linux (2.40.4-3deepin8) unstable; urgency=medium

* fix lscpu wrong at Phytium.
* revert fix var/run/utmp don't be updated after logout/login

-- xinpeng.wang <[email protected]> Thu, 19 Jun 2025 17:50:42 +0800

util-linux (2.40.4-3deepin7) unstable; urgency=medium

* feat: add sw64 support
Expand Down
95 changes: 0 additions & 95 deletions debian/patches/debian/login-turn-on-utmp-writing.patch

This file was deleted.

2 changes: 1 addition & 1 deletion debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ upstream-master/fallocate-forbid-posix-with-special-options.patch
upstream-master/lib-colors-fix-fallback-to-system-directory.patch
debian/usec-umac-adapt.patch
uniontech-backward-lsblk.patch
debian/login-turn-on-utmp-writing.patch
add-sunway-support.patch
uniontech-fix-arm-lscpu-modename.patch
14 changes: 14 additions & 0 deletions debian/patches/uniontech-fix-arm-lscpu-modename.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Index: util-linux/sys-utils/lscpu-arm.c
===================================================================
--- util-linux.orig/sys-utils/lscpu-arm.c 2025-06-19 16:54:39.000000000 +0800
+++ util-linux/sys-utils/lscpu-arm.c 2025-06-19 17:27:52.072178100 +0800
@@ -311,7 +311,8 @@
{ 0x66, faraday_part, "Faraday" },
{ 0x69, intel_part, "Intel" },
{ 0x6d, ms_part, "Microsoft" },
- { 0x70, ft_part, "Phytium" },
+ /* The parsing logic of phytium CPU is wrong. Use the value in /proc/cpuinfo directly. */
+ { 0x70, NULL, "Phytium" },
{ 0xc0, ampere_part, "Ampere" },
{ -1, unknown_part, "unknown" },
};
Loading