From ae5af6b368141a5ff6fa758ed6e930e668237ca4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 8 Dec 2017 13:47:34 +0100 Subject: [PATCH] libnm: adjust symbol versioning after backporting team API to 1.10.2 The team API was backported to nm-1-10 branch. 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 the symbols will be 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 symbols. --- libnm/libnm.ver | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 1620acaef0..a3e5434bb4 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1226,22 +1226,6 @@ libnm_1_10_2 { global: 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; - nm_checkpoint_get_devices; - nm_checkpoint_get_rollback_timeout; - nm_checkpoint_get_type; - nm_client_checkpoint_create_async; - nm_client_checkpoint_create_finish; - nm_client_checkpoint_destroy_async; - nm_client_checkpoint_destroy_finish; - nm_client_checkpoint_rollback_async; - nm_client_checkpoint_rollback_finish; - nm_client_get_checkpoints; nm_setting_team_add_link_watcher; nm_setting_team_add_runner_tx_hash; nm_setting_team_clear_link_watchers; @@ -1277,8 +1261,7 @@ global: nm_setting_team_remove_link_watcher_by_value; nm_setting_team_remove_runner_tx_hash; 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; nm_team_link_watcher_arp_ping_flags_get_type; nm_team_link_watcher_dup; nm_team_link_watcher_equal; @@ -1298,3 +1281,20 @@ global: nm_team_link_watcher_ref; nm_team_link_watcher_unref; } libnm_1_10_0; + +libnm_1_12_0 { +global: + nm_checkpoint_get_created; + nm_checkpoint_get_devices; + nm_checkpoint_get_rollback_timeout; + nm_checkpoint_get_type; + nm_client_checkpoint_create_async; + nm_client_checkpoint_create_finish; + nm_client_checkpoint_destroy_async; + nm_client_checkpoint_destroy_finish; + nm_client_checkpoint_rollback_async; + nm_client_checkpoint_rollback_finish; + nm_client_get_checkpoints; + nm_setting_vpn_get_data_keys; + nm_setting_vpn_get_secret_keys; +} libnm_1_10_0;