From 9737229890a0f312d30ae0db830d7ffcb53f8263 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 15 Oct 2020 08:02:42 +0800 Subject: [PATCH 1/5] [patch tracking] 20201015080236061296 - https://github.com/custa/ostree/commit/cfa25837dc3e36009a0cd03ecaa1d02d153de87f --- ...5837dc3e36009a0cd03ecaa1d02d153de87f.patch | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 cfa25837dc3e36009a0cd03ecaa1d02d153de87f.patch diff --git a/cfa25837dc3e36009a0cd03ecaa1d02d153de87f.patch b/cfa25837dc3e36009a0cd03ecaa1d02d153de87f.patch new file mode 100644 index 0000000..788bc87 --- /dev/null +++ b/cfa25837dc3e36009a0cd03ecaa1d02d153de87f.patch @@ -0,0 +1,95 @@ +diff --git a/Makefile-libostree.am b/Makefile-libostree.am +index 96b9249b9..a180e86b2 100644 +--- a/Makefile-libostree.am ++++ b/Makefile-libostree.am +@@ -182,9 +182,9 @@ libostree_1_la_SOURCES += \ + endif # USE_GPGME + + symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym +-if BUILDOPT_IS_DEVEL_BUILD +-symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym +-endif ++#if BUILDOPT_IS_DEVEL_BUILD ++#symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym ++#endif + # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html + wl_versionscript_arg = -Wl,--version-script= + EXTRA_DIST += \ +diff --git a/configure.ac b/configure.ac +index de219eabe..7a2f7ab6b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,7 +7,7 @@ dnl Seed the release notes with `git-shortlog-with-prs ..`. Th + dnl `git-evtag` to create the tag and push it. Finally, create a GitHub release and attach + dnl the tarball from `make dist`. + m4_define([year_version], [2020]) +-m4_define([release_version], [7]) ++m4_define([release_version], [8]) + m4_define([package_version], [year_version.release_version]) + AC_INIT([libostree], [package_version], [walters@verbum.org]) + is_release_build=no +diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym +index 341a22a8f..8e8d9c819 100644 +--- a/src/libostree/libostree-devel.sym ++++ b/src/libostree/libostree-devel.sym +@@ -17,19 +17,9 @@ + Boston, MA 02111-1307, USA. + ***/ + +-LIBOSTREE_2020.7 { +-global: +- /* Add symbols here, and uncomment the bits in +- * Makefile-libostree.am to enable this too. +- */ +- ostree_repo_static_delta_execute_offline_with_signature; +- ostree_repo_static_delta_verify_signature; +- ostree_bootconfig_parser_get_overlay_initrds; +- ostree_bootconfig_parser_set_overlay_initrds; +- ostree_sysroot_deploy_tree_with_options; +- ostree_sysroot_stage_tree_with_options; +- ostree_sysroot_stage_overlay_initrd; +-} LIBOSTREE_2020.4; ++/* Copy the bits below and uncomment the include in Makefile-libostree.am ++ when adding a symbol. ++*/ + + /* Stub section for the stable release *after* this development one; don't + * edit this other than to update the year. This is just a copy/paste +diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym +index e7d985ca8..c154d8c18 100644 +--- a/src/libostree/libostree-released.sym ++++ b/src/libostree/libostree-released.sym +@@ -622,6 +622,20 @@ global: + + /* No new symbols in 2020.6 */ + ++LIBOSTREE_2020.7 { ++global: ++ /* Add symbols here, and uncomment the bits in ++ * Makefile-libostree.am to enable this too. ++ */ ++ ostree_repo_static_delta_execute_offline_with_signature; ++ ostree_repo_static_delta_verify_signature; ++ ostree_bootconfig_parser_get_overlay_initrds; ++ ostree_bootconfig_parser_set_overlay_initrds; ++ ostree_sysroot_deploy_tree_with_options; ++ ostree_sysroot_stage_tree_with_options; ++ ostree_sysroot_stage_overlay_initrd; ++} LIBOSTREE_2020.4; ++ + /* NOTE: Only add more content here in release commits! See the + * comments at the top of this file. + */ +diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh +index 697d9ad12..e4a0a943a 100755 +--- a/tests/test-symbols.sh ++++ b/tests/test-symbols.sh +@@ -66,7 +66,7 @@ echo 'ok documented symbols' + + # ONLY update this checksum in release commits! + cat > released-sha256.txt < Date: Thu, 15 Oct 2020 08:02:43 +0800 Subject: [PATCH 2/5] [patch tracking] 20201015080236061296 - https://github.com/custa/ostree/commit/26b98ebc56591846e1ab9261eda405232831e8e1 --- 26b98ebc56591846e1ab9261eda405232831e8e1.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 26b98ebc56591846e1ab9261eda405232831e8e1.patch diff --git a/26b98ebc56591846e1ab9261eda405232831e8e1.patch b/26b98ebc56591846e1ab9261eda405232831e8e1.patch new file mode 100644 index 0000000..82fbb71 --- /dev/null +++ b/26b98ebc56591846e1ab9261eda405232831e8e1.patch @@ -0,0 +1,13 @@ +diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c +index 7b7ba5e92..1a4a63699 100644 +--- a/src/libostree/ostree-sysroot-deploy.c ++++ b/src/libostree/ostree-sysroot-deploy.c +@@ -3046,7 +3046,7 @@ _ostree_sysroot_deserialize_deployment_from_variant (GVariant *v, + /** + * ostree_sysroot_stage_overlay_initrd: + * @self: Sysroot +- * @fd: (transfer none): File descriptor to overlay initrd ++ * @fd: File descriptor to overlay initrd + * @out_checksum: (out) (transfer full): Overlay initrd checksum + * @cancellable: Cancellable + * @error: Error -- Gitee From 95b31a4dc93f8b3445138f14e8cbe5032724ff15 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 15 Oct 2020 08:02:44 +0800 Subject: [PATCH 3/5] [patch tracking] 20201015080236061296 - update spec file --- ostree.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ostree.spec b/ostree.spec index ce1d211..34b895a 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,12 +1,14 @@ Name: ostree Version: 2020.4 -Release: 2 +Release: 3 Summary: A tool like git for operating system binaries License: LGPLv2+ URL: https://ostree.readthedocs.io/en/latest/ Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz Patch1: Do-not-run-testcase-test-libarvhive-import-because-selinux-is-off.patch +Patch6000: cfa25837dc3e36009a0cd03ecaa1d02d153de87f.patch +Patch6001: 26b98ebc56591846e1ab9261eda405232831e8e1.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 @@ -90,6 +92,9 @@ make check %{_mandir}/man*/{ostree,rofiles}*.gz %changelog +* 20201015080236061296 patch-tracking 2020.4-3 +- append patch file of upstream repository from to <26b98ebc56591846e1ab9261eda405232831e8e1> + * Wed Aug 12 2020 yangzhuangzhuang - 2020.4-2 - Type:bugfix - ID:NA @@ -133,4 +138,4 @@ make check - DESC:delete unneeded build requires * Mon Oct 14 2019 openEuler Buildteam - 2019.4-1 -- Package Init +- Package Init \ No newline at end of file -- Gitee From 3b497555ffb60dbbc8d3ad4b7e7a94780a058eb2 Mon Sep 17 00:00:00 2001 From: chenyanpanHW Date: Thu, 15 Oct 2020 15:37:34 +0800 Subject: [PATCH 4/5] update ostree.spec. --- ostree.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ostree.spec b/ostree.spec index 34b895a..77f8492 100644 --- a/ostree.spec +++ b/ostree.spec @@ -92,7 +92,7 @@ make check %{_mandir}/man*/{ostree,rofiles}*.gz %changelog -* 20201015080236061296 patch-tracking 2020.4-3 +* Wed Aug 12 2020 patch-tracking - 2020.4-3 - append patch file of upstream repository from to <26b98ebc56591846e1ab9261eda405232831e8e1> * Wed Aug 12 2020 yangzhuangzhuang - 2020.4-2 -- Gitee From 20302df4dbf7b00b10161deb488b094a4b5457b0 Mon Sep 17 00:00:00 2001 From: chenyanpanHW Date: Thu, 15 Oct 2020 15:48:00 +0800 Subject: [PATCH 5/5] update ostree.spec. Sat Jul 25 2020 linwei - 2020.4-1 --- ostree.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ostree.spec b/ostree.spec index 77f8492..b0edcc1 100644 --- a/ostree.spec +++ b/ostree.spec @@ -101,7 +101,7 @@ make check - SUG:NA - DESC:DO not run testcase test-libarchive-import,because selinux is off. -* Mon Jul 25 2020 linwei - 2020.4-1 +* Sat Jul 25 2020 linwei - 2020.4-1 - Type:enhancement - ID:NA - SUG:NA -- Gitee