Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
103a7e246e
!51 upgrade version to 2024.4
From: @duyiwei7w 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2024-04-22 03:22:51 +00:00
duyiwei
71fb3d005f upgrade verison to 2024.4 2024-04-17 17:04:15 +08:00
openeuler-ci-bot
bccc4136e3
!45 Init support for ppc64le
From: @jiahua-yu 
Reviewed-by: @ship_harbour 
Signed-off-by: @ship_harbour
2023-12-01 01:05:26 +00:00
jiahua.yu
7a65d443b3 Init support for ppc64le 2023-11-30 10:06:01 +08:00
openeuler-ci-bot
66689e53c3
!43 ostree: fix test-rofiles-fuse.sh failed
From: @ship_harbour 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2023-09-19 13:30:35 +00:00
jcg
93b4357eac ostree: fix test-rofiles-fuse.sh failed 2023-09-19 20:55:56 +08:00
openeuler-ci-bot
8dbd17468e
!41 【LLVM平行宇宙】Add clang compile support
From: @liyunfei33 
Reviewed-by: @ship_harbour 
Signed-off-by: @ship_harbour
2023-09-08 11:02:13 +00:00
liyunfei
ccf949c841 add clang compile support 2023-09-08 17:05:11 +08:00
openeuler-ci-bot
a1901c63a1
!40 ostree: update to 2023.5
From: @ship_harbour 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2023-07-12 09:12:26 +00:00
jcg
40fd0700b2 ostree: update to 2023.5 2023-07-07 12:36:39 +08:00
6 changed files with 41 additions and 112 deletions

View File

@ -1,25 +0,0 @@
From 51c151dec84057108e6fd976e8d730e616a6f34f Mon Sep 17 00:00:00 2001
From: yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com>
Date: Wed, 12 Aug 2020 11:24:31 +0800
Subject: Do not run tesecase test-libarchive-import,because selinux is off.
---
tests/test-libarchive-import.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c
index d3429cd..acc8391 100644
--- a/tests/test-libarchive-import.c
+++ b/tests/test-libarchive-import.c
@@ -613,7 +613,7 @@ int main (int argc, char **argv)
g_test_add_data_func ("/libarchive/xattr-callback", &td, test_libarchive_xattr_callback);
g_test_add_data_func ("/libarchive/no-use-entry-pathname", &td, test_libarchive_no_use_entry_pathname);
g_test_add_data_func ("/libarchive/use-entry-pathname", &td, test_libarchive_use_entry_pathname);
- g_test_add_data_func ("/libarchive/selinux", &td, test_libarchive_selinux);
+ //g_test_add_data_func ("/libarchive/selinux", &td, test_libarchive_selinux);
r = g_test_run();
--
1.8.3.1

View File

@ -1,27 +1,27 @@
#needsrootforbuild
Name: ostree
Version: 2022.7
Version: 2024.4
Release: 1
Summary: A tool like git for operating system binaries
License: LGPLv2+
Summary: Tool for managing bootable, immutable filesystem trees
License: LGPL-2.0-or-later
URL: https://ostree.readthedocs.io/en/latest/
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
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
Patch01: remove-specific-cc-in-automake.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
BuildRequires: pkgconfig(libselinux) pkgconfig(libcrypto) pkgconfig(fuse) pkgconfig(libsystemd)
BuildRequires: dracut openssl-devel pkgconfig(mount) pkgconfig(libarchive) python3-pyyaml libxslt
BuildRequires: gtk-doc elfutils-extra
BuildRequires: bison autoconf automake libtool pkgconfig(liblzma)
BuildRequires: pkgconfig(e2p) pkgconfig(zlib) pkgconfig(libcurl) pkgconfig(libsoup-3.0) gpgme-devel
BuildRequires: pkgconfig(libselinux) pkgconfig(fuse3) pkgconfig(libsystemd)
BuildRequires: dracut openssl-devel pkgconfig(mount) pkgconfig(libarchive)
BuildRequires: gtk-doc attr libattr-devel
Requires: dracut systemd-units gnupg2
%ifarch x86_64
Requires: grub2
%else
%ifnarch ppc64le
Requires: grub2-efi
%endif
%endif
Provides: ostree-libs ostree-grub2
Provides: ostree-libs%{?_isa} = %{version}-%{release}
@ -48,16 +48,13 @@ The %{name}-devel package includes the header files for the %{name} library.
%build
env NOCONFIGURE=1 ./autogen.sh
%configure --with-selinux --with-curl --with-openssl --disable-silent-rules \
--with-dracut=yesbutnoconf
--with-soup3 --with-dracut=yesbutnoconf
%make_build
%install
%make_install
%delete_la
%check
make check
%post
%systemd_post ostree-remount.service
@ -94,6 +91,24 @@ make check
%{_mandir}/man*/{ostree,rofiles}*.gz
%changelog
* Tue Apr 16 2024 duyiwei <duyiwei@kylinos.cn> - 2024.4-1
- upgrade version to 2024.4
* Mon Nov 27 2023 jiahua.yu <jiahua.yu@shingroup.cn> - 2023.5-4
- init support for ppc64le
* Tue Sep 19 2023 jiangchuangang <jiangchuangang@huawei.com> - 2023.5-3
- fix test-rofiles-fuse.sh failed
* Fri Aug 11 2023 liyunfei <liyunfei33@huawei.com> - 2023.5-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add clang compile support
* Wed Jul 12 2023 jiangchuangang <jiangchuangang@huawei.com> - 2023.5-1
- update to 2023.5
* Sun Jan 29 2023 jiangchuangang <jiangchuangang@huawei.com> - 2022.7-1
- Type:enhancement
- ID:NA

View File

@ -0,0 +1,11 @@
diff -up libostree-2022.2/Makefile-libostree.am.orig2 libostree-2022.2/Makefile-libostree.am
--- libostree-2022.2/Makefile-libostree.am.orig2 2023-04-19 19:03:26.663366592 +0800
+++ libostree-2022.2/Makefile-libostree.am 2023-04-19 19:03:48.391512904 +0800
@@ -267,7 +267,4 @@ endif # USE_LIBSODIUM
-# XXX: work around clang being passed -fstack-clash-protection which it doesn't understand
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1672012
-INTROSPECTION_SCANNER_ENV = CC=gcc
if BUILDOPT_INTROSPECTION
OSTree-1.0.gir: libostree-1.la Makefile

View File

@ -1,47 +0,0 @@
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

View File

@ -1,25 +0,0 @@
From fb7daae318b4bec222c166578566ac2945c638a2 Mon Sep 17 00:00:00 2001
From: wangjie <wangejie375@h-partners.com>
Date: Mon, 20 Dec 2021 11:04:00 +0800
Subject: [PATCH] skip updating the preference
---
tests/test-remote-gpg-list-keys.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test-remote-gpg-list-keys.sh b/tests/test-remote-gpg-list-keys.sh
index 51b6008..ffb7850 100755
--- a/tests/test-remote-gpg-list-keys.sh
+++ b/tests/test-remote-gpg-list-keys.sh
@@ -127,7 +127,7 @@ else
# implicitly migrated to the newer format, but this test hasn't
# signed anything, so the private keys haven't been loaded. Force
# the migration by listing the private keys.
- ${GPG} --homedir=${test_tmpdir}/gpghome -K >/dev/null
+ ${GPG} --homedir=${test_tmpdir}/gpghome -K --batch >/dev/null
# Expire key1, wait for it to be expired and re-import it.
${GPG} --homedir=${test_tmpdir}/gpghome --quick-set-expire ${TEST_GPG_KEYFPR_1} seconds=1
--
1.8.3.1