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

Merge pull request #2204 from jlebon/pr/versioning-tweaks 

Various minor versioning related tweaks
This commit is contained in:
OpenShift Merge Robot 2020-09-30 17:22:49 +00:00 committed by GitHub
parent fad95167ce f04e5d047d
commit a5f9651dab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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
src/libostree/libostree-devel.sym
View File

@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
***/ ***/
LIBOSTREE_2020.6 { LIBOSTREE_2020.7 {
global: global:
/* Add symbols here, and uncomment the bits in /* Add symbols here, and uncomment the bits in
* Makefile-libostree.am to enable this too. * Makefile-libostree.am to enable this too.

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

@ -620,6 +620,8 @@ global:
/* No new symbols in 2020.5 */ /* No new symbols in 2020.5 */
/* No new symbols in 2020.6 */
/* NOTE: Only add more content here in release commits! See the /* NOTE: Only add more content here in release commits! See the
* comments at the top of this file. * comments at the top of this file.
*/ */

4
src/libostree/ostree-repo-static-delta-core.c
View File

@ -317,6 +317,8 @@ _ostree_repo_static_delta_verify_signature (OstreeRepo *self,
* The directory must be named with the form "FROM-TO", where both are * The directory must be named with the form "FROM-TO", where both are
* checksums, and it must contain a file named "superblock", along with at least * checksums, and it must contain a file named "superblock", along with at least
* one part. * one part.
*
* Since: 2020.7
*/ */
gboolean gboolean
ostree_repo_static_delta_execute_offline_with_signature (OstreeRepo *self, ostree_repo_static_delta_execute_offline_with_signature (OstreeRepo *self,
@ -1082,7 +1084,7 @@ _ostree_repo_static_delta_dump (OstreeRepo *self,
* Returns: TRUE if the signature of static delta file is valid using the * Returns: TRUE if the signature of static delta file is valid using the
* signature engine provided, FALSE otherwise. * signature engine provided, FALSE otherwise.
* *
* Since: 2020.1 * Since: 2020.7
*/ */
gboolean gboolean
ostree_repo_static_delta_verify_signature (OstreeRepo *self, ostree_repo_static_delta_verify_signature (OstreeRepo *self,

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
55f21380aa7f9ecc447a680b5c091692f2a0b98aa96ea00fba6aa6406aa69a5a ${released_syms} f341345be2da30ab8043ac3d555f75edaae25aaad9f81a933fb4e33a47fe7cc4 ${released_syms}
EOF EOF
sha256sum -c released-sha256.txt sha256sum -c released-sha256.txt