From cb9facdfef4d94588761d72f8d0518375f4aaba7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Dec 2017 09:42:35 +0100 Subject: [PATCH] build: adjust libnm symbol versioning after backporting update2 API for 1.10.2 The update2 API was backported to nm-1-10 branch, with commit ad7f1d18a0eafb1352d305035cd138f43a47b955. It will be released both as 1.12.0 and 1.10.2. To ensure the upgrade path from 1.10.2+ to 1.12+ works, the symbols in libnm must be present on both versions. Usually, we would duplicate the symbols on master via NM_BACKPORT_SYMBOL() macro. However, as we are sure that we will release 1.10.2 before 1.12.0, we can just update the linker version of these symbols. So, although they are first released on major release 1.12.0, their linker version tag is libnm_1_10_2, to ease upgrade and to avoid duplicating the symbol. --- libnm/libnm.ver | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 06e5e4c8d7..7d6ce75195 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1222,6 +1222,12 @@ global: nm_setting_wireless_security_wps_method_get_type; } libnm_1_8_0; +libnm_1_10_2 { + nm_remote_connection_update2; + nm_remote_connection_update2_finish; + nm_settings_update2_flags_get_type; +} libnm_1_10_0; + libnm_1_12_0 { global: nm_checkpoint_get_created; @@ -1235,8 +1241,6 @@ global: nm_client_checkpoint_rollback_async; nm_client_checkpoint_rollback_finish; nm_client_get_checkpoints; - nm_remote_connection_update2; - nm_remote_connection_update2_finish; nm_setting_team_add_runner_tx_hash; nm_setting_team_get_mcast_rejoin_count; nm_setting_team_get_mcast_rejoin_interval; @@ -1262,5 +1266,4 @@ global: nm_setting_team_remove_runner_tx_hash_by_value; nm_setting_vpn_get_data_keys; nm_setting_vpn_get_secret_keys; - nm_settings_update2_flags_get_type; } libnm_1_10_0;