diff --git a/system/base/util-linux/files/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/system/base/util-linux/files/0001-lsblk-force-to-print-PKNAME-for-partition.patch new file mode 100644 index 00000000..3fc342b3 --- /dev/null +++ b/system/base/util-linux/files/0001-lsblk-force-to-print-PKNAME-for-partition.patch @@ -0,0 +1,31 @@ +From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 27 Jun 2019 09:22:18 +0200 +Subject: [PATCH 1/1] lsblk: force to print PKNAME for partition + +PKNAME (parent kernel device name) is based on printed tree according +to parent -> child relationship. The tree is optional and not printed +if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old +versions print the PKNAME also in this case. + +Addresses: https://github.com/karelzak/util-linux/issues/813 +Signed-off-by: Karel Zak +Signed-off-by: Christian Hesse +--- + misc-utils/lsblk.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c +index e95af7af0..3ce6da730 100644 +--- a/misc-utils/lsblk.c ++++ b/misc-utils/lsblk.c +@@ -1019,6 +1019,9 @@ static void device_to_scols( + DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); + ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); + ++ if (!parent && dev->wholedisk) ++ parent = dev->wholedisk; ++ + /* Do not print device more than one in --list mode */ + if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) + return; diff --git a/system/base/util-linux/pspec.xml b/system/base/util-linux/pspec.xml index 6e3dd9fd..8f414a86 100644 --- a/system/base/util-linux/pspec.xml +++ b/system/base/util-linux/pspec.xml @@ -13,7 +13,7 @@ library Various useful Linux utilities The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. - https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.1.tar.xz + https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35-rc1.tar.xz zlib-devel eudev-devel @@ -23,10 +23,12 @@ ncurses-devel libcap-ng-devel pam-devel + libpcre2-devel upstream/util-linux-ng-2.21-login-lastlog.patch + @@ -43,6 +45,7 @@ eudev libcap-ng + libpcre2 /etc @@ -127,8 +130,13 @@ emul32 ncurses-32bit + libpcre2-32bit + libutil-linux-devel + ncurses-32bit + libpcre2-32bit + libutil-linux-devel libblkid-32bit @@ -140,6 +148,13 @@ + + 2019-12-25 + 2.35_rc1 + Version bump + Idris Kalp + idriskalp@gmail.com + 2019-03-17 2.31.1