RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/util-linux#347549f079887ce61f62e6ffd3cdf29d1a245626
This commit is contained in:
Troy Dawson
parent
5972c301b8
commit
f673cea2b7
|
|
@ -78,3 +78,4 @@
|
|||
/util-linux-2.35.1.tar.xz
|
||||
/util-linux-2.35.2.tar.xz
|
||||
/util-linux-2.36.tar.xz
|
||||
/util-linux-2.36.1.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
From 430952f254cddf1ccb47a5f8caf5b5cd64193c3a Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Mon, 10 Aug 2020 11:37:32 +0200
|
||||
Subject: [PATCH] libfdisk: fix last free sector detection if partition size
|
||||
specified
|
||||
|
||||
We need to skip useless gaps between partition if the gap is no large
|
||||
enough for a new partition. Unfortunately, the current code checks
|
||||
size of the gap, but does not care for location of the gap -- this is
|
||||
good enough for dialog driven partitioning, but it's pretty bad if
|
||||
start of the partition is explicitly specified (e.g. sfdisk).
|
||||
|
||||
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1860461
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
libfdisk/src/dos.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
|
||||
index 176969883..890e33a26 100644
|
||||
--- a/libfdisk/src/dos.c
|
||||
+++ b/libfdisk/src/dos.c
|
||||
@@ -1274,14 +1274,14 @@ static int add_partition(struct fdisk_context *cxt, size_t n,
|
||||
fdisk_sector_t last;
|
||||
|
||||
rc = find_last_free(cxt, is_logical, start, limit, &last);
|
||||
-
|
||||
if (rc == 0 && last - start + 1 < fdisk_partition_get_size(pa)) {
|
||||
DBG(LABEL, ul_debug("DOS: area <%ju,%ju> too small [wanted=%ju aval=%ju]",
|
||||
(uintmax_t) start, (uintmax_t) last,
|
||||
fdisk_partition_get_size(pa),
|
||||
last - start));
|
||||
|
||||
- if (fdisk_partition_has_start(pa))
|
||||
+ if (fdisk_partition_has_start(pa)
|
||||
+ && fdisk_partition_get_start(pa) <= last)
|
||||
rc = -ENOSPC;
|
||||
else {
|
||||
start = last + 1;
|
||||
--
|
||||
2.25.4
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (util-linux-2.36.tar.xz) = cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
|
||||
SHA512 (util-linux-2.36.1.tar.xz) = 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
### Header
|
||||
Summary: A collection of basic system utilities
|
||||
Name: util-linux
|
||||
Version: 2.36
|
||||
Release: 3%{?dist}
|
||||
Version: 2.36.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
URL: http://en.wikipedia.org/wiki/Util-linux
|
||||
|
||||
|
|
@ -104,11 +104,9 @@ Requires: libfdisk = %{version}-%{release}
|
|||
###
|
||||
# 151635 - makeing /var/log/lastlog
|
||||
Patch0: 2.36-login-lastlog-create.patch
|
||||
# 1860461 - sfdisk regression creating simple 3 partition MBR disk
|
||||
Patch1: 0001-libfdisk-fix-last-free-sector-detection-if-partition.patch
|
||||
# https://github.com/karelzak/util-linux/commit/57898c3a7ee8fc5933cddd4526bb3980bef85a02
|
||||
# The workaround is unnecessary on Fedora with kernel >= 5.8.
|
||||
Patch2: 0002-libmount-remove-read-mountinfo-workaround.patch
|
||||
Patch1: 0002-libmount-remove-read-mountinfo-workaround.patch
|
||||
|
||||
%description
|
||||
The util-linux package contains a large variety of low-level system
|
||||
|
|
@ -306,7 +304,7 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
|
|||
%endif
|
||||
|
||||
# build util-linux
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%check
|
||||
#to run tests use "--with check"
|
||||
|
|
@ -326,7 +324,7 @@ touch ${RPM_BUILD_ROOT}/var/log/lastlog
|
|||
chmod 0644 ${RPM_BUILD_ROOT}/var/log/lastlog
|
||||
|
||||
# install util-linux
|
||||
make install DESTDIR=${RPM_BUILD_ROOT}
|
||||
%make_install
|
||||
|
||||
# raw
|
||||
echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
|
||||
|
|
@ -941,6 +939,14 @@ fi
|
|||
%{_libdir}/python*/site-packages/libmount/
|
||||
|
||||
%changelog
|
||||
* Mon Nov 16 2020 Karel Zak <kzak@redhat.com> - 2.36.1-1
|
||||
- upgrade to stable upstream 2.36.1
|
||||
https://www.kernel.org/pub/linux/utils/util-linux/v2.36/v2.36.1-ReleaseNotes
|
||||
|
||||
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.36-4
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Tue Sep 01 2020 Karel Zak <kzak@redhat.com> - 2.36-3
|
||||
- remove mountinfo workaround (unnecessary for kernel 5.8)
|
||||
- fix #1860461 - sfdisk regression creating simple 3 partition MBR disk
|
||||
|
|
|
|||
Loading…
Reference in New Issue