Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various minor versioning related tweaks #2204

Merged
merged 2 commits into from
Sep 30, 2020
Merged

Various minor versioning related tweaks #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7534203
Makefile-libostree.am: Uncomment BUILDOPT_IS_DEVEL_BUILD conditional
jlebon Sep 25, 2020
f04e5d0
lib: Minor versioning related fixes
jlebon Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile-libostree.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
if BUILDOPT_IS_DEVEL_BUILD
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
wl_versionscript_arg = -Wl,--version-script=
EXTRA_DIST += \
Expand Down
2 changes: 1 addition & 1 deletion src/libostree/libostree-devel.sym
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA.
***/

LIBOSTREE_2020.6 {
LIBOSTREE_2020.7 {
global:
/* Add symbols here, and uncomment the bits in
* Makefile-libostree.am to enable this too.
Expand Down
2 changes: 2 additions & 0 deletions src/libostree/libostree-released.sym
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,8 @@ global:

/* No new symbols in 2020.5 */

/* No new symbols in 2020.6 */

/* NOTE: Only add more content here in release commits! See the
* comments at the top of this file.
*/
4 changes: 3 additions & 1 deletion src/libostree/ostree-repo-static-delta-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
* checksums, and it must contain a file named "superblock", along with at least
* one part.
*
* Since: 2020.7
*/
gboolean
ostree_repo_static_delta_execute_offline_with_signature (OstreeRepo *self,
Expand Down Expand Up @@ -1082,7 +1084,7 @@ _ostree_repo_static_delta_dump (OstreeRepo *self,
* Returns: TRUE if the signature of static delta file is valid using the
* signature engine provided, FALSE otherwise.
*
* Since: 2020.1
* Since: 2020.7
*/
gboolean
ostree_repo_static_delta_verify_signature (OstreeRepo *self,
Expand Down
2 changes: 1 addition & 1 deletion tests/test-symbols.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo 'ok documented symbols'

# ONLY update this checksum in release commits!
cat > released-sha256.txt <<EOF
55f21380aa7f9ecc447a680b5c091692f2a0b98aa96ea00fba6aa6406aa69a5a ${released_syms}
f341345be2da30ab8043ac3d555f75edaae25aaad9f81a933fb4e33a47fe7cc4 ${released_syms}
EOF
sha256sum -c released-sha256.txt

Expand Down