3
0
forked from pool/util-linux

Accepting request 571529 from home:sbrabec:branches:util-linux-2.31.1

* fincore/count (disable, util-linux-fincore-count.patch)

OBS-URL: https://build.opensuse.org/request/show/571529
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=365
This commit is contained in:
Stanislav Brabec 2018-01-31 20:01:48 +00:00 committed by Git OBS Bridge
parent 555aba99d9
commit d9b0e7db92
7 changed files with 55 additions and 9 deletions

View File

@ -1,5 +1,5 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com Wed Jan 31 20:34:56 CET 2018 - sbrabec@suse.com
- Update to version 2.31.1: - Update to version 2.31.1:
* blkid: Add support for LUKS2 and new LABEL attributes. * blkid: Add support for LUKS2 and new LABEL attributes.
@ -15,8 +15,9 @@ Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com
* documentation updates * documentation updates
* other fixes and improvements * other fixes and improvements
- Fix regressions in 2.31.1: - Fix regressions in 2.31.1:
* sha1 on s390* (update util_linux_bigendian.patch). * sha1 on s390* (update util_linux_bigendian.patch)
* fsck.cramfs on ppc64le (util-linux-cramfs.patch). * fsck.cramfs on ppc64le (util-linux-cramfs.patch)
* fincore/count (disable, util-linux-fincore-count.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de

View File

@ -168,6 +168,8 @@ Patch3: util-linux-lsmem-memory-zone-3.patch
Patch4: util_linux_bigendian.patch Patch4: util_linux_bigendian.patch
# PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le. # PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le.
Patch5: util-linux-cramfs.patch Patch5: util-linux-cramfs.patch
# PATCH-FIX-UPSTREAM util-linux-fincore-count.patch sbrabec@suse.com -- Disable bad test fincore/count.
Patch6: util-linux-fincore-count.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
@ -410,6 +412,7 @@ library.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .

View File

@ -0,0 +1,34 @@
commit 839203c00ecb6b3dffd0d3eb8c77dac87584c241
Author: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Tue Jan 23 16:59:27 2018 +0100
tests: fix fincore/count KNOWN_FAIL
It has to be set after calling ts_init.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
commit 88e5d289d5dcec3dfb7bc8f8fac89ce789e69d3f
Author: Karel Zak <kzak@redhat.com>
Date: Wed Jan 17 14:41:56 2018 +0100
tests: mark fincore/count as KNOWN_FAIL
The test (or our expectations about Direct-IO) seems not robust
enough. I guess this is not fincore problem.
Signed-off-by: Karel Zak <kzak@redhat.com>
diff -urN util-linux-2.31.1.orig/tests/ts/fincore/count util-linux-2.31.1/tests/ts/fincore/count
--- util-linux-2.31.1.orig/tests/ts/fincore/count 2017-11-23 13:42:05.508423452 +0100
+++ util-linux-2.31.1/tests/ts/fincore/count 2018-01-31 20:33:12.838715727 +0100
@@ -8,6 +8,9 @@
ts_check_test_command "$TS_HELPER_SYSINFO"
+# Send patch if you know how to keep it portable and robust. Thanks.
+TS_KNOWN_FAIL="yes"
+
function header
{
echo "[" "$1" "]"

View File

@ -1,5 +1,5 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com Wed Jan 31 20:34:56 CET 2018 - sbrabec@suse.com
- Update to version 2.31.1: - Update to version 2.31.1:
* blkid: Add support for LUKS2 and new LABEL attributes. * blkid: Add support for LUKS2 and new LABEL attributes.
@ -15,8 +15,9 @@ Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com
* documentation updates * documentation updates
* other fixes and improvements * other fixes and improvements
- Fix regressions in 2.31.1: - Fix regressions in 2.31.1:
* sha1 on s390* (update util_linux_bigendian.patch). * sha1 on s390* (update util_linux_bigendian.patch)
* fsck.cramfs on ppc64le (util-linux-cramfs.patch). * fsck.cramfs on ppc64le (util-linux-cramfs.patch)
* fincore/count (disable, util-linux-fincore-count.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de

View File

@ -168,6 +168,8 @@ Patch3: util-linux-lsmem-memory-zone-3.patch
Patch4: util_linux_bigendian.patch Patch4: util_linux_bigendian.patch
# PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le. # PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le.
Patch5: util-linux-cramfs.patch Patch5: util-linux-cramfs.patch
# PATCH-FIX-UPSTREAM util-linux-fincore-count.patch sbrabec@suse.com -- Disable bad test fincore/count.
Patch6: util-linux-fincore-count.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
@ -410,6 +412,7 @@ library.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .

View File

@ -1,5 +1,5 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com Wed Jan 31 20:34:56 CET 2018 - sbrabec@suse.com
- Update to version 2.31.1: - Update to version 2.31.1:
* blkid: Add support for LUKS2 and new LABEL attributes. * blkid: Add support for LUKS2 and new LABEL attributes.
@ -15,8 +15,9 @@ Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com
* documentation updates * documentation updates
* other fixes and improvements * other fixes and improvements
- Fix regressions in 2.31.1: - Fix regressions in 2.31.1:
* sha1 on s390* (update util_linux_bigendian.patch). * sha1 on s390* (update util_linux_bigendian.patch)
* fsck.cramfs on ppc64le (util-linux-cramfs.patch). * fsck.cramfs on ppc64le (util-linux-cramfs.patch)
* fincore/count (disable, util-linux-fincore-count.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de

View File

@ -168,6 +168,8 @@ Patch3: util-linux-lsmem-memory-zone-3.patch
Patch4: util_linux_bigendian.patch Patch4: util_linux_bigendian.patch
# PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le. # PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le.
Patch5: util-linux-cramfs.patch Patch5: util-linux-cramfs.patch
# PATCH-FIX-UPSTREAM util-linux-fincore-count.patch sbrabec@suse.com -- Disable bad test fincore/count.
Patch6: util-linux-fincore-count.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
@ -410,6 +412,7 @@ library.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .