diff options
| author | Jonathan Lebon <jonathan@jlebon.com> | 2023-02-17 12:33:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-17 12:33:12 -0500 |
| commit | c2974d0b35f9bf53d7b4e4b0adef74cda2fc5cda (patch) | |
| tree | 7316e3f4bf9764ab27e605306b4f271d141a3969 | |
| parent | 8025a83b6dd5414d4211c2bfbee47bda42136c69 (diff) | |
| parent | 15b2c4f45cc60ca0830dbe6f9dbf94007f09022a (diff) | |
| download | ostree-c2974d0b35f9bf53d7b4e4b0adef74cda2fc5cda.tar.gz | |
Merge pull request #2817 from cgwalters/release
| -rw-r--r-- | Makefile-libostree.am | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/libostree/libostree-devel.sym | 5 | ||||
| -rw-r--r-- | src/libostree/libostree-released.sym | 5 | ||||
| -rwxr-xr-x | tests/test-symbols.sh | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 55813dd1..12f1ffb4 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -173,9 +173,9 @@ endif # USE_GPGME symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym # Uncomment this include when adding new development symbols. -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= diff --git a/configure.ac b/configure.ac index 33a8fe37..433d5354 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.63]) dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`. -m4_define([year_version], [2022]) -m4_define([release_version], [8]) +m4_define([year_version], [2023]) +m4_define([release_version], [2]) 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 c1a8f94e..9168db73 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -20,11 +20,6 @@ - uncomment the include in Makefile-libostree.am */ -LIBOSTREE_2023.1 { -global: - ostree_repo_regenerate_metadata; -} LIBOSTREE_2022.7; - /* 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 * source. Replace $LASTSTABLE with the last stable version, and $NEWVERSION diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index ee4e3fde..f210a1a0 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -696,6 +696,11 @@ global: ostree_sysroot_initialize_with_mount_namespace; } LIBOSTREE_2022.5; +LIBOSTREE_2023.1 { +global: + ostree_repo_regenerate_metadata; +} LIBOSTREE_2022.7; + /* 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 1442e2d7..0d459c1a 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -54,7 +54,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt <<EOF -d7b5a766b1607f7334e9b6f15385ad872879e336a160ae76336243e493f7ceab ${released_syms} +e300a2e86f4a2ac620af8369f4b0f41dbe53fada187cce1d21d3c48073e9b454 ${released_syms} EOF sha256sum -c released-sha256.txt |