!38 ostree:update to 2022.7
From: @ship_harbour Reviewed-by: @openeuler-basic Signed-off-by: @openeuler-basic
This commit is contained in:
commit
9a2222c18d
Binary file not shown.
13
ostree.spec
13
ostree.spec
@ -1,6 +1,7 @@
|
||||
#needsrootforbuild
|
||||
Name: ostree
|
||||
Version: 2021.6
|
||||
Release: 2
|
||||
Version: 2022.7
|
||||
Release: 1
|
||||
Summary: A tool like git for operating system binaries
|
||||
License: LGPLv2+
|
||||
URL: https://ostree.readthedocs.io/en/latest/
|
||||
@ -8,6 +9,7 @@ Source0: https://github.com/ostreedev/%{name}/releases/download/v%{versio
|
||||
|
||||
Patch9000: Do-not-run-testcase-test-libarvhive-import-because-selinux-is-off.patch
|
||||
Patch9001: skip-updating-the-preference.patch
|
||||
Patch9002: skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch
|
||||
|
||||
BuildRequires: bison autoconf automake libtool gobject-introspection-devel pkgconfig(liblzma) docbook-xsl
|
||||
BuildRequires: pkgconfig(e2p) pkgconfig(zlib) pkgconfig(libcurl) pkgconfig(libsoup-2.4) gpgme-devel
|
||||
@ -92,6 +94,13 @@ make check
|
||||
%{_mandir}/man*/{ostree,rofiles}*.gz
|
||||
|
||||
%changelog
|
||||
* Sun Jan 29 2023 jiangchuangang <jiangchuangang@huawei.com> - 2022.7-1
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update to 2022.7
|
||||
add skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch for test failed
|
||||
|
||||
* Mon Oct 17 2022 yangmingtai <yangmingtai@huawei.com> - 2021.6-2
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
47
skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch
Normal file
47
skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From a01cca16d6d3aa5abddb9ccf3ae9bc6103aa06dc Mon Sep 17 00:00:00 2001
|
||||
From: jiangchuangang <jiangchuangang@huawei.com>
|
||||
Date: Sun, 29 Jan 2023 16:35:57 +0800
|
||||
Subject: [PATCH] skip if /etc/mtab isn't a symlink of /proc/self/mounts
|
||||
|
||||
see:
|
||||
https://gitee.com/src-openeuler/ostree/issues/I66KR6?from=project-issue
|
||||
---
|
||||
tests/test-demo-buildsystem.sh | 5 +++++
|
||||
tests/test-rofiles-fuse.sh | 5 +++++
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/tests/test-demo-buildsystem.sh b/tests/test-demo-buildsystem.sh
|
||||
index 2dc78dc..56b6e61 100755
|
||||
--- a/tests/test-demo-buildsystem.sh
|
||||
+++ b/tests/test-demo-buildsystem.sh
|
||||
@@ -21,6 +21,11 @@ set -euo pipefail
|
||||
|
||||
. $(dirname $0)/libtest.sh
|
||||
|
||||
+if [ ! -L /etc/mtab ]
|
||||
+then
|
||||
+ skip "skip if /etc/mtab isn't a symlink of /proc/self/mounts"
|
||||
+fi
|
||||
+
|
||||
skip_without_fuse
|
||||
skip_without_user_xattrs
|
||||
|
||||
diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh
|
||||
index a56a76c..87962ce 100755
|
||||
--- a/tests/test-rofiles-fuse.sh
|
||||
+++ b/tests/test-rofiles-fuse.sh
|
||||
@@ -21,6 +21,11 @@ set -euo pipefail
|
||||
|
||||
. $(dirname $0)/libtest.sh
|
||||
|
||||
+if [ ! -L /etc/mtab ]
|
||||
+then
|
||||
+ skip "skip if /etc/mtab isn't a symlink of /proc/self/mounts"
|
||||
+fi
|
||||
+
|
||||
skip_without_fuse
|
||||
skip_without_user_xattrs
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user