diff --git a/Do-not-run-testcase-test-libarvhive-import-because-selinux-is-off.patch b/Do-not-run-testcase-test-libarvhive-import-because-selinux-is-off.patch deleted file mode 100644 index dee7f7dac446dc2178646f38fe4ca9b42fba3de8..0000000000000000000000000000000000000000 --- a/Do-not-run-testcase-test-libarvhive-import-because-selinux-is-off.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 51c151dec84057108e6fd976e8d730e616a6f34f Mon Sep 17 00:00:00 2001 -From: yang_zhuang_zhuang -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 -@@ -705,7 +705,7 @@ main (int argc, char **argv) - 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 - diff --git a/do-fusermount-lazy-unmount.patch b/do-fusermount-lazy-unmount.patch deleted file mode 100644 index 4fefab231808d0a244e9e2ef0bf2ac3e574b4926..0000000000000000000000000000000000000000 --- a/do-fusermount-lazy-unmount.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f67eae1584947385968a5e2f1c641a22a0d7359b Mon Sep 17 00:00:00 2001 -From: jiangchuangang -Date: Tue, 19 Sep 2023 20:51:07 +0800 -Subject: [PATCH] do lazy umount for "Device or resource busy" - ---- - tests/test-rofiles-fuse.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh -index 87962ce..9b8f6b9 100755 ---- a/tests/test-rofiles-fuse.sh -+++ b/tests/test-rofiles-fuse.sh -@@ -138,7 +138,7 @@ echo "ok flock" - - copyup_reset() { - cd ${test_tmpdir} -- fusermount -u mnt -+ fusermount -zu mnt - rm checkout-test2 -rf - $OSTREE checkout -H test2 checkout-test2 - rofiles-fuse --copyup checkout-test2 mnt --- -2.36.1 - diff --git a/libostree-2023.5.tar.xz b/libostree-2024.4.tar.xz similarity index 52% rename from libostree-2023.5.tar.xz rename to libostree-2024.4.tar.xz index 4ce6a946d2a870c82ac682cf5effd99058737376..a4dc3d74a3de897279912f8984fe7ab8673f29c4 100644 Binary files a/libostree-2023.5.tar.xz and b/libostree-2024.4.tar.xz differ diff --git a/ostree.spec b/ostree.spec index 864e04920c116d67f8cebbd4c9a6bbd33e2851b9..15e56a02174ab065effbead3b78f95e89047ca17 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,23 +1,19 @@ #needsrootforbuild Name: ostree -Version: 2023.5 -Release: 4 -Summary: A tool like git for operating system binaries -License: LGPLv2+ +Version: 2024.4 +Release: 1 +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 -Patch9003: remove-specific-cc-in-automake.patch -Patch9004: do-fusermount-lazy-unmount.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 +Patch01: remove-specific-cc-in-automake.patch + +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 @@ -52,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 @@ -98,6 +91,9 @@ make check %{_mandir}/man*/{ostree,rofiles}*.gz %changelog +* Tue Apr 16 2024 duyiwei - 2024.4-1 +- upgrade version to 2024.4 + * Mon Nov 27 2023 jiahua.yu - 2023.5-4 - init support for ppc64le diff --git a/skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch b/skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch deleted file mode 100644 index 2b2321702fc003ad6b1df317fb521d26b2913635..0000000000000000000000000000000000000000 --- a/skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a01cca16d6d3aa5abddb9ccf3ae9bc6103aa06dc Mon Sep 17 00:00:00 2001 -From: jiangchuangang -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 - diff --git a/skip-updating-the-preference.patch b/skip-updating-the-preference.patch deleted file mode 100644 index b663ae04e56b8117f21a9d1513066fd219153a36..0000000000000000000000000000000000000000 --- a/skip-updating-the-preference.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fb7daae318b4bec222c166578566ac2945c638a2 Mon Sep 17 00:00:00 2001 -From: wangjie -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 -