packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2153 from cgwalters/release-2020-4 

Release 2020.4
This commit is contained in:
OpenShift Merge Robot 2020-07-22 16:48:44 +02:00 committed by GitHub
parent 12a9161a79 0d91206a62
commit 21c9840d13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile-libostree.am
View File

@ -182,9 +182,9 @@ libostree_1_la_SOURCES += \
endif # USE_GPGME endif # USE_GPGME
symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym
if BUILDOPT_IS_DEVEL_BUILD #if BUILDOPT_IS_DEVEL_BUILD
symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym #symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
endif #endif
# http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
wl_versionscript_arg = -Wl,--version-script= wl_versionscript_arg = -Wl,--version-script=
EXTRA_DIST += \ EXTRA_DIST += \

2
configure.ac
View File

@ -7,7 +7,7 @@ dnl Seed the release notes with `git-shortlog-with-prs <previous-release>..`. Th
dnl `git-evtag` to create the tag and push it. Finally, create a GitHub release and attach dnl `git-evtag` to create the tag and push it. Finally, create a GitHub release and attach
dnl the tarball from `make dist`. dnl the tarball from `make dist`.
m4_define([year_version], [2020]) m4_define([year_version], [2020])
m4_define([release_version], [4]) m4_define([release_version], [5])
m4_define([package_version], [year_version.release_version]) m4_define([package_version], [year_version.release_version])
AC_INIT([libostree], [package_version], [walters@verbum.org]) AC_INIT([libostree], [package_version], [walters@verbum.org])
is_release_build=no is_release_build=no

25
src/libostree/libostree-devel.sym
View File

@ -17,27 +17,12 @@
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
***/ ***/
/* Add new symbols here. Release commits should copy this section into -released.sym. */ LIBOSTREE_2020.5 {
LIBOSTREE_2020.2 {
global: global:
ostree_repo_commit_modifier_set_sepolicy_from_commit; /* Add symbols here, and uncomment the bits in
ostree_sign_get_type; * Makefile-libostree.am to enable this too.
ostree_sign_get_all; */
ostree_sign_commit; } LIBOSTREE_2020.4;
ostree_sign_commit_verify;
ostree_sign_data;
ostree_sign_data_verify;
ostree_sign_get_by_name;
ostree_sign_get_name;
ostree_sign_clear_keys;
ostree_sign_load_pk;
ostree_sign_metadata_format;
ostree_sign_metadata_key;
ostree_sign_set_pk;
ostree_sign_add_pk;
ostree_sign_set_sk;
ostree_sign_summary;
} LIBOSTREE_2020.1;
/* Stub section for the stable release *after* this development one; don't /* 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 * edit this other than to update the year. This is just a copy/paste

22
src/libostree/libostree-released.sym
View File

@ -593,6 +593,28 @@ global:
ostree_sysroot_set_mount_namespace_in_use; ostree_sysroot_set_mount_namespace_in_use;
} LIBOSTREE_2019.6; } LIBOSTREE_2019.6;
/* Add new symbols here. Release commits should copy this section into -released.sym. */
LIBOSTREE_2020.4 {
global:
ostree_repo_commit_modifier_set_sepolicy_from_commit;
ostree_sign_get_type;
ostree_sign_get_all;
ostree_sign_commit;
ostree_sign_commit_verify;
ostree_sign_data;
ostree_sign_data_verify;
ostree_sign_get_by_name;
ostree_sign_get_name;
ostree_sign_clear_keys;
ostree_sign_load_pk;
ostree_sign_metadata_format;
ostree_sign_metadata_key;
ostree_sign_set_pk;
ostree_sign_add_pk;
ostree_sign_set_sk;
ostree_sign_summary;
} LIBOSTREE_2020.1;
/* No new symbols in 2020.2 */ /* No new symbols in 2020.2 */
/* NOTE: Only add more content here in release commits! See the /* NOTE: Only add more content here in release commits! See the

2
tests/test-symbols.sh
View File

@ -66,7 +66,7 @@ echo 'ok documented symbols'
# ONLY update this checksum in release commits! # ONLY update this checksum in release commits!
cat > released-sha256.txt <<EOF cat > released-sha256.txt <<EOF
dd16acf1370f9b4ecd77d4eb7c4b45548b249f33f629d3147ddc9d264bd32e41 ${released_syms} 1f83814b9a785f9f612ee8f707dadb86d0dcbdc22603937575b7beefb26b50cc ${released_syms}
EOF EOF
sha256sum -c released-sha256.txt sha256sum -c released-sha256.txt