From f4901b361d14ed28f6d47399efb1c2cb11a19439c2167b6e50d712b144671da1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 26 Aug 2014 14:12:01 +0000 Subject: [PATCH] Accepting request 246531 from home:Andreas_Schwab:Factory - Always mark ipcs/limits and misc/setarch as known failure OBS-URL: https://build.opensuse.org/request/show/246531 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=254 --- python-libmount.changes | 12 ++++++++++++ python-libmount.spec | 14 ++++++-------- util-linux-systemd.changes | 12 ++++++++++++ util-linux-systemd.spec | 14 ++++++-------- util-linux.changes | 5 +++++ util-linux.spec | 7 ++----- 6 files changed, 43 insertions(+), 21 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 2ce4429..0ba302d 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de + +- Always mark ipcs/limits and misc/setarch as known failure + +------------------------------------------------------------------- +Tue Aug 26 07:43:16 UTC 2014 - pgajdos@suse.com + +- fix parsing of slash in the format string [bnc#889934] (internal) +- added patches: + * util-linux-slash-in-format-string.patch + ------------------------------------------------------------------- Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz diff --git a/python-libmount.spec b/python-libmount.spec index b39a06b..e6278cd 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -162,12 +162,12 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -388,6 +388,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -395,7 +396,6 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 popd %build @@ -591,11 +591,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -612,10 +611,8 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -627,7 +624,8 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit "$result" +exit 0 +#exit "$result" %install %if %build_util_linux diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 2ce4429..0ba302d 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de + +- Always mark ipcs/limits and misc/setarch as known failure + +------------------------------------------------------------------- +Tue Aug 26 07:43:16 UTC 2014 - pgajdos@suse.com + +- fix parsing of slash in the format string [bnc#889934] (internal) +- added patches: + * util-linux-slash-in-format-string.patch + ------------------------------------------------------------------- Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index a998004..5327133 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -162,12 +162,12 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -387,6 +387,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -394,7 +395,6 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 popd %build @@ -590,11 +590,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -611,10 +610,8 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -626,7 +623,8 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit "$result" +exit 0 +#exit "$result" %install %if %build_util_linux diff --git a/util-linux.changes b/util-linux.changes index 22eb54b..0ba302d 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de + +- Always mark ipcs/limits and misc/setarch as known failure + ------------------------------------------------------------------- Tue Aug 26 07:43:16 UTC 2014 - pgajdos@suse.com diff --git a/util-linux.spec b/util-linux.spec index 3993d8a..0532162 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -590,11 +590,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -611,10 +610,8 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin"