Accepting request 728060 from Base:System
OBS-URL: https://build.opensuse.org/request/show/728060 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=240
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
ce80894ebf
30
e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
Normal file
30
e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Thu, 27 Jun 2019 09:22:18 +0200
|
||||
Subject: [PATCH] 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 <kzak@redhat.com>
|
||||
---
|
||||
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;
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 30 11:53:46 UTC 2019 - olaf@aepfle.de
|
||||
|
||||
- lsblk: force to print PKNAME for partition with
|
||||
e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 19 15:27:03 CEST 2019 - kukuk@suse.de
|
||||
|
||||
- Remove outdated buildignore for pwdutils, had no effect with
|
||||
shadow anyways
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 6 03:39:25 UTC 2019 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
|
||||
@ -73,7 +73,7 @@ Name: python3-libmount
|
||||
%endif
|
||||
Summary: %main_summary
|
||||
License: GPL-2.0-or-later
|
||||
Group: %main_group
|
||||
Group: %group_pl
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: binutils-devel
|
||||
BuildRequires: fdupes
|
||||
@ -117,12 +117,6 @@ BuildRequires: libmount-devel
|
||||
#END SECOND STAGE DEPENDENCIES
|
||||
Version: 2.34
|
||||
Release: 0
|
||||
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
|
||||
# that into the core build cycle. pwdutils also pulls in the whole
|
||||
# ldap stack into it. Avoid this whole mess which is done only to
|
||||
# make the rpm install check of uuidd happy which has support to work without
|
||||
# these tools as well
|
||||
#!BuildIgnore: pwdutils
|
||||
Url: https://www.kernel.org/pub/linux/utils/util-linux/
|
||||
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz
|
||||
Source1: util-linux-rpmlintrc
|
||||
@ -145,6 +139,7 @@ Source51: blkid.conf
|
||||
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
|
||||
Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch
|
||||
Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch
|
||||
Patch813: e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#
|
||||
%if %build_util_linux
|
||||
@ -410,6 +405,7 @@ cp -a %{S:2} .
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch813 -p1
|
||||
|
||||
%build
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 30 11:53:46 UTC 2019 - olaf@aepfle.de
|
||||
|
||||
- lsblk: force to print PKNAME for partition with
|
||||
e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 19 15:27:03 CEST 2019 - kukuk@suse.de
|
||||
|
||||
- Remove outdated buildignore for pwdutils, had no effect with
|
||||
shadow anyways
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 6 03:39:25 UTC 2019 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
|
||||
@ -117,12 +117,6 @@ BuildRequires: libmount-devel
|
||||
#END SECOND STAGE DEPENDENCIES
|
||||
Version: 2.34
|
||||
Release: 0
|
||||
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
|
||||
# that into the core build cycle. pwdutils also pulls in the whole
|
||||
# ldap stack into it. Avoid this whole mess which is done only to
|
||||
# make the rpm install check of uuidd happy which has support to work without
|
||||
# these tools as well
|
||||
#!BuildIgnore: pwdutils
|
||||
Url: https://www.kernel.org/pub/linux/utils/util-linux/
|
||||
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz
|
||||
Source1: util-linux-rpmlintrc
|
||||
@ -145,6 +139,7 @@ Source51: blkid.conf
|
||||
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
|
||||
Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch
|
||||
Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch
|
||||
Patch813: e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#
|
||||
%if %build_util_linux
|
||||
@ -410,6 +405,7 @@ cp -a %{S:2} .
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch813 -p1
|
||||
|
||||
%build
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 30 11:53:46 UTC 2019 - olaf@aepfle.de
|
||||
|
||||
- lsblk: force to print PKNAME for partition with
|
||||
e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 19 15:27:03 CEST 2019 - kukuk@suse.de
|
||||
|
||||
- Remove outdated buildignore for pwdutils, had no effect with
|
||||
shadow anyways
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 6 03:39:25 UTC 2019 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
|
||||
@ -117,12 +117,6 @@ BuildRequires: libmount-devel
|
||||
#END SECOND STAGE DEPENDENCIES
|
||||
Version: 2.34
|
||||
Release: 0
|
||||
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
|
||||
# that into the core build cycle. pwdutils also pulls in the whole
|
||||
# ldap stack into it. Avoid this whole mess which is done only to
|
||||
# make the rpm install check of uuidd happy which has support to work without
|
||||
# these tools as well
|
||||
#!BuildIgnore: pwdutils
|
||||
Url: https://www.kernel.org/pub/linux/utils/util-linux/
|
||||
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz
|
||||
Source1: util-linux-rpmlintrc
|
||||
@ -145,6 +139,7 @@ Source51: blkid.conf
|
||||
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
|
||||
Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch
|
||||
Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch
|
||||
Patch813: e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#
|
||||
%if %build_util_linux
|
||||
@ -410,6 +405,7 @@ cp -a %{S:2} .
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch813 -p1
|
||||
|
||||
%build
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
|
||||
Loading…
Reference in New Issue
Block a user